Merge branch 'master' of gitee.com:ChanWahFung/nuxt-juejin-project

ChanWahFung · ChanWahFung · commit fec96fc5ed31 · 2020-06-08T21:46:20.000+08:00
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -9,10 +9,16 @@ module.exports = {
     host: '127.0.0.1'
   },
   /*
+  ** Render configuration
+  */
+  render: {
+    csp: true
+  },
+  /*
   ** Environment variable configuration
   */
   env: {
-    baseUrl: process.env.NODE_ENV === 'production' ? 'http://test.com' : 'http://127.0.0.1:8000'
+    baseUrl: 'http://127.0.0.1:8000'
   },
   /*
   ** Router configuration
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,13 +7,13 @@
   "scripts": {
     "dev": "cross-env NODE_ENV=development nodemon --inspect server/index.js --watch server",
     "build": "nuxt build",
-    "start": "cross-env NODE_ENV=production node server/index.js",
+    "start": "nuxt start",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore ."
   },
   "dependencies": {
     "@nuxtjs/axios": "^5.3.6",
-    "async-validator": "^3.2.4",
+    "async-validator": "^3.3.0",
     "cookie-universal-nuxt": "^2.1.3",
     "cross-env": "^5.2.0",
     "element-ui": "^2.13.0",
