From 53e1f45fcae7e5f0ff1f60d8df627b1fd7b8c2ab Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Thu, 27 Feb 2020 11:47:26 -0800 Subject: [PATCH 1/4] fix(plugin-webpack): change preload target from electron-renderer to electron-preload --- package.json | 2 +- packages/plugin/webpack/src/WebpackConfig.ts | 2 +- yarn.lock | 14 +++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index bf4f1b777d..81061c7c58 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "@types/semver": "^7.1.0", "@types/sinon": "^7.5.1", "@types/username": "^3.0.0", - "@types/webpack": "^4.41.5", + "@types/webpack": "^4.41.7", "@types/webpack-dev-middleware": "^3.7.0", "@types/webpack-hot-middleware": "^2.25.0", "@types/webpack-merge": "^4.1.5", diff --git a/packages/plugin/webpack/src/WebpackConfig.ts b/packages/plugin/webpack/src/WebpackConfig.ts index 0850e2d06c..fdf6d10d54 100644 --- a/packages/plugin/webpack/src/WebpackConfig.ts +++ b/packages/plugin/webpack/src/WebpackConfig.ts @@ -175,7 +175,7 @@ export default class WebpackConfigGenerator { return webpackMerge.smart({ devtool: 'inline-source-map', - target: 'electron-renderer', + target: 'electron-preload', mode: this.mode, entry: prefixedEntries.concat([ entryPoint.js, diff --git a/yarn.lock b/yarn.lock index 94a1eedd2c..32b0d46a7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1422,7 +1422,7 @@ "@types/source-list-map" "*" source-map "^0.6.1" -"@types/webpack@*", "@types/webpack@^4.41.5": +"@types/webpack@*": version "4.41.6" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.6.tgz#c76afbdef59159d12e3e1332dc264b75574722a2" integrity sha512-iWRpV5Ej+8uKrgxp6jXz3v7ZTjgtuMXY+rsxQjFNU0hYCnHkpA7vtiNffgxjuxX4feFHBbz0IF76OzX2OqDYPw== @@ -1434,6 +1434,18 @@ "@types/webpack-sources" "*" source-map "^0.6.0" +"@types/webpack@^4.41.7": + version "4.41.7" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.7.tgz#22be27dbd4362b01c3954ca9b021dbc9328d9511" + integrity sha512-OQG9viYwO0V1NaNV7d0n79V+n6mjOV30CwgFPIfTzwmk8DHbt+C4f2aBGdCYbo3yFyYD6sjXfqqOjwkl1j+ulA== + dependencies: + "@types/anymatch" "*" + "@types/node" "*" + "@types/tapable" "*" + "@types/uglify-js" "*" + "@types/webpack-sources" "*" + source-map "^0.6.0" + "@types/which@^1.3.2": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/which/-/which-1.3.2.tgz#9c246fc0c93ded311c8512df2891fb41f6227fdf" From b776e870fac4130f36917e8989b4acac91f089fa Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Thu, 27 Feb 2020 12:12:47 -0800 Subject: [PATCH 2/4] Shorten changes --- yarn.lock | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 32b0d46a7b..ac5d245089 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1422,19 +1422,7 @@ "@types/source-list-map" "*" source-map "^0.6.1" -"@types/webpack@*": - version "4.41.6" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.6.tgz#c76afbdef59159d12e3e1332dc264b75574722a2" - integrity sha512-iWRpV5Ej+8uKrgxp6jXz3v7ZTjgtuMXY+rsxQjFNU0hYCnHkpA7vtiNffgxjuxX4feFHBbz0IF76OzX2OqDYPw== - dependencies: - "@types/anymatch" "*" - "@types/node" "*" - "@types/tapable" "*" - "@types/uglify-js" "*" - "@types/webpack-sources" "*" - source-map "^0.6.0" - -"@types/webpack@^4.41.7": +"@types/webpack@*", @types/webpack@^4.41.7": version "4.41.7" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.7.tgz#22be27dbd4362b01c3954ca9b021dbc9328d9511" integrity sha512-OQG9viYwO0V1NaNV7d0n79V+n6mjOV30CwgFPIfTzwmk8DHbt+C4f2aBGdCYbo3yFyYD6sjXfqqOjwkl1j+ulA== From a9811a68ada695bea1590547a1cd60786367fe1b Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Fri, 28 Feb 2020 10:40:34 -0800 Subject: [PATCH 3/4] Fix typo --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index ac5d245089..82117e6532 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1422,7 +1422,7 @@ "@types/source-list-map" "*" source-map "^0.6.1" -"@types/webpack@*", @types/webpack@^4.41.7": +"@types/webpack@*", "@types/webpack@^4.41.7": version "4.41.7" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.7.tgz#22be27dbd4362b01c3954ca9b021dbc9328d9511" integrity sha512-OQG9viYwO0V1NaNV7d0n79V+n6mjOV30CwgFPIfTzwmk8DHbt+C4f2aBGdCYbo3yFyYD6sjXfqqOjwkl1j+ulA== From 7c6359f4365fa1e28cea5b48a9c4803bff787433 Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Fri, 28 Feb 2020 10:55:42 -0800 Subject: [PATCH 4/4] Fix test --- packages/plugin/webpack/test/WebpackConfig_spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin/webpack/test/WebpackConfig_spec.ts b/packages/plugin/webpack/test/WebpackConfig_spec.ts index 1308af9924..69f522ae92 100644 --- a/packages/plugin/webpack/test/WebpackConfig_spec.ts +++ b/packages/plugin/webpack/test/WebpackConfig_spec.ts @@ -220,7 +220,7 @@ describe('WebpackConfigGenerator', () => { entryPoint, entryPoint.preload!, ); - expect(webpackConfig.target).to.equal('electron-renderer'); + expect(webpackConfig.target).to.equal('electron-preload'); expect(webpackConfig.mode).to.equal('development'); expect(webpackConfig.entry).to.deep.equal(['preloadScript.js']); expect(webpackConfig.output).to.deep.equal({