Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update deps to fix dependabot alerts #1003

Merged
merged 4 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
'/common/**',
'/index.*',
'/integrations.*',
'/utility/**',
'rollup.config.mjs',
],
overrides: [
Expand Down
21 changes: 11 additions & 10 deletions examples/electron-forge-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
"version": "1.0.0",
"main": ".webpack/main",
"scripts": {
"package": "electron-forge package"
"package": "electron-forge package",
"patch-package-json": "node ./patch-package-json.js"
},
"config": {
"forge": {
"plugins": [
[
"@electron-forge/plugin-webpack",
{
{
"name":"@electron-forge/plugin-webpack",
"config":{
"mainConfig": "./webpack.main.config.js",
"renderer": {
"config": "./webpack.renderer.config.js",
Expand All @@ -23,20 +24,20 @@
]
}
}
]
}
]
}
},
"devDependencies": {
"@electron-forge/cli": "6.0.0-beta.63",
"@electron-forge/plugin-webpack": "6.0.0-beta.63",
"@sentry/webpack-plugin": "^2.2.0",
"@electron-forge/cli": "^7.5.0",
"@electron-forge/plugin-webpack": "^7.5.0",
"@sentry/webpack-plugin": "^2.22.6",
"@vercel/webpack-asset-relocator-loader": "1.6.0",
"electron": "23.0.0",
"electron": "^33.0.2",
"node-loader": "^2.0.0"
},
"dependencies": {
"@sentry/electron": "3.0.0",
"@sentry/electron": "5.6.0",
"electron-squirrel-startup": "^1.0.0"
}
}
9 changes: 9 additions & 0 deletions examples/electron-forge-webpack/patch-package-json.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const { readFileSync, writeFileSync } = require("fs");
const { join } = require("path");

// Patch package.json to point to the correct main file which is in an arch specific directory
// Forge moves this into the packaged app to test but we're using the raw webpack output
const path = join(__dirname, "package.json");
const pkgJson = JSON.parse(readFileSync(path, 'utf8'));
pkgJson.main = `.webpack/${process.arch}/main`;
writeFileSync(path, JSON.stringify(pkgJson, null, 2), 'utf8');
2 changes: 1 addition & 1 deletion examples/electron-forge-webpack/recipe.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
description: Electron Forge Webpack with contextIsolation and sandbox
command: yarn && yarn package
command: yarn && yarn package && yarn patch-package-json
condition: supportsContextIsolation && supportsSandbox
timeout: 120
skipEsmAutoTransform: true
Loading
Loading