Skip to content

Commit

Permalink
fix: html-loader - unknown property 'url'
Browse files Browse the repository at this point in the history
Close #357
  • Loading branch information
develar committed Apr 6, 2020
1 parent be61137 commit 0053adb
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/*"
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-webpack-eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 3 additions & 3 deletions packages/electron-webpack-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/electron-webpack-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-webpack-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
16 changes: 8 additions & 8 deletions packages/electron-webpack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-webpack",
"version": "2.8.0",
"version": "2.8.1",
"license": "MIT",
"author": "Vladimir Krivosheev <develar@gmail.com>",
"main": "out/main.js",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -51,7 +51,7 @@
"yargs": "^15.3.1"
},
"peerDependencies": {
"webpack": "^4.42.0"
"webpack": "^4.42.1"
},
"resolutions": {
"js-yaml": "^3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-webpack/src/targets/RendererTarget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
}
6 changes: 3 additions & 3 deletions test/out/__snapshots__/test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Child
Asset Size Chunks Chunk Names
index.html 3.99 KiB 0
Entrypoint undefined = index.html
[0] <cwd>/node_modules/html-loader/dist/cjs.js?minimize=false&url=false!./dist/.renderer-index-template.html 255 bytes {0} [built]
[0] <cwd>/node_modules/html-loader/dist/cjs.js?minimize=false!./dist/.renderer-index-template.html 255 bytes {0} [built]
Child mini-css-extract-plugin <some path>/node_modules/css-loader/dist/cjs.js??ref--6-1!src/renderer/style.css:
Entrypoint mini-css-extract-plugin = *
[0] <cwd>/node_modules/css-loader/dist/cjs.js??ref--6-1!./src/renderer/style.css {0} [built]
Expand Down Expand Up @@ -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] <cwd>/node_modules/html-loader/dist/cjs.js?minimize=false&url=false!./dist/.renderer-index-template.html 255 bytes {0} [built]
[0] <cwd>/node_modules/html-loader/dist/cjs.js?minimize=false!./dist/.renderer-index-template.html 255 bytes {0} [built]
Child mini-css-extract-plugin <some path>/node_modules/css-loader/dist/cjs.js??ref--6-1!customRenderer/style.css:
Entrypoint mini-css-extract-plugin = *
[0] <cwd>/node_modules/css-loader/dist/cjs.js??ref--6-1!./customRenderer/style.css {0} [built]
Expand Down Expand Up @@ -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] <cwd>/node_modules/html-loader/dist/cjs.js?minimize=false&url=false!./dist/.renderer-index-template.html 255 bytes {0} [built]
[0] <cwd>/node_modules/html-loader/dist/cjs.js?minimize=false!./dist/.renderer-index-template.html 255 bytes {0} [built]
Child mini-css-extract-plugin <some path>/node_modules/css-loader/dist/cjs.js??ref--6-1!src/renderer/style.css:
Entrypoint mini-css-extract-plugin = *
[0] <cwd>/node_modules/css-loader/dist/cjs.js??ref--6-1!./src/renderer/style.css {0} [built]
Expand Down

0 comments on commit 0053adb

Please sign in to comment.