From 0053adbe1a49317637d59381c635beba4ba8a070 Mon Sep 17 00:00:00 2001 From: develar Date: Mon, 6 Apr 2020 08:39:43 +0200 Subject: [PATCH] fix: html-loader - unknown property 'url' Close #357 --- package.json | 16 ++++++++-------- packages/electron-webpack-eslint/package.json | 2 +- packages/electron-webpack-js/package.json | 6 +++--- packages/electron-webpack-ts/package.json | 4 ++-- packages/electron-webpack-vue/package.json | 2 +- packages/electron-webpack/package.json | 16 ++++++++-------- .../src/targets/RendererTarget.ts | 2 +- test/out/__snapshots__/test.js.snap | 6 +++--- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index a15cab2..712908f 100644 --- a/package.json +++ b/package.json @@ -18,27 +18,27 @@ "@types/bluebird": "^3.5.30", "@types/electron-devtools-installer": "^2.2.0", "@types/fs-extra": "^8.1.0", - "@types/jest": "^25.1.4", + "@types/jest": "^25.2.1", "@types/memory-fs": "^0.3.2", - "@types/node": "^13.9.1", + "@types/node": "^13.11.0", "@types/semver": "^7.1.0", - "@types/webpack": "^4.41.7", + "@types/webpack": "^4.41.10", "@types/webpack-merge": "^4.1.5", - "babel-preset-jest": "^25.1.0", + "babel-preset-jest": "^25.2.6", "babel-preset-ts-node8": "^4.0.3", "cross-env": "^7.0.2", "electron-builder-tslint-config": "^1.1.0", - "fs-extra": "^8.1.0", - "jest-cli": "^25.1.0", + "fs-extra": "^9.0.0", + "jest-cli": "^25.2.7", "jest-junit": "^10.0.0", "memory-fs": "^0.5.0", "temp-file": "^3.3.7", "terser-webpack-plugin": "^2.3.5", "ts-babel": "^6.1.7", "ts-json-schema-generator": "^0.65.0", - "tslint": "^6.1.0", + "tslint": "^6.1.1", "typescript": "^3.8.3", - "webpack": "^4.42.0" + "webpack": "^4.42.1" }, "workspaces": [ "packages/*" diff --git a/packages/electron-webpack-eslint/package.json b/packages/electron-webpack-eslint/package.json index 38578bb..1ff932b 100644 --- a/packages/electron-webpack-eslint/package.json +++ b/packages/electron-webpack-eslint/package.json @@ -9,6 +9,6 @@ "babel-eslint": "^10.1.0", "eslint": "^6.8.0", "eslint-friendly-formatter": "^4.0.1", - "eslint-loader": "^3.0.3" + "eslint-loader": "^4.0.0" } } diff --git a/packages/electron-webpack-js/package.json b/packages/electron-webpack-js/package.json index 762c644..8a89d5e 100644 --- a/packages/electron-webpack-js/package.json +++ b/packages/electron-webpack-js/package.json @@ -6,10 +6,10 @@ "files": [], "repository": "electron-userland/electron-webpack", "dependencies": { - "@babel/core": "^7.8.7", - "babel-loader": "^8.0.6", + "@babel/core": "^7.9.0", + "babel-loader": "^8.1.0", "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/preset-env": "^7.8.7", + "@babel/preset-env": "^7.9.0", "babel-plugin-component": "^1.1.1" } } diff --git a/packages/electron-webpack-ts/package.json b/packages/electron-webpack-ts/package.json index 5c25c80..9dbeb9b 100644 --- a/packages/electron-webpack-ts/package.json +++ b/packages/electron-webpack-ts/package.json @@ -6,8 +6,8 @@ "files": [], "repository": "electron-userland/electron-webpack", "dependencies": { - "fork-ts-checker-webpack-plugin": "^4.1.0", - "ts-loader": "^6.2.1" + "fork-ts-checker-webpack-plugin": "^4.1.2", + "ts-loader": "^6.2.2" }, "peerDependencies": { "typescript": "^3.8.3" diff --git a/packages/electron-webpack-vue/package.json b/packages/electron-webpack-vue/package.json index 1090dd2..7b483ff 100644 --- a/packages/electron-webpack-vue/package.json +++ b/packages/electron-webpack-vue/package.json @@ -8,7 +8,7 @@ "dependencies": { "vue-class-component": "^7.2.3", "vue-html-loader": "^1.2.4", - "vue-loader": "^15.9.0", + "vue-loader": "^15.9.1", "vue-style-loader": "^4.1.2", "vue-template-compiler": "^2.6.11" } diff --git a/packages/electron-webpack/package.json b/packages/electron-webpack/package.json index 603a95a..fdf9e03 100644 --- a/packages/electron-webpack/package.json +++ b/packages/electron-webpack/package.json @@ -1,6 +1,6 @@ { "name": "electron-webpack", - "version": "2.8.0", + "version": "2.8.1", "license": "MIT", "author": "Vladimir Krivosheev ", "main": "out/main.js", @@ -16,14 +16,14 @@ }, "repository": "electron-userland/electron-webpack", "engines": { - "node": ">=8.12.0" + "node": ">=10.0" }, "//": "@types/webpack-env in the dependencies because used by clients", "dependencies": { "@types/webpack-env": "^1.15.1", "async-exit-hook": "^2.0.1", "bluebird": "^3.7.2", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "crocket": "^0.9.11", "css-hot-loader": "^1.4.4", "css-loader": "^3.4.2", @@ -33,13 +33,13 @@ "electron-devtools-installer": "^2.2.4", "electron-webpack-js": "~2.4.0", "file-loader": "^6.0.0", - "fs-extra": "^8.1.0", - "html-loader": "^1.0.0-alpha.0", - "html-webpack-plugin": "^3.2.0", + "fs-extra": "^9.0.0", + "html-loader": "^1.1.0", + "html-webpack-plugin": "^4.0.4", "lazy-val": "^1.0.4", "mini-css-extract-plugin": "^0.9.0", "node-loader": "^0.6.0", - "read-config-file": "^4.0.1", + "read-config-file": "^6.0.0", "semver": "^7.1.3", "source-map-support": "^0.5.16", "style-loader": "^1.1.3", @@ -51,7 +51,7 @@ "yargs": "^15.3.1" }, "peerDependencies": { - "webpack": "^4.42.0" + "webpack": "^4.42.1" }, "resolutions": { "js-yaml": "^3.13.1", diff --git a/packages/electron-webpack/src/targets/RendererTarget.ts b/packages/electron-webpack/src/targets/RendererTarget.ts index 261a0f9..e462bfa 100644 --- a/packages/electron-webpack/src/targets/RendererTarget.ts +++ b/packages/electron-webpack/src/targets/RendererTarget.ts @@ -215,5 +215,5 @@ async function generateIndexFile(configurator: WebpackConfigurator, nodeModulePa await outputFile(filePath, html) - return `!!html-loader?minimize=false&url=false!${filePath}` + return `!!html-loader?minimize=false!${filePath}` } diff --git a/test/out/__snapshots__/test.js.snap b/test/out/__snapshots__/test.js.snap index c35d919..364f7de 100644 --- a/test/out/__snapshots__/test.js.snap +++ b/test/out/__snapshots__/test.js.snap @@ -26,7 +26,7 @@ Child Asset Size Chunks Chunk Names index.html 3.99 KiB 0 Entrypoint undefined = index.html - [0] /node_modules/html-loader/dist/cjs.js?minimize=false&url=false!./dist/.renderer-index-template.html 255 bytes {0} [built] + [0] /node_modules/html-loader/dist/cjs.js?minimize=false!./dist/.renderer-index-template.html 255 bytes {0} [built] Child mini-css-extract-plugin /node_modules/css-loader/dist/cjs.js??ref--6-1!src/renderer/style.css: Entrypoint mini-css-extract-plugin = * [0] /node_modules/css-loader/dist/cjs.js??ref--6-1!./src/renderer/style.css {0} [built] @@ -136,7 +136,7 @@ Child html-webpack-plugin for \\"index.html\\": Asset Size Chunks Chunk Names index.html 3.99 KiB 0 Entrypoint undefined = index.html - [0] /node_modules/html-loader/dist/cjs.js?minimize=false&url=false!./dist/.renderer-index-template.html 255 bytes {0} [built] + [0] /node_modules/html-loader/dist/cjs.js?minimize=false!./dist/.renderer-index-template.html 255 bytes {0} [built] Child mini-css-extract-plugin /node_modules/css-loader/dist/cjs.js??ref--6-1!customRenderer/style.css: Entrypoint mini-css-extract-plugin = * [0] /node_modules/css-loader/dist/cjs.js??ref--6-1!./customRenderer/style.css {0} [built] @@ -192,7 +192,7 @@ Child html-webpack-plugin for \\"index.html\\": Asset Size Chunks Chunk Names index.html 3.99 KiB 0 Entrypoint undefined = index.html - [0] /node_modules/html-loader/dist/cjs.js?minimize=false&url=false!./dist/.renderer-index-template.html 255 bytes {0} [built] + [0] /node_modules/html-loader/dist/cjs.js?minimize=false!./dist/.renderer-index-template.html 255 bytes {0} [built] Child mini-css-extract-plugin /node_modules/css-loader/dist/cjs.js??ref--6-1!src/renderer/style.css: Entrypoint mini-css-extract-plugin = * [0] /node_modules/css-loader/dist/cjs.js??ref--6-1!./src/renderer/style.css {0} [built]