fix webpack config and test assertions

bugsnag · Apr 24, 2024 · 25b48b7 · 25b48b7
1 parent ab14e7d
commit 25b48b7
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 33 deletions.
diff --git a/test/electron/fixtures/app/src/main.js b/test/electron/fixtures/app/src/main.js
@@ -9,7 +9,6 @@ const Bugsnag = require('@bugsnag/electron/main')
 const configFile = process.env.BUGSNAG_CONFIG || 'default'
 // eslint-disable-next-line no-undef
 const bugsnagConfig = __non_webpack_require__(`./${configFile}`)
-// const preloadFile = process.env.BUGSNAG_PRELOAD || 'default'
 
 // eslint-disable-next-line no-undef
 const config = { ...baseBugsnagConfig, ...bugsnagConfig() }
@@ -35,11 +34,12 @@ function createWindow () {
     }
   })
 
-  // eslint-disable-next-line no-undef
-  mainWindow.loadFile(join(__dirname, htmlRelativePath))
-
   // Open the DevTools.
   // mainWindow.webContents.openDevTools()
+
+  // and load the index.html of the app.
+  // eslint-disable-next-line no-undef
+  mainWindow.loadFile(join(__dirname, htmlRelativePath))
 }
 
 // This method will be called when Electron has finished

diff --git a/test/electron/fixtures/app/webpack.renderer.config.js b/test/electron/fixtures/app/webpack.renderer.config.js
@@ -1,3 +1,10 @@
+const { readdirSync } = require('fs')
+const { parse } = require('path')
+const entrypoints = {}
+readdirSync('./src/preloads').forEach(name => {
+  entrypoints[parse(name).name] = `./src/preloads/${name}`
+})
+
 module.exports = {
   resolve: {
     fallback: {

diff --git a/test/electron/fixtures/events/renderer/config/appType.json b/test/electron/fixtures/events/renderer/config/appType.json
@@ -80,8 +80,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/config/clear-context.json b/test/electron/fixtures/events/renderer/config/clear-context.json
@@ -81,8 +81,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/config/clear-metadata.json b/test/electron/fixtures/events/renderer/config/clear-metadata.json
@@ -81,8 +81,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/config/clear-user.json b/test/electron/fixtures/events/renderer/config/clear-user.json
@@ -82,8 +82,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/config/codeBundleId.json b/test/electron/fixtures/events/renderer/config/codeBundleId.json
@@ -81,8 +81,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/config/context.json b/test/electron/fixtures/events/renderer/config/context.json
@@ -81,8 +81,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/config/metadata.json b/test/electron/fixtures/events/renderer/config/metadata.json
@@ -83,8 +83,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/config/user.json b/test/electron/fixtures/events/renderer/config/user.json
@@ -82,8 +82,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js"
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js"
             }
           ],
           "type": "electronrendererjs"

diff --git a/test/electron/fixtures/events/renderer/context/page-title-clear-complex-config.json b/test/electron/fixtures/events/renderer/context/page-title-clear-complex-config.json
@@ -96,7 +96,7 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
+              "lineNumber": 1,
               "file": "./renderer.js"
             }
           ],

diff --git a/test/electron/fixtures/events/renderer/context/page-title-clear-default.json b/test/electron/fixtures/events/renderer/context/page-title-clear-default.json
@@ -81,7 +81,7 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
+              "lineNumber": 1,
               "file": "./renderer.js"
             }
           ],

diff --git a/test/electron/fixtures/events/renderer/context/page-title-update-complex-config.json b/test/electron/fixtures/events/renderer/context/page-title-update-complex-config.json
@@ -96,7 +96,7 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
+              "lineNumber": 1,
               "file": "./renderer.js"
             }
           ],

diff --git a/test/electron/fixtures/events/renderer/context/page-title-update-default.json b/test/electron/fixtures/events/renderer/context/page-title-update-default.json
@@ -81,7 +81,7 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
+              "lineNumber": 1,
               "file": "./renderer.js"
             }
           ],

diff --git a/test/electron/fixtures/events/renderer/context/set-context-default.json b/test/electron/fixtures/events/renderer/context/set-context-default.json
@@ -81,7 +81,7 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
+              "lineNumber": 1,
               "file": "./renderer.js"
             }
           ],

diff --git a/test/electron/fixtures/events/renderer/handled-error/complex-config.json b/test/electron/fixtures/events/renderer/handled-error/complex-config.json
@@ -110,8 +110,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js",
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js",
               "code": {
                 "1": "{TYPE:string}"
               }

diff --git a/test/electron/fixtures/events/renderer/handled-error/default.json b/test/electron/fixtures/events/renderer/handled-error/default.json
@@ -101,8 +101,8 @@
           "errorClass": "Error",
           "stacktrace": [
             {
-              "lineNumber": 31,
-              "file": "./renderer.js",
+              "lineNumber": 1,
+              "file": ".webpack/renderer/main_window/index.js",
               "code": {
                 "1": "{TYPE:string}"
               }

diff --git a/test/electron/fixtures/events/renderer/uncaught-exception/complex-config.json b/test/electron/fixtures/events/renderer/uncaught-exception/complex-config.json
@@ -103,7 +103,7 @@
           "errorMessage": "foo is not defined",
           "stacktrace": [
             {
-              "file": "./renderer.js",
+              "file": ".webpack/renderer/main_window/index.js",
               "lineNumber": 27,
               "code": {
                 "1": "{TYPE:string}"

diff --git a/test/electron/fixtures/events/renderer/uncaught-exception/default.json b/test/electron/fixtures/events/renderer/uncaught-exception/default.json
@@ -93,7 +93,7 @@
           "errorMessage": "foo is not defined",
           "stacktrace": [
             {
-              "file": "./renderer.js",
+              "file": ".webpack/renderer/main_window/index.js",
               "lineNumber": 27,
               "code": {
                 "1": "{TYPE:string}"

diff --git a/test/electron/fixtures/events/renderer/unhandled-rejection/complex-config.json b/test/electron/fixtures/events/renderer/unhandled-rejection/complex-config.json
@@ -103,7 +103,7 @@
           "errorMessage": "invalid",
           "stacktrace": [
             {
-              "file": "./renderer.js",
+              "file": ".webpack/renderer/main_window/index.js",
               "lineNumber": 23,
               "code": {
                 "1": "{TYPE:string}"

diff --git a/test/electron/fixtures/events/renderer/unhandled-rejection/default.json b/test/electron/fixtures/events/renderer/unhandled-rejection/default.json
@@ -93,7 +93,7 @@
           "errorMessage": "invalid",
           "stacktrace": [
             {
-              "file": "./renderer.js",
+              "file": ".webpack/renderer/main_window/index.js",
               "lineNumber": 23,
               "code": {
                 "1": "{TYPE:string}"