feat: update dev deps

Close #184
electron-userland · Aug 21, 2018 · c2f3d07 · c2f3d07
1 parent 9de2d68
commit c2f3d07
Show file tree

Hide file tree

Showing 13 changed files with 1,721 additions and 2,962 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/package.json b/package.json
@@ -16,31 +16,31 @@
   },
   "devDependencies": {
     "@develar/gitbook": "3.2.11",
-    "@types/electron-devtools-installer": "^2.0.3",
-    "@types/jest": "^22.2.3",
+    "@types/electron-devtools-installer": "^2.2.0",
+    "@types/jest": "^23.3.1",
     "@types/memory-fs": "^0.3.1",
-    "@types/node": "^10.1.2",
+    "@types/node": "^10.7.1",
     "@types/semver": "^5.5.0",
-    "@types/webpack": "^4.4.0",
+    "@types/webpack": "^4.4.10",
     "@types/webpack-merge": "^4.1.3",
-    "babel-preset-ts-node6-bluebird": "^2.0.6",
-    "cross-env": "^5.1.6",
+    "babel-preset-ts-node6-bluebird": "^2.0.10",
+    "cross-env": "^5.2.0",
     "develar-typescript-json-schema": "^0.20.0",
     "electron-builder-tslint-config": "^1.1.0",
-    "fs-extra-p": "^4.6.0",
+    "fs-extra-p": "^4.6.1",
     "gitbook-plugin-analytics": "^0.2.1",
     "gitbook-plugin-edit-link": "^2.0.2",
-    "gitbook-plugin-github": "^2.0.0",
+    "gitbook-plugin-github": "^3.0.0",
     "gitbook-plugin-github-buttons": "^3.0.0",
     "http-server": "^0.11.1",
-    "jest-cli": "^23.0.0-beta.2",
-    "jest-junit": "^4.0.0",
+    "jest-cli": "^23.5.0",
+    "jest-junit": "^5.1.0",
     "memory-fs": "^0.4.1",
-    "temp-file": "^3.1.2",
-    "ts-babel": "^5.0.5",
-    "tslint": "^5.10.0",
-    "typescript": "^2.8.3",
-    "webpack": "^4.8.3"
+    "temp-file": "^3.1.3",
+    "ts-babel": "^6.0.1",
+    "tslint": "^5.11.0",
+    "typescript": "^3.0.1",
+    "webpack": "^4.16.5"
   },
   "babel": {
     "presets": [

diff --git a/packages/electron-webpack-eslint/package.json b/packages/electron-webpack-eslint/package.json
@@ -1,14 +1,14 @@
 {
   "name": "electron-webpack-eslint",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "license": "MIT",
   "author": "Greg Holguin <[email protected]>",
   "files": [],
   "repository": "electron-userland/electron-webpack",
   "dependencies": {
-    "babel-eslint": "^8.2.3",
-    "eslint": "^4.19.1",
+    "babel-eslint": "^8.2.6",
+    "eslint": "^5.4.0",
     "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^2.0.0"
+    "eslint-loader": "^2.1.0"
   }
 }
diff --git a/packages/electron-webpack-js/package.json b/packages/electron-webpack-js/package.json
@@ -1,15 +1,15 @@
 {
   "name": "electron-webpack-js",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "license": "MIT",
   "author": "Vladimir Krivosheev <[email protected]>",
   "files": [],
   "repository": "electron-userland/electron-webpack",
   "dependencies": {
-    "@babel/core": "^7.0.0-beta.47",
+    "@babel/core": "^7.0.0-rc.1",
     "babel-loader": "^8.0.0-beta.2",
-    "babel-plugin-syntax-dynamic-import": "^7.0.0-beta.3",
-    "@babel/preset-env": "^7.0.0-beta.47",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0-rc.1",
+    "@babel/preset-env": "^7.0.0-rc.1",
     "babel-plugin-component": "^1.1.1"
   }
 }
diff --git a/packages/electron-webpack-ts/package.json b/packages/electron-webpack-ts/package.json
@@ -1,15 +1,15 @@
 {
   "name": "electron-webpack-ts",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "license": "MIT",
   "author": "Vladimir Krivosheev <[email protected]>",
   "files": [],
   "repository": "electron-userland/electron-webpack",
   "dependencies": {
-    "fork-ts-checker-webpack-plugin": "^0.4.1",
-    "ts-loader": "^4.3.0"
+    "fork-ts-checker-webpack-plugin": "^0.4.9",
+    "ts-loader": "^4.5.0"
   },
   "peerDependencies": {
-    "typescript": "^2.8.3"
+    "typescript": "^3.0.0"
   }
 }
diff --git a/packages/electron-webpack-vue/package.json b/packages/electron-webpack-vue/package.json
@@ -1,15 +1,15 @@
 {
   "name": "electron-webpack-vue",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "license": "MIT",
   "author": "Vladimir Krivosheev <[email protected]>",
   "files": [],
   "repository": "electron-userland/electron-webpack",
   "dependencies": {
     "vue-class-component": "^6.2.0",
     "vue-html-loader": "^1.2.4",
-    "vue-loader": "^15.2.0",
-    "vue-style-loader": "^4.1.0",
-    "vue-template-compiler": "^2.5.16"
+    "vue-loader": "^15.4.0",
+    "vue-style-loader": "^4.1.2",
+    "vue-template-compiler": "^2.5.17"
   }
 }
diff --git a/packages/electron-webpack/package.json b/packages/electron-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-webpack",
-  "version": "2.1.2",
+  "version": "2.2.1",
   "license": "MIT",
   "author": "Vladimir Krivosheev <[email protected]>",
   "main": "out/main.js",
@@ -23,31 +23,31 @@
   "dependencies": {
     "@types/webpack-env": "^1.13.6",
     "async-exit-hook": "^2.0.1",
-    "uglifyjs-webpack-plugin": "^1.2.5",
+    "uglifyjs-webpack-plugin": "^1.3.0",
     "bluebird-lst": "^1.0.5",
     "chalk": "^2.4.1",
     "crocket": "^0.9.11",
-    "css-hot-loader": "^1.3.9",
-    "css-loader": "^0.28.11",
+    "css-hot-loader": "^1.4.2",
+    "css-loader": "^1.0.0",
     "debug": "^3.1.0",
     "electron-devtools-installer": "^2.2.4",
-    "electron-webpack-js": "~2.0.3",
-    "mini-css-extract-plugin": "^0.4.0",
+    "electron-webpack-js": "~2.1.0",
+    "mini-css-extract-plugin": "^0.4.1",
     "file-loader": "^1.1.11",
-    "fs-extra-p": "^4.6.0",
+    "fs-extra-p": "^4.6.1",
     "html-loader": "^1.0.0-alpha.0",
     "html-webpack-plugin": "^3.2.0",
     "lazy-val": "^1.0.3",
     "node-loader": "^0.6.0",
-    "read-config-file": "^3.0.1",
-    "semver": "^5.5.0",
-    "source-map-support": "^0.5.6",
-    "style-loader": "^0.21.0",
-    "url-loader": "^1.0.1",
-    "webpack-dev-server": "^3.1.4",
-    "webpack-merge": "^4.1.2",
-    "yargs": "^11.1.0",
-    "webpack-cli": "^2.1.3"
+    "read-config-file": "^3.1.2",
+    "semver": "^5.5.1",
+    "source-map-support": "^0.5.9",
+    "style-loader": "^0.22.1",
+    "url-loader": "^1.1.1",
+    "webpack-dev-server": "^3.1.5",
+    "webpack-merge": "^4.1.4",
+    "yargs": "^12.0.1",
+    "webpack-cli": "^3.1.0"
   },
   "peerDependencies": {
     "webpack": "^4.8.3"

diff --git a/packages/electron-webpack/src/cli.ts b/packages/electron-webpack/src/cli.ts
@@ -28,7 +28,7 @@ function build(configFile: string) {
   args.push("--config", path.join(__dirname, "..", `webpack.${configFile}.config.js`))
 
   require("yargs")(args.slice(2))
-  require(path.join(process.cwd(), "node_modules", "webpack-cli", "bin", "webpack.js"))
+  require(path.join(process.cwd(), "node_modules", "webpack-cli", "bin", "cli.js"))
 }
 
 function runInDevMode() {

diff --git a/packages/electron-webpack/src/configurators/js.ts b/packages/electron-webpack/src/configurators/js.ts
@@ -11,7 +11,7 @@ export function createBabelLoader(configurator: WebpackConfigurator) {
     }],
   ]
   const plugins = [
-    require("babel-plugin-syntax-dynamic-import"),
+    require("@babel/plugin-syntax-dynamic-import"),
   ]
 
   if (configurator.type !== "main" && configurator.hasDependency("element-ui")) {
@@ -21,8 +21,14 @@ export function createBabelLoader(configurator: WebpackConfigurator) {
     }])
   }
 
-  addBabelItem(presets, configurator.getMatchingDevDependencies({includes: ["babel-preset-", "@babel/preset-"], excludes: ["babel-preset-env", "@babel/preset-env"]}))
-  addBabelItem(plugins, configurator.getMatchingDevDependencies({includes: ["babel-plugin-", "@babel/plugin-"], excludes: ["babel-plugin-syntax-dynamic-import"]}))
+  addBabelItem(presets, configurator.getMatchingDevDependencies({
+    includes: ["babel-preset-", "@babel/preset-"],
+    excludes: ["babel-preset-env", "@babel/preset-env"],
+  }))
+  addBabelItem(plugins, configurator.getMatchingDevDependencies({
+    includes: ["babel-plugin-", "@babel/plugin-"],
+    excludes: ["babel-plugin-syntax-dynamic-import", "@babel/plugin-syntax-dynamic-import"],
+  }))
 
   return {
     loader: "babel-loader",
@@ -48,7 +54,10 @@ function computeBabelEnvTarget(isRenderer: boolean, electronVersion: string) {
   }
 
   let nodeVersion = "7.4.0"
-  if (gte(electronVersion, "2.0.0-beta.4")) {
+  if (gte(electronVersion, "3.0.0")) {
+    nodeVersion = "10.2.0"
+  }
+  else if (gte(electronVersion, "2.0.0")) {
     nodeVersion = "8.9.3"
   }
   else if (gte(electronVersion, "1.8.2")) {

diff --git a/packages/electron-webpack/src/targets/RendererTarget.ts b/packages/electron-webpack/src/targets/RendererTarget.ts
@@ -121,8 +121,8 @@ export class RendererTarget extends BaseRendererTarget {
       }))
     }
     else {
-      const contentBase = [path.join(configurator.projectDir, "static"), path.join(configurator.commonDistDirectory, "renderer-dll")]
-      configurator.config.devServer = {
+      const contentBase = [path.join(configurator.projectDir, "static"), path.join(configurator.commonDistDirectory, "renderer-dll")];
+      (configurator.config as any).devServer = {
         contentBase,
         host: process.env.ELECTRON_WEBPACK_WDS_HOST || "localhost",
         port: process.env.ELECTRON_WEBPACK_WDS_PORT || 9080,

diff --git a/test/out/__snapshots__/loaderDetectionTest.js.snap b/test/out/__snapshots__/loaderDetectionTest.js.snap
@@ -39,7 +39,7 @@ resolve 'nunjucks-loader' in '<project-dir>'
  @ multi ./src/main/index.js"
 `;
 
-exports[`react 1`] = `"Cannot find module 'babel-preset-react' from 'js.js'"`;
+exports[`react 1`] = `"Cannot find module '@babel/preset-react' from 'js.js'"`;
 
 exports[`sass 1`] = `
 "./src/renderer/index.js