From f3e42f5b8c151d84160647a1f20edba21e03304c Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Tue, 23 Apr 2024 10:15:55 +0100 Subject: [PATCH] update config --- test/electron/fixtures/app/forge.config.js | 1 + test/electron/fixtures/app/package-lock.json | 4 ++-- test/electron/fixtures/app/package.json | 17 ++++++----------- .../fixtures/app/webpack.renderer.config.js | 11 +++++++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/test/electron/fixtures/app/forge.config.js b/test/electron/fixtures/app/forge.config.js index c55f4377c..889812bf3 100644 --- a/test/electron/fixtures/app/forge.config.js +++ b/test/electron/fixtures/app/forge.config.js @@ -5,6 +5,7 @@ module.exports = { packagerConfig: { asar: true }, + rebuildConfig: {}, makers: [ { name: '@electron-forge/maker-squirrel', diff --git a/test/electron/fixtures/app/package-lock.json b/test/electron/fixtures/app/package-lock.json index 2ed608fd6..a2d471d0b 100644 --- a/test/electron/fixtures/app/package-lock.json +++ b/test/electron/fixtures/app/package-lock.json @@ -1,11 +1,11 @@ { - "name": "electron-test-runner", + "name": "Runner", "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "electron-test-runner", + "name": "Runner", "version": "1.0.2", "license": "MIT", "dependencies": { diff --git a/test/electron/fixtures/app/package.json b/test/electron/fixtures/app/package.json index c306fa467..19b81167d 100644 --- a/test/electron/fixtures/app/package.json +++ b/test/electron/fixtures/app/package.json @@ -1,15 +1,12 @@ { - "name": "electron-test-runner", - "productName": "Runner", + "main": ".webpack/main", + "name": "Runner", "version": "1.0.2", "description": "My Electron application description", - "main": ".webpack/main", "scripts": { "start": "electron-forge start", "package": "electron-forge package", - "make": "electron-forge make", - "publish": "electron-forge publish", - "lint": "echo \"No linting configured\"" + "make": "electron-forge make" }, "devDependencies": { "@electron-forge/cli": "^7.4.0", @@ -26,13 +23,11 @@ "electron": "*", "node-loader": "^2.0.0" }, - "keywords": [], - "author": { - "name": "Ben Wilson", - "email": "ben.wilson@smartbear.com" - }, "license": "MIT", "dependencies": { "electron-squirrel-startup": "^1.0.0" + }, + "config": { + "forge": "./forge.config.js" } } diff --git a/test/electron/fixtures/app/webpack.renderer.config.js b/test/electron/fixtures/app/webpack.renderer.config.js index 5d387066e..2c6c27314 100644 --- a/test/electron/fixtures/app/webpack.renderer.config.js +++ b/test/electron/fixtures/app/webpack.renderer.config.js @@ -12,13 +12,16 @@ module.exports = { output: { filename: '[name].js' }, - plugins: [ - new webpack.ProgressPlugin() - ], resolve: { fallback: { fs: false, - path: false + path: require.resolve('path-browserify') } + }, + plugins: [ + new webpack.ProgressPlugin() + ], + module: { + rules: require('./webpack.rules') } }