Merge branch 'master' of github.com:Human-Connection/Nitro-Web into editor

nuxt.config.js

@@ -9,6 +9,8 @@ module.exports = {
   dev: dev,
   debug: dev ? 'nuxt:*,app' : null,
 
+  modern: 'server',
+
   transition: {
     name: 'slide-up',
     mode: 'out-in'
@@ -89,13 +91,14 @@ module.exports = {
     'cookie-universal-nuxt',
     '@nuxtjs/apollo',
     '@nuxtjs/axios',
-    'portal-vue/nuxt',
-    [
-      'nuxt-sass-resources-loader',
-      path.resolve(__dirname, './styleguide/src/system/styles/shared.scss')
-    ]
+    '@nuxtjs/style-resources',
+    'portal-vue/nuxt'
   ],
 
+  styleResources: {
+    scss: ['~/styleguide/src/system/styles/shared.scss']
+  },
+
   /*
   ** Axios module configuration
   */
@@ -157,12 +160,6 @@ module.exports = {
   ** Build configuration
   */
   build: {
-    /*
-     * TODO: import the polyfill instead of using the deprecated vendor key
-     * Polyfill missing ES6 & 7 Methods to work on older Browser
-     */
-    vendor: ['@babel/polyfill'],
-
     /*
     ** You can extend webpack config here
     */

package.json

@@ -38,6 +38,19 @@
     ]
   },
   "dependencies": {
+    "@nuxtjs/apollo": "4.0.0-rc3",
+    "@nuxtjs/axios": "~5.3.6",
+    "@nuxtjs/dotenv": "~1.3.0",
+    "@nuxtjs/style-resources": "~0.1.2",
+    "accounting": "~0.4.1",
+    "apollo-cache-inmemory": "~1.4.2",
+    "apollo-client": "~2.4.12",
+    "cookie-universal-nuxt": "~2.0.14",
+    "cross-env": "~5.2.0",
+    "date-fns": "2.0.0-alpha.26",
+    "express": "~4.16.4",
+    "graphql": "~14.1.1",
+    "jsonwebtoken": "~8.4.0",
     "linkify-it": "~2.1.0",
     "nuxt": "~2.4.3",
     "nuxt-env": "~0.0.4",
@@ -53,7 +66,7 @@
   },
   "devDependencies": {
     "@babel/core": "~7.2.2",
-    "@babel/preset-env": "^7.3.1",
+    "@babel/preset-env": "~7.3.1",
     "@vue/cli-shared-utils": "~3.4.0",
     "@vue/eslint-config-prettier": "~4.0.1",
     "@vue/server-test-utils": "~1.0.0-beta.29",
@@ -63,7 +76,7 @@
     "babel-jest": "~24.1.0",
     "cypress-cucumber-preprocessor": "~1.11.0",
     "eslint": "~5.13.0",
-    "eslint-config-prettier": "~3.1.0",
+    "eslint-config-prettier": "~3.6.0",
     "eslint-loader": "~2.1.2",
     "eslint-plugin-prettier": "~3.0.1",
     "eslint-plugin-vue": "~5.1.0",

styleguide/package.json

@@ -55,7 +55,7 @@
     "sass-loader": "~7.1.0",
     "theo": "~8.1.1",
     "vue-click-outside": "~1.0.7",
-    "vue-docgen-api": "^2.6.12",
+    "vue-docgen-api": "~2.6.12",
     "vue-router": "~3.0.2",
     "vue-svg-loader": "~0.12.0",
     "vue-template-compiler": "~2.6.6",