Merge branch 'hotfix/1.5.4'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-google-maps-module",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "NuxtJS module to import Google Maps",
   "license": "MIT",
   "contributors": [

src/module.js

@@ -51,7 +51,6 @@ module.exports = function module(moduleOptions) {
    */
   this.addPlugin({
     src: resolve(__dirname, './plugin.template.js'),
-    ssr: false,
     options,
   });
 };

src/plugin.template.js

@@ -1,12 +1,20 @@
 import Vue from 'vue';
 
-export default function (context) {
+export default function (context, inject) {
   /**
-   * Inject Google object in our Vue app (client side only)
+   * Inject the Google object in the Nuxt instance, even if it's
+   * not used server side.
+   */
+  context.app.google = {};
+  inject('google', {});
+
+  /**
+   * Apply the new Google object to the previously created one in our
+   * Vue app (client side only)
    * Do an event boomerang to make sure the Google maps API callback was
    * called and google injected in Vue.
    */
-  if (typeof window !== 'undefined') {
+  if (process.client && typeof window !== 'undefined') {
     const event = new window.Event('maps-module:initiated');
     window.dispatchEvent(event);
     window.addEventListener('maps-module:loaded', () => {