feat(nuxt-update): updated to version 2

GrabarzUndPartner · Oct 10, 2018 · a36fd0c · a36fd0c
1 parent 73b9884
commit a36fd0c
Show file tree

Hide file tree

Showing 17 changed files with 7,906 additions and 5,047 deletions.
diff --git a/.svgorc.yml b/.svgorc.yml
@@ -0,0 +1,42 @@
+plugins:
+  - cleanupAttrs: true,
+  - removeDoctype: true,
+  - removeXMLProcInst: true,
+  - removeComments: true,
+  - removeMetadata: true,
+  - removeTitle: true,
+  - removeDesc: true,
+  - removeUselessDefs: true,
+  - removeXMLNS: true,
+  - removeEditorsNSData: true,
+  - removeEmptyAttrs: true,
+  - removeHiddenElems: false,
+  - removeEmptyText: true,
+  - removeEmptyContainers: true,
+  - removeViewBox: true,
+  - cleanupEnableBackground: true,
+  - minifyStyles: true,
+  - convertStyleToAttrs: true,
+  - convertColors: true,
+  - convertPathData: true,
+  - convertTransform: true,
+  - removeUnknownsAndDefaults: true,
+  - removeNonInheritableGroupAttrs: true,
+  - removeUselessStrokeAndFill: true,
+  - removeUnusedNS: true,
+  - cleanupIDs: true,
+  - cleanupNumericValues: true,
+  - cleanupListOfValues: true,
+  - moveElemsAttrsToGroup: true,
+  - moveGroupAttrsToElems: true,
+  - collapseGroups: true,
+  - mergePaths: true,
+  - convertShapeToPath: true,
+  - sortAttrs: false,
+  - removeDimensions: false,
+  - removeAttrs: false,
+  - removeElementsByAttr: false,
+  - addClassesToSVGElement: false,
+  - addAttributesToSVGElement: false,
+  - removeStyleElement: false,
+  - removeScriptElement: false
diff --git a/env/nuxt.config.js b/env/nuxt.config.js
@@ -1,8 +1,8 @@
+process.env.DEBUG = 'nuxt:*';
 const webpackPlugins = require('./webpack/plugins');
 const webpackModules = require('./webpack/modules');
 // const i18nExtensions = require('vue-i18n-extensions');
 
-process.env.DEBUG = 'nuxt:*';
 module.exports = {
   dev: process.env.NODE_ENV === 'development',
   srcDir: 'src/',
@@ -14,10 +14,12 @@ module.exports = {
       openAnalyzer: false
     },
 
+    // plugins: [],
+
     // vendor: ['vue-i18n'],
 
-    extend(config) {
-      webpackPlugins(config.plugins, this.options.srcDir);
+    extend(config, compiler) {
+      webpackPlugins(config.plugins, this.options.srcDir, compiler);
       webpackModules(config.module);
     }
   },

diff --git a/env/webpack/modules.js b/env/webpack/modules.js
@@ -3,9 +3,8 @@ module.exports = function(module) {
     .concat(
       ...[
         require('./modules/url-loader')(module.rules),
-        require('./modules/vue-loader')(module.rules),
-        require('./modules/svg-sprite-loader')(module.rules),
-        require('./modules/image-loader')(module.rules)
+        require('./modules/svg-sprite-loader')(module.rules)
+        // require('./modules/vue-loader')(module.rules)
       ]
     )
     .reduce(function(result, item) {

diff --git a/env/webpack/modules/image-loader.js b/env/webpack/modules/image-loader.js
diff --git a/env/webpack/modules/svg-sprite-loader.js b/env/webpack/modules/svg-sprite-loader.js
@@ -19,54 +19,7 @@ module.exports = function() {
         {
           loader: 'svgo-loader',
           options: {
-            plugins: [
-              {
-                cleanupAttrs: true,
-                removeDoctype: true,
-                removeXMLProcInst: true,
-                removeComments: true,
-                removeMetadata: true,
-                removeTitle: true,
-                removeDesc: true,
-                removeUselessDefs: true,
-                removeXMLNS: true,
-                removeEditorsNSData: true,
-                removeEmptyAttrs: true,
-                removeHiddenElems: false,
-                removeEmptyText: true,
-                removeEmptyContainers: true,
-                removeViewBox: true,
-                cleanupEnableBackground: true,
-                minifyStyles: true,
-                convertStyleToAttrs: true,
-                convertColors: true,
-                convertPathData: true,
-                convertTransform: true,
-                removeUnknownsAndDefaults: true,
-                removeNonInheritableGroupAttrs: true,
-                removeUselessStrokeAndFill: true,
-                removeUnusedNS: true,
-                cleanupIDs: true,
-                cleanupNumericValues: true,
-                cleanupListOfValues: true,
-                moveElemsAttrsToGroup: true,
-                moveGroupAttrsToElems: true,
-                collapseGroups: true,
-                mergePaths: true,
-                convertShapeToPath: true,
-
-                // WARNING!!!! Do not change!
-                sortAttrs: false,
-                removeDimensions: false,
-                removeAttrs: false,
-                removeElementsByAttr: false,
-                addClassesToSVGElement: false,
-                addAttributesToSVGElement: false,
-                removeStyleElement: false,
-                removeScriptElement: false
-                // WARNING!!!!
-              }
-            ]
+            externalConfig: '.svgorc.yml'
           }
         }
       ]

diff --git a/env/webpack/modules/url-loader.js b/env/webpack/modules/url-loader.js
@@ -1,5 +1,9 @@
-module.exports = function (rules) {
-  let urlLoader = rules.find((rule) => rule.loader === 'url-loader');
-  urlLoader.test = /\.()$/;
+module.exports = function(rules) {
+  let urlLoader = rules.find(
+    rule =>
+      rule.loader === 'url-loader' ||
+      (rule.use && rule.use.find(item => item.loader === 'url-loader'))
+  );
+  urlLoader.test = /(?!\.png24)\.(png|jpe?g|gif|webp)$/;
   return [];
 };
diff --git a/env/webpack/plugins.js b/env/webpack/plugins.js
@@ -1,30 +1,8 @@
-const fs = require('fs');
-const VirtualImage = require('./plugins/virtual-image');
-
 module.exports = function(plugins) {
   let list = []
     .concat(
       ...[
-        {
-          env: {
-            development: true,
-            production: true,
-            build: true,
-            static: true
-          },
-          plugin: new VirtualImage(
-            {},
-            {
-              test: /((jpe?g|png)\.webp)|(png24\.png)$/i,
-              handler: function(p, resolve) {
-                resolve(
-                  fs.readFileSync(p.replace(/(\w+\.(png|jpe?g|gif)).*$/i, '$1'))
-                );
-              }
-            }
-          )
-        },
-        // require('./plugins/virtual-files'),
+        require('./plugins/virtual-file'),
         require('./plugins/imagemin'),
         require('./plugins/svg-sprite'),
         require('./plugins/monitor')

diff --git a/env/webpack/plugins/imagemin.js b/env/webpack/plugins/imagemin.js
@@ -17,7 +17,8 @@ module.exports = [
         quality: '75-100'
       }
     })
-  }, {
+  },
+  {
     env: {
       development: false,
       production: true,
@@ -39,7 +40,8 @@ module.exports = [
         })
       ]
     })
-  }, {
+  },
+  {
     env: {
       development: false,
       production: true,

diff --git a/env/webpack/plugins/virtual-file.js b/env/webpack/plugins/virtual-file.js
@@ -0,0 +1,41 @@
+const fs = require('fs');
+const VirtualImage = require('webpack-virtual-modules');
+
+module.exports = [
+  {
+    env: {
+      development: true,
+      production: true,
+      build: true,
+      static: true
+    },
+    plugin: new VirtualImage(
+      // {
+      //   'src/assets/image1.png.webp': fs.readFileSync(
+      //     'src/assets/image1.png'
+      //   )
+      // }
+      /\.(webp)$/,
+      function(resource, regex) {
+        return {
+          path: 'src/' + resource.request,
+          file: fs.readFileSync('src/' + resource.request.replace(regex, ''))
+        };
+      }
+    )
+  },
+  {
+    env: {
+      development: true,
+      production: true,
+      build: true,
+      static: true
+    },
+    plugin: new VirtualImage(/\.(png24\.png)$/, function(resource, regex) {
+      return {
+        path: 'src/' + resource.request,
+        file: fs.readFileSync('src/' + resource.request.replace(regex, '.png'))
+      };
+    })
+  }
+];
diff --git a/env/webpack/plugins/virtual-files.js b/env/webpack/plugins/virtual-files.js