Merge pull request #2 from S64/shuma/nuxt-v1.0.0

Release v0.0.5
S64 · Jan 21, 2018 · 7092bd9 · 7092bd9
2 parents bb70c6d + 9b589ea
commit 7092bd9
Show file tree

Hide file tree

Showing 8 changed files with 5,945 additions and 1,178 deletions.
diff --git a/packages/example-nuxt/package-lock.json b/packages/example-nuxt/package-lock.json
diff --git a/packages/example-nuxt/package.json b/packages/example-nuxt/package.json
@@ -1,10 +1,10 @@
 {
   "name": "example-nuxt",
   "dependencies": {
-    "nuxt-universal-cookies": "0.0.4"
+    "nuxt-universal-cookies": "0.0.5"
   },
   "devDependencies": {
-    "nuxt": "^1.0.0-rc11",
+    "nuxt": "^1.1.1",
     "rimraf": "^2.6.2"
   },
   "private": true,

diff --git a/packages/nuxt-universal-cookies/lib/index.js b/packages/nuxt-universal-cookies/lib/index.js
@@ -16,17 +16,12 @@
 
 const path = require('path');
 
-module.exports = function (moduleOptions, resolve) {
+module.exports = function (moduleOptions) {
   const defaults = {};
   const options = Object.assign({}, defaults, moduleOptions);
 
   this.addPlugin({
     src: path.resolve(__dirname, './templates/universal-cookies.plugin.ejs.js'),
-    fileName: 'universal-cookies.plugin.js',
-    options
+    options: options
   });
-
-  this.addVendor('vue-universal-cookies');
-
-  resolve();
 }
diff --git a/packages/nuxt-universal-cookies/lib/templates/universal-cookies.plugin.ejs.js b/packages/nuxt-universal-cookies/lib/templates/universal-cookies.plugin.ejs.js
@@ -24,6 +24,6 @@ export default (context) => {
   Vue.use(VueUniversalCookies);
   const options = <%= JSON.stringify(options) %>;
   context.app.cookies = Object.assign({}, options, {
-    handler: context.isServer ? new NodeHttpHandler(context.req, context.res) : new BrowserHandler(),
+    handler: (!process.static && process.server) ? new NodeHttpHandler(context.req, context.res) : new BrowserHandler(),
   });
 };