update vue-loader & fixed #2795

2018-01-22 19:15:40 +08:00 · 2018-01-22 19:15:40 +08:00 · 11867c87a7
commit 11867c87a7
parent 342390e691
3 changed files with 140 additions and 160 deletions
--- a/examples/main.js
+++ b/examples/main.js
@ -16,196 +16,196 @@ Vue.config.debug = true;

 // 路由配置
 const router = new VueRouter({
+    esModule: false,
    routes: [
        {
            path: '/layout',
-            component: require('./routers/layout.vue')
+            component: (resolve) => require(['./routers/layout.vue'], resolve)
        },
        {
            path: '/affix',
-            component: require('./routers/affix.vue')
+            component: (resolve) => require(['./routers/affix.vue'], resolve)
        },
        {
            path: '/grid',
-            component: require('./routers/grid.vue')
+            component: (resolve) => require(['./routers/grid.vue'], resolve)
        },
        {
            path: '/button',
-            component: require('./routers/button.vue')
+            component: (resolve) => require(['./routers/button.vue'], resolve)
        },
        {
            path: '/input',
-            component: require('./routers/input.vue')
+            component: (resolve) => require(['./routers/input.vue'], resolve)
        },
        {
            path: '/radio',
-            component: require('./routers/radio.vue')
+            component: (resolve) => require(['./routers/radio.vue'], resolve)
        },
        {
            path: '/checkbox',
-            component: require('./routers/checkbox.vue')
+            component: (resolve) => require(['./routers/checkbox.vue'], resolve)
        },
        {
            path: '/steps',
-            component: require('./routers/steps.vue')
+            component: (resolve) => require(['./routers/steps.vue'], resolve)
        },
        {
            path: '/timeline',
-            component: require('./routers/timeline.vue')
+            component: (resolve) => require(['./routers/timeline.vue'], resolve)
        },
        {
            path: '/switch',
-            component: require('./routers/switch.vue')
+            component: (resolve) => require(['./routers/switch.vue'], resolve)
        },
        {
            path: '/alert',
-            component: require('./routers/alert.vue')
+            component: (resolve) => require(['./routers/alert.vue'], resolve)
        },
        {
            path: '/badge',
-            component: require('./routers/badge.vue')
+            component: (resolve) => require(['./routers/badge.vue'], resolve)
        },
        {
            path: '/tag',
-            component: require('./routers/tag.vue')
+            component: (resolve) => require(['./routers/tag.vue'], resolve)
        },
        {
            path: '/input-number',
-            component: require('./routers/input-number.vue')
+            component: (resolve) => require(['./routers/input-number.vue'], resolve)
        },
        {
            path: '/upload',
-            component: require('./routers/upload.vue')
+            component: (resolve) => require(['./routers/upload.vue'], resolve)
        },
        {
            path: '/progress',
-            component: require('./routers/progress.vue')
+            component: (resolve) => require(['./routers/progress.vue'], resolve)
        },
        {
            path: '/collapse',
-            component: require('./routers/collapse.vue')
+            component: (resolve) => require(['./routers/collapse.vue'], resolve)
        },
        {
            path: '/carousel',
-            component: require('./routers/carousel.vue')
+            component: (resolve) => require(['./routers/carousel.vue'], resolve)
        },
        {
            path: '/card',
-            component: require('./routers/card.vue')
+            component: (resolve) => require(['./routers/card.vue'], resolve)
        },
        {
            path: '/tree',
-            component: require('./routers/tree.vue')
+            component: (resolve) => require(['./routers/tree.vue'], resolve)
        },
        {
            path: '/rate',
-            component: require('./routers/rate.vue')
+            component: (resolve) => require(['./routers/rate.vue'], resolve)
        },
        {
            path: '/circle',
-            component: require('./routers/circle.vue')
+            component: (resolve) => require(['./routers/circle.vue'], resolve)
        },
        {
            path: '/tabs',
-            component: require('./routers/tabs.vue')
+            component: (resolve) => require(['./routers/tabs.vue'], resolve)
        },
        {
            path: '/tooltip',
-            component: require('./routers/tooltip.vue')
+            component: (resolve) => require(['./routers/tooltip.vue'], resolve)
        },
        {
            path: '/poptip',
-            component: require('./routers/poptip.vue')
+            component: (resolve) => require(['./routers/poptip.vue'], resolve)
        },
        {
            path: '/slider',
-            component: require('./routers/slider.vue')
+            component: (resolve) => require(['./routers/slider.vue'], resolve)
        },
        {
            path: '/dropdown',
-            component: require('./routers/dropdown.vue')
+            component: (resolve) => require(['./routers/dropdown.vue'], resolve)
        },
        {
            path: '/breadcrumb',
-            component: require('./routers/breadcrumb.vue')
+            component: (resolve) => require(['./routers/breadcrumb.vue'], resolve)
        },
        {
            path: '/menu',
-            component: require('./routers/menu.vue')
+            component: (resolve) => require(['./routers/menu.vue'], resolve)
        },
        {
            path: '/spin',
-            component: require('./routers/spin.vue')
+            component: (resolve) => require(['./routers/spin.vue'], resolve)
        },
        {
            path: '/cascader',
-            component: require('./routers/cascader.vue')
+            component: (resolve) => require(['./routers/cascader.vue'], resolve)
        },
        {
            path: '/select',
-            component: require('./routers/select.vue')
+            component: (resolve) => require(['./routers/select.vue'], resolve)
        },
        {
            path: '/backtop',
-            component: require('./routers/back-top.vue')
+            component: (resolve) => require(['./routers/back-top.vue'], resolve)
        },
        {
            path: '/page',
-            component: require('./routers/page.vue')
+            component: (resolve) => require(['./routers/page.vue'], resolve)
        },
        {
            path: '/transfer',
-            component: require('./routers/transfer.vue')
+            component: (resolve) => require(['./routers/transfer.vue'], resolve)
        },
        {
            path: '/date',
-            component: require('./routers/date.vue')
+            component: (resolve) => require(['./routers/date.vue'], resolve)
        },
        {
            path: '/form',
-            component: require('./routers/form.vue')
+            component: (resolve) => require(['./routers/form.vue'], resolve)
        },
        {
            path: '/table',
-            component: require('./routers/table.vue')
+            component: (resolve) => require(['./routers/table.vue'], resolve)
        },
        {
            path: '/loading-bar',
-            component: require('./routers/loading-bar.vue')
+            component: (resolve) => require(['./routers/loading-bar.vue'], resolve)
        },
        {
            path: '/modal',
-            component: require('./routers/modal.vue')
+            component: (resolve) => require(['./routers/modal.vue'], resolve)
        },
        {
            path: '/message',
-            component: require('./routers/message.vue')
+            component: (resolve) => require(['./routers/message.vue'], resolve)
        },
        {
            path: '/notice',
-            component: require('./routers/notice.vue')
+            component: (resolve) => require(['./routers/notice.vue'], resolve)
        },
        {
            path: '/avatar',
-            component: require('./routers/avatar.vue')
+            component: (resolve) => require(['./routers/avatar.vue'], resolve)
        },
        {
            path: '/color-picker',
-            component: require('./routers/color-picker.vue')
+            component: (resolve) => require(['./routers/color-picker.vue'], resolve)
        },
        {
            path: '/auto-complete',
-            component: require('./routers/auto-complete.vue')
+            component: (resolve) => require(['./routers/auto-complete.vue'], resolve)
        },
        {
            path: '/scroll',
-            component: require('./routers/scroll.vue')
+            component: (resolve) => require(['./routers/scroll.vue'], resolve)
        }
    ]
 });

-new Vue({
-    el: '#app',
+const app = new Vue({
    router: router,
    render: h => h(App)
-});
+}).$mount('#app');
--- a/package-lock.json
+++ b/package-lock.json
@ -1456,7 +1456,7 @@
        "deep-equal": "1.0.1",
        "dns-equal": "1.0.0",
        "dns-txt": "2.0.2",
-        "multicast-dns": "6.2.1",
+        "multicast-dns": "6.2.2",
        "multicast-dns-service-types": "1.1.0"
      }
    },
@ -2341,16 +2341,6 @@
        "typedarray": "0.0.6"
      }
    },
-    "config-chain": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
-      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
-      "dev": true,
-      "requires": {
-        "ini": "1.3.5",
-        "proto-list": "1.2.4"
-      }
-    },
    "connect": {
      "version": "3.6.5",
      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
@ -3157,30 +3147,6 @@
        "jsbn": "0.1.1"
      }
    },
-    "editorconfig": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
-      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.5.1",
-        "commander": "2.13.0",
-        "lru-cache": "3.2.0",
-        "semver": "5.5.0",
-        "sigmund": "1.0.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-          "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
-          "dev": true,
-          "requires": {
-            "pseudomap": "1.0.2"
-          }
-        }
-      }
-    },
    "ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@ -3203,9 +3169,9 @@
      }
    },
    "element-resize-detector": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.1.12.tgz",
-      "integrity": "sha1-iz/W7t2hf5wAs2Cg6i35knroC6I=",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.1.13.tgz",
+      "integrity": "sha1-9hkH6YqRsa0hX5J5C8FRE99oRE0=",
      "requires": {
        "batch-processor": "1.0.0"
      }
@ -7203,18 +7169,6 @@
      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
      "dev": true
    },
-    "js-beautify": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz",
-      "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
-      "dev": true,
-      "requires": {
-        "config-chain": "1.1.11",
-        "editorconfig": "0.13.3",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6"
-      }
-    },
    "js-tokens": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@ -8426,9 +8380,9 @@
      "dev": true
    },
    "multicast-dns": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz",
-      "integrity": "sha512-uV3/ckdsffHx9IrGQrx613mturMdMqQ06WTq+C09NsStJ9iNG6RcUWgPKs1Rfjy+idZT6tfQoXEusGNnEZhT3w==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz",
+      "integrity": "sha512-xTO41ApiRHMVDBYhNL9bEhx7kRf1hq3OqPOnOy8bpTi0JZSxVPDre7ZRpTHLDlxmhf6d/FL+10E8VX1QRd+0DA==",
      "dev": true,
      "requires": {
        "dns-packet": "1.3.1",
@ -10170,6 +10124,12 @@
      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
      "dev": true
    },
+    "prettier": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz",
+      "integrity": "sha512-TcdNoQIWFoHblurqqU6d1ysopjq7UX0oRcT/hJ8qvBAELiYWn+Ugf0AXdnzISEJ7vuhNnQ98N8jR8Sh53x4IZg==",
+      "dev": true
+    },
    "pretty-error": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
@ -10242,12 +10202,6 @@
        "object-assign": "4.1.1"
      }
    },
-    "proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true
-    },
    "proxy-addr": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
@ -13208,25 +13162,63 @@
      }
    },
    "vue-loader": {
-      "version": "11.3.4",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-11.3.4.tgz",
-      "integrity": "sha1-ZeEKRM4JLZBuFLvHKYHeyZ6wkNI=",
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.0.tgz",
+      "integrity": "sha512-kDXRgglOOltghngrDFS/YfFew7e0d8fkvPHLYAfLgur7GW0cBt+J0fpBReWY2pixA09dL13abfE4fECyRH4HGg==",
      "dev": true,
      "requires": {
        "consolidate": "0.14.5",
        "hash-sum": "1.0.2",
-        "js-beautify": "1.7.5",
        "loader-utils": "1.1.0",
        "lru-cache": "4.1.1",
-        "postcss": "5.2.18",
+        "postcss": "6.0.16",
        "postcss-load-config": "1.2.0",
        "postcss-selector-parser": "2.2.3",
-        "source-map": "0.5.7",
+        "prettier": "1.10.2",
+        "resolve": "1.5.0",
+        "source-map": "0.6.1",
        "vue-hot-reload-api": "2.2.4",
-        "vue-style-loader": "2.0.5",
+        "vue-style-loader": "3.0.3",
        "vue-template-es2015-compiler": "1.6.0"
      },
      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.5.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "4.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+              "dev": true,
+              "requires": {
+                "has-flag": "2.0.0"
+              }
+            }
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
        "loader-utils": {
          "version": "1.1.0",
          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
@ -13238,12 +13230,32 @@
            "json5": "0.5.1"
          }
        },
+        "postcss": {
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "5.1.0"
+          }
+        },
        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
          "dev": true
        },
+        "supports-color": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
+          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        },
        "vue-hot-reload-api": {
          "version": "2.2.4",
          "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz",
@ -13251,9 +13263,9 @@
          "dev": true
        },
        "vue-style-loader": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-2.0.5.tgz",
-          "integrity": "sha1-8O+smS/r4/EuST4zTtsTzSNaPSI=",
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.0.3.tgz",
+          "integrity": "sha512-P/ihpaZKU23T1kq3E0y4c+F8sbm1HQO69EFYoLoGMSGVAHroHsGir/WQ9qUavP8dyFYHmXenzHaJ/nqd8vfaxw==",
          "dev": true,
          "requires": {
            "hash-sum": "1.0.2",
@ -13567,9 +13579,9 @@
      }
    },
    "webpack-dev-server": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.0.tgz",
-      "integrity": "sha512-lXzc36DGjKUVinETNmDWhfZFRbHMhatuF+lKex+czqY+JVe0Qf2V+Ig6/svDdbt/DmXFXuLQmSqhncYCqYf3qA==",
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.1.tgz",
+      "integrity": "sha512-ombhu5KsO/85sVshIDTyQ5HF3xjZR3N0sf5Ao6h3vFwpNyzInEzA1GV3QPVjTMLTNckp8PjfG1PFGznzBwS5lg==",
      "dev": true,
      "requires": {
        "ansi-html": "0.0.7",
@ -13595,18 +13607,12 @@
        "sockjs": "0.3.19",
        "sockjs-client": "1.1.4",
        "spdy": "3.4.7",
-        "strip-ansi": "4.0.0",
+        "strip-ansi": "3.0.1",
        "supports-color": "5.1.0",
        "webpack-dev-middleware": "1.12.2",
        "yargs": "6.6.0"
      },
      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
        "anymatch": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@ -13682,23 +13688,6 @@
            "string-width": "1.0.2",
            "strip-ansi": "3.0.1",
            "wrap-ansi": "2.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "2.1.1"
-              }
-            }
          }
        },
        "debug": {
@ -13971,15 +13960,6 @@
            "lcid": "1.0.0"
          }
        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
        "supports-color": {
          "version": "5.1.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
--- a/package.json
+++ b/package.json
@ -42,7 +42,7 @@
  "dependencies": {
    "async-validator": "^1.8.2",
    "deepmerge": "^1.5.2",
-    "element-resize-detector": "^1.1.12",
+    "element-resize-detector": "^1.1.13",
    "lodash.throttle": "^4.1.1",
    "popper.js": "^0.6.4",
    "tinycolor2": "^1.4.1"
@ -101,12 +101,12 @@
    "vue": "^2.5.13",
    "vue-hot-reload-api": "^1.3.3",
    "vue-html-loader": "^1.2.3",
-    "vue-loader": "^11.3.4",
+    "vue-loader": "^13.7.0",
    "vue-router": "^2.8.1",
    "vue-style-loader": "^1.0.0",
    "vue-template-compiler": "^2.5.13",
    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.9.7",
+    "webpack-dev-server": "^2.11.1",
    "webpack-merge": "^3.0.0"
  },
  "engines": {