update dependencies and apply this option(TypeStrong/ts-loader#671) o…

…f ts-loader
LulumiProject · Oct 31, 2017 · d8d92ae · d8d92ae
1 parent 4952e46
commit d8d92ae
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 156 deletions.
diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js
@@ -36,7 +36,8 @@ let mainConfig = {
         use: {
           loader: 'ts-loader',
           options: {
-            appendTsSuffixTo: [/\.vue$/]
+            appendTsSuffixTo: [/\.vue$/],
+            onlyCompileBundledFiles: true
           }
         }
       },

diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
@@ -48,7 +48,8 @@ let rendererConfig = {
         use: {
           loader: 'ts-loader',
           options: {
-            appendTsSuffixTo: [/\.vue$/]
+            appendTsSuffixTo: [/\.vue$/],
+            onlyCompileBundledFiles: true
           }
         }
       },
@@ -200,7 +201,8 @@ let aboutConfig = {
         use: {
           loader: 'ts-loader',
           options: {
-            appendTsSuffixTo: [/\.vue$/]
+            appendTsSuffixTo: [/\.vue$/],
+            onlyCompileBundledFiles: true
           }
         }
       },

diff --git a/package.json b/package.json
@@ -32,15 +32,15 @@
   "author": "Boik Su <boik@tdohacker.org>",
   "license": "Apache-2.0",
   "dependencies": {
-    "axios": "^0.16.2",
-    "collect.js": "^3.0.51",
+    "axios": "^0.17.0",
+    "collect.js": "^3.0.52",
     "css-element-queries": "^0.4.0",
     "electron-localshortcut": "next",
     "electron-process-manager": "^0.1.0",
     "fetch-jsonp": "^1.1.3",
     "fuse.js": "^3.2.0",
     "lulumi": "^0.0.23",
-    "nanoid": "^0.2.2",
+    "nanoid": "^1.0.1",
     "node-localstorage": "^1.3.0",
     "punycode": "^2.1.0",
     "vue": "2.4.4",
@@ -50,12 +50,12 @@
     "vuex": "2.4.1"
   },
   "devDependencies": {
-    "@types/chrome": "^0.0.50",
-    "@types/mocha": "^2.2.43",
-    "@types/webpack": "^3.0.13",
+    "@types/chrome": "^0.0.51",
+    "@types/mocha": "^2.2.44",
+    "@types/webpack": "^3.0.14",
     "@types/webpack-env": "^1.13.2",
     "@types/webpack-hot-middleware": "^2.16.0",
-    "ava": "^0.22.0",
+    "ava": "^0.23.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.0.1",
@@ -68,30 +68,30 @@
     "babel-minify-webpack-plugin": "^0.2.0",
     "cfonts": "^1.1.3",
     "chai": "^4.1.2",
-    "chalk": "^2.2.0",
-    "cross-env": "^5.1.0",
+    "chalk": "^2.3.0",
+    "cross-env": "^5.1.1",
     "css-loader": "^0.28.7",
     "del": "^3.0.0",
     "devtron": "^1.4.0",
     "electron": "1.8.2-beta.1",
     "electron-debug": "^1.4.0",
-    "electron-devtools-installer": "^2.2.0",
+    "electron-devtools-installer": "^2.2.1",
     "electron-packager": "^9.1.0",
     "electron-rebuild": "^1.6.0",
-    "element-ui": "^1.4.7",
-    "eslint": "^4.9.0",
+    "element-ui": "1.4.8",
+    "eslint": "^4.10.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-loader": "^1.9.0",
     "eslint-plugin-html": "3.2.2",
     "eslint-plugin-import": "^2.8.0",
-    "extract-text-webpack-plugin": "^3.0.1",
+    "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.5",
     "git-rev-sync": "^1.9.1",
     "html-webpack-plugin": "^2.30.1",
     "inject-loader": "^3.0.1",
-    "iview": "^2.5.1",
+    "iview": "2.5.1",
     "json-loader": "^0.5.7",
     "karma": "^1.7.1",
     "karma-chai": "^0.1.0",
@@ -101,25 +101,25 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.31",
     "karma-webpack": "^2.0.5",
-    "less": "2.7.2",
+    "less": "2.7.3",
     "less-loader": "^4.0.5",
     "mocha": "^4.0.1",
     "mockery": "^2.1.0",
     "multispinner": "^0.2.1",
     "pug": "^2.0.0-rc.4",
     "pug-html-loader": "^1.1.5",
     "require-dir": "^0.3.2",
-    "sinon": "^4.0.1",
+    "sinon": "^4.0.2",
     "sortablejs": "^1.6.1",
     "spectron": "^3.7.2",
     "style-loader": "^0.19.0",
     "tree-kill": "^1.2.0",
-    "tslint": "^5.7.0",
+    "tslint": "^5.8.0",
     "tslint-config-airbnb": "^5.3.0",
     "tslint-loader": "^3.5.3",
-    "ts-loader": "^3.0.3",
+    "ts-loader": "^3.1.1",
     "typescript": "^2.5.3",
-    "typescript-formatter": "^6.0.0",
+    "typescript-formatter": "^7.0.0",
     "url-loader": "^0.6.2",
     "vue-awesome": "^2.3.3",
     "vue-class-component": "5.0.2",

diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -21,9 +21,6 @@
       "es7",
       "es2017.object"
     ],
-    "typeRoots": [
-      "../node_modules/@types"
-    ],
     "types": [
       "chrome",
       "node",
@@ -34,6 +31,7 @@
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../node_modules/electron/electron.d.ts"
   ]
 }