解决require引用的bug

yangdan8 · yangdan8 · commit 3ea258b43f75 · 2017-10-25T00:20:46.000+08:00
diff --git a/build/utils.js b/build/utils.js
@@ -16,12 +16,13 @@ exports.assetsPath = function(_path) {
 
 exports.cssLoaders = function(options) {
     options = options || {};
+    const isSourceMap = !!options.sourceMap;
 
     const cssLoader = {
         loader: 'css-loader',
         options: {
             minimize: process.env.NODE_ENV === 'production',
-            sourceMap: options.sourceMap
+            sourceMap: isSourceMap
         }
     };
 
@@ -30,14 +31,14 @@ exports.cssLoaders = function(options) {
         const loaders = [cssLoader, {
             loader: 'postcss-loader',
             options: {
-                sourceMap: false
+                sourceMap: isSourceMap
             }
         }];
         if (loader) {
             loaders.push({
                 loader: loader + '-loader',
                 options: Object.assign({}, loaderOptions, {
-                    sourceMap: options.sourceMap
+                    sourceMap: isSourceMap
                 })
             });
         }
diff --git a/package.json b/package.json
@@ -1,127 +1,126 @@
 {
-  "name": "vue-demo",
-  "version": "1.0.0",
-  "description": "A Vue.js project",
-  "author": "yangd <13532023084@139.com>",
-  "private": true,
-  "scripts": {
-    "dev": "node build/dev-server.js",
-    "start": "npm run dev",
-    "build": "node build/build.js",
-    "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
-    "e2e": "node test/e2e/runner.js",
-    "test": "npm run unit && npm run e2e",
-    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
-  },
-  "dependencies": {
-    "axios": "^0.16.2",
-    "clipboard": "^1.7.1",
-    "dexie": "^2.0.1",
-    "echarts": "^3.7.2",
-    "iview": "^2.5.1",
-    "less": "^3.0.0-alpha.3",
-    "less-loader": "^4.0.5",
-    "node-sass": "^4.5.3",
-    "normalize.css": "^7.0.0",
-    "sass-loader": "^6.0.6",
-    "ts-loader": "^3.0.5",
-    "tslib": "^1.8.0",
-    "typescript": "^2.5.3",
-    "vue": "^2.5.2",
-    "vue-class-component": "^6.0.0",
-    "vue-router": "^3.0.1"
-  },
-  "devDependencies": {
-    "@types/jasmine": "^2.6.0",
-    "@types/node": "^8.0.46",
-    "@types/webpack": "^3.0.13",
-    "@types/webpack-env": "^1.13.2",
-    "autoprefixer": "^7.1.2",
-    "awesome-typescript-loader": "^3.2.3",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^7.1.1",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-istanbul": "^4.1.1",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-env": "^1.3.2",
-    "babel-preset-stage-2": "^6.22.0",
-    "babel-register": "^6.22.0",
-    "babel-runtime": "^6.26.0",
-    "chai": "^4.1.2",
-    "chalk": "^2.0.1",
-    "chromedriver": "^2.27.2",
-    "connect-history-api-fallback": "^1.3.0",
-    "copy-webpack-plugin": "^4.0.1",
-    "cross-env": "^5.0.1",
-    "cross-spawn": "^5.0.1",
-    "css-loader": "^0.28.0",
-    "eslint": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.14.1",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^1.1.4",
-    "friendly-errors-webpack-plugin": "^1.6.1",
-    "html-loader": "^0.5.1",
-    "html-webpack-plugin": "^2.30.1",
-    "http-proxy-middleware": "^0.17.3",
-    "inject-loader": "^3.0.0",
-    "karma": "^1.4.1",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "karma-phantomjs-shim": "^1.4.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less-loader": "^4.0.5",
-    "mocha": "^3.2.0",
-    "nightwatch": "^0.9.12",
-    "node-gyp": "^3.6.2",
-    "opn": "^5.1.0",
-    "optimize-css-assets-webpack-plugin": "^3.2.0",
-    "ora": "^1.2.0",
-    "phantomjs-prebuilt": "^2.1.14",
-    "portfinder": "^1.0.13",
-    "postcss-loader": "^2.0.8",
-    "rimraf": "^2.6.0",
-    "sass-loader": "^6.0.6",
-    "selenium-server": "^3.0.1",
-    "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
-    "sinon": "^4.0.0",
-    "sinon-chai": "^2.8.0",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.1",
-    "ts-loader": "^3.0.5",
-    "typescript": "^2.5.3",
-    "typings": "^2.1.1",
-    "url-loader": "^0.5.8",
-    "vue-loader": "^13.3.0",
-    "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.2",
-    "vue-ts-loader": "^0.0.3",
-    "webpack": "^3.6.0",
-    "webpack-bundle-analyzer": "^2.9.0",
-    "webpack-dev-middleware": "^1.12.0",
-    "webpack-hot-middleware": "^2.18.2",
-    "webpack-merge": "^4.1.0"
-  },
-  "engines": {
-    "node": ">= 4.0.0",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
-}
+    "name": "vue-demo",
+    "version": "1.0.0",
+    "description": "A Vue.js project",
+    "author": "yangd <13532023084@139.com>",
+    "private": true,
+    "scripts": {
+        "dev": "node build/dev-server.js",
+        "start": "npm run dev",
+        "build": "node build/build.js",
+        "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
+        "e2e": "node test/e2e/runner.js",
+        "test": "npm run unit && npm run e2e",
+        "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
+    },
+    "dependencies": {
+        "axios": "^0.16.2",
+        "clipboard": "^1.7.1",
+        "dexie": "^2.0.1",
+        "echarts": "^3.7.2",
+        "iview": "^2.5.1",
+        "less": "^3.0.0-alpha.3",
+        "less-loader": "^4.0.5",
+        "node-sass": "^4.5.3",
+        "normalize.css": "^7.0.0",
+        "sass-loader": "^6.0.6",
+        "ts-loader": "^3.0.5",
+        "tslib": "^1.8.0",
+        "typescript": "^2.5.3",
+        "vue": "^2.5.2",
+        "vue-class-component": "^6.0.0",
+        "vue-router": "^3.0.1"
+    },
+    "devDependencies": {
+        "@types/jasmine": "^2.6.0",
+        "@types/webpack": "^3.0.13",
+        "@types/webpack-env": "^1.13.2",
+        "autoprefixer": "^7.1.2",
+        "awesome-typescript-loader": "^3.2.3",
+        "babel-core": "^6.22.1",
+        "babel-eslint": "^7.1.1",
+        "babel-loader": "^7.1.1",
+        "babel-plugin-istanbul": "^4.1.1",
+        "babel-plugin-transform-runtime": "^6.22.0",
+        "babel-preset-env": "^1.3.2",
+        "babel-preset-stage-2": "^6.22.0",
+        "babel-register": "^6.22.0",
+        "babel-runtime": "^6.26.0",
+        "chai": "^4.1.2",
+        "chalk": "^2.0.1",
+        "chromedriver": "^2.27.2",
+        "connect-history-api-fallback": "^1.3.0",
+        "copy-webpack-plugin": "^4.0.1",
+        "cross-env": "^5.0.1",
+        "cross-spawn": "^5.0.1",
+        "css-loader": "^0.28.0",
+        "eslint": "^3.19.0",
+        "eslint-config-standard": "^10.2.1",
+        "eslint-friendly-formatter": "^3.0.0",
+        "eslint-loader": "^1.7.1",
+        "eslint-plugin-html": "^3.0.0",
+        "eslint-plugin-import": "^2.7.0",
+        "eslint-plugin-node": "^5.2.0",
+        "eslint-plugin-promise": "^3.4.0",
+        "eslint-plugin-standard": "^3.0.1",
+        "eventsource-polyfill": "^0.9.6",
+        "express": "^4.14.1",
+        "extract-text-webpack-plugin": "^3.0.0",
+        "file-loader": "^1.1.4",
+        "friendly-errors-webpack-plugin": "^1.6.1",
+        "html-loader": "^0.5.1",
+        "html-webpack-plugin": "^2.30.1",
+        "http-proxy-middleware": "^0.17.3",
+        "inject-loader": "^3.0.0",
+        "karma": "^1.4.1",
+        "karma-coverage": "^1.1.1",
+        "karma-mocha": "^1.3.0",
+        "karma-phantomjs-launcher": "^1.0.2",
+        "karma-phantomjs-shim": "^1.4.0",
+        "karma-sinon-chai": "^1.3.1",
+        "karma-sourcemap-loader": "^0.3.7",
+        "karma-spec-reporter": "0.0.31",
+        "karma-webpack": "^2.0.2",
+        "less-loader": "^4.0.5",
+        "mocha": "^3.2.0",
+        "nightwatch": "^0.9.12",
+        "node-gyp": "^3.6.2",
+        "opn": "^5.1.0",
+        "optimize-css-assets-webpack-plugin": "^3.2.0",
+        "ora": "^1.2.0",
+        "phantomjs-prebuilt": "^2.1.14",
+        "portfinder": "^1.0.13",
+        "postcss-loader": "^2.0.8",
+        "rimraf": "^2.6.0",
+        "sass-loader": "^6.0.6",
+        "selenium-server": "^3.0.1",
+        "semver": "^5.3.0",
+        "shelljs": "^0.7.6",
+        "sinon": "^4.0.0",
+        "sinon-chai": "^2.8.0",
+        "stylus": "^0.54.5",
+        "stylus-loader": "^3.0.1",
+        "ts-loader": "^3.0.5",
+        "typescript": "^2.5.3",
+        "typings": "^2.1.1",
+        "url-loader": "^0.5.8",
+        "vue-loader": "^13.3.0",
+        "vue-style-loader": "^3.0.1",
+        "vue-template-compiler": "^2.5.2",
+        "vue-ts-loader": "^0.0.3",
+        "webpack": "^3.6.0",
+        "webpack-bundle-analyzer": "^2.9.0",
+        "webpack-dev-middleware": "^1.12.0",
+        "webpack-hot-middleware": "^2.18.2",
+        "webpack-merge": "^4.1.0"
+    },
+    "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not ie <= 8"
+    ]
+}
diff --git a/src/components/account/login.ts b/src/components/account/login.ts
@@ -1,5 +1,5 @@
 import Vue from "vue";
-import Component from "vue-class-component/lib";
+import Component from "vue-class-component";
 require("./login.scss");
 
 @Component({
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -1,7 +1,7 @@
 /// <reference path="../../node_modules/@types/webpack-env/index.d.ts" />
-
 import Vue from 'vue';
 import Router, { RouterOptions } from 'vue-router';
+import Login from '../components/account/login.ts';
 
 Vue.use(Router);
 
@@ -11,17 +11,14 @@ export default new Router({
       path: '/',
       name: 'account_login',
       components: {
-        Login: (resolve) => {
-          require(['../components/account/login.ts'], resolve);
-        }
-        // Login: (resolve) => {
-        //   require.ensure([], (require) => {
-        //     const cmp = require('../components/account/login').default;
-        //     resolve(cmp);
-        //   }, 'Login');
-        // }
-        // Login: () => require('../components/account/login.ts').default
-      }
+        Login: Login // require('../components/account/login.ts')
+      // Login: resolve => require(['../components/account/login.ts'], resolve)
+      // Login: (resolve) => {
+      //   require.ensure([], (require) => {
+      //     const cmp = require('../components/account/login').default;
+      //     resolve(cmp);
+      //   }, 'Login');
+       }
     }
   ]
 } as RouterOptions);
diff --git a/tsconfig.json b/tsconfig.json
@@ -22,7 +22,8 @@
             "node"
         ],
         "typeRoots": [
-            "node_modules/@types"
+            "node_modules/@types",
+            "./types-extend"
         ]
     },
     "exclude": [
diff --git a/types-extend/index.d.ts b/types-extend/index.d.ts
