Skip to content

Commit 1786367

Browse files
mmaiettammaietta
authored
chore(deps): Updating deps and fixing pnpm audit with dependency overrides (#7213)
1 parent d42fa79 commit 1786367

File tree

17 files changed

+974
-634
lines changed

17 files changed

+974
-634
lines changed

Diff for: ‎.changeset/swift-ties-love.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"app-builder-lib": patch
3+
"builder-util": patch
4+
"dmg-builder": patch
5+
"electron-builder-squirrel-windows": patch
6+
"electron-builder": patch
7+
"electron-publish": patch
8+
"electron-updater": patch
9+
---
10+
11+
chore(deps): Updating dependencies and fixing `pnpm audit` with dependency overrides

Diff for: ‎package.json

+15-6
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@
4646
},
4747
"devDependencies": {
4848
"@babel/plugin-transform-modules-commonjs": "7.15.4",
49-
"@changesets/changelog-github": "0.4.2",
50-
"@changesets/cli": "2.19.0",
49+
"@changesets/changelog-github": "0.4.7",
50+
"@changesets/cli": "2.25.0",
5151
"@types/node": "16.11.43",
5252
"@typescript-eslint/eslint-plugin": "5.41.0",
5353
"@typescript-eslint/parser": "5.41.0",
5454
"catharsis": "0.9.0",
55-
"conventional-changelog-cli": "2.1.1",
56-
"dmd": "6.0.0",
55+
"conventional-changelog-cli": "2.2.2",
56+
"dmd": "6.1.0",
57+
"fs-extra": "10.1.0",
5758
"eslint": "8.26.0",
5859
"eslint-config-prettier": "8.5.0",
5960
"eslint-plugin-prettier": "4.2.1",
60-
"fs-extra": "10.0.0",
6161
"globby": "11.1.0",
6262
"husky": "7.0.4",
6363
"jest-cli": "27.5.1",
@@ -79,7 +79,16 @@
7979
},
8080
"pnpm": {
8181
"patchedDependencies": {
82-
"@changesets/[email protected]": "patches/@[email protected]"
82+
"@changesets/[email protected]": "patches/@[email protected]"
83+
},
84+
"overrides": {
85+
"markdown-it@<12.3.2": ">=12.3.2",
86+
"@braintree/sanitize-url@<6.0.0": ">=6.0.0",
87+
"mermaid@>=8.0.0 <9.1.2": ">=9.1.2",
88+
"d3-color@<3.1.0": ">=3.1.0",
89+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
90+
"minimatch@<3.0.5": ">=3.0.5",
91+
"@types/keyv": "3.1.4"
8392
}
8493
}
8594
}

Diff for: ‎packages/app-builder-lib/package.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@
4949
"dependencies": {
5050
"7zip-bin": "~5.1.1",
5151
"@develar/schema-utils": "~2.6.5",
52-
"@electron/universal": "1.2.1",
52+
"@electron/universal": "1.3.3",
5353
"@malept/flatpak-bundler": "^0.4.0",
5454
"async-exit-hook": "^2.0.1",
5555
"bluebird-lst": "^1.0.9",
5656
"builder-util": "workspace:*",
5757
"builder-util-runtime": "workspace:*",
5858
"chromium-pickle-js": "^0.2.0",
5959
"debug": "^4.3.4",
60-
"ejs": "^3.1.7",
60+
"ejs": "^3.1.8",
6161
"electron-osx-sign": "^0.6.0",
6262
"electron-publish": "workspace:*",
6363
"electron-rebuild": "^3.2.9",
6464
"form-data": "^4.0.0",
6565
"fs-extra": "^10.1.0",
6666
"hosted-git-info": "^4.1.0",
6767
"is-ci": "^3.0.0",
68-
"isbinaryfile": "^4.0.10",
68+
"isbinaryfile": "^5.0.0",
6969
"js-yaml": "^4.1.0",
7070
"lazy-val": "^1.0.5",
7171
"minimatch": "^3.1.2",
@@ -108,5 +108,11 @@
108108
"electron-builder-squirrel-windows": "workspace:*"
109109
},
110110
"//": "electron-builder-squirrel-windows and dmg-builder added as dev dep for tests (as otherwise `require` doesn't work using Yarn 2)",
111-
"typings": "./out/index.d.ts"
111+
"typings": "./out/index.d.ts",
112+
"pnpm": {
113+
"overrides": {
114+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
115+
"minimatch@<3.0.5": ">=3.0.5"
116+
}
117+
}
112118
}

Diff for: ‎packages/builder-util-runtime/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,11 @@
2525
"@types/debug": "4.1.7",
2626
"@types/sax": "1.2.3"
2727
},
28-
"types": "./out/index.d.ts"
28+
"types": "./out/index.d.ts",
29+
"pnpm": {
30+
"overrides": {
31+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
32+
"minimatch@<3.0.5": ">=3.0.5"
33+
}
34+
}
2935
}

Diff for: ‎packages/builder-util/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"chalk": "^4.1.1",
2525
"cross-spawn": "^7.0.3",
2626
"debug": "^4.3.4",
27-
"fs-extra": "^10.0.0",
27+
"fs-extra": "^10.1.0",
2828
"http-proxy-agent": "^5.0.0",
2929
"https-proxy-agent": "^5.0.0",
3030
"is-ci": "^3.0.0",
@@ -39,5 +39,11 @@
3939
"@types/is-ci": "3.0.0",
4040
"@types/js-yaml": "4.0.3",
4141
"@types/source-map-support": "0.5.4"
42+
},
43+
"pnpm": {
44+
"overrides": {
45+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
46+
"minimatch@<3.0.5": ">=3.0.5"
47+
}
4248
}
4349
}

Diff for: ‎packages/dmg-builder/package.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"app-builder-lib": "workspace:*",
2121
"builder-util": "workspace:*",
2222
"builder-util-runtime": "workspace:*",
23-
"fs-extra": "^10.0.0",
23+
"fs-extra": "^10.1.0",
2424
"iconv-lite": "^0.6.2",
2525
"js-yaml": "^4.1.0"
2626
},
@@ -32,5 +32,11 @@
3232
"@types/js-yaml": "4.0.3",
3333
"temp-file": "3.4.0"
3434
},
35-
"typings": "./out/dmg.d.ts"
35+
"typings": "./out/dmg.d.ts",
36+
"pnpm": {
37+
"overrides": {
38+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
39+
"minimatch@<3.0.5": ">=3.0.5"
40+
}
41+
}
3642
}

Diff for: ‎packages/electron-builder-squirrel-windows/package.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"app-builder-lib": "workspace:*",
1919
"archiver": "^5.3.1",
2020
"builder-util": "workspace:*",
21-
"fs-extra": "^10.0.0"
21+
"fs-extra": "^10.1.0"
2222
},
2323
"devDependencies": {
2424
"@types/archiver": "5.3.1",
@@ -27,5 +27,11 @@
2727
"optionalDependencies": {
2828
"7zip-bin": "~5.1.1"
2929
},
30-
"types": "./out/SquirrelWindowsTarget.d.ts"
30+
"types": "./out/SquirrelWindowsTarget.d.ts",
31+
"pnpm": {
32+
"overrides": {
33+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
34+
"minimatch@<3.0.5": ">=3.0.5"
35+
}
36+
}
3137
}

Diff for: ‎packages/electron-builder/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"builder-util-runtime": "workspace:*",
5757
"chalk": "^4.1.1",
5858
"dmg-builder": "workspace:*",
59-
"fs-extra": "^10.0.0",
59+
"fs-extra": "^10.1.0",
6060
"is-ci": "^3.0.0",
6161
"lazy-val": "^1.0.5",
6262
"read-config-file": "6.3.2",
@@ -70,5 +70,11 @@
7070
"typings": "./out/index.d.ts",
7171
"publishConfig": {
7272
"tag": "next"
73+
},
74+
"pnpm": {
75+
"overrides": {
76+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
77+
"minimatch@<3.0.5": ">=3.0.5"
78+
}
7379
}
7480
}

Diff for: ‎packages/electron-forge-maker-appimage/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@
1616
],
1717
"dependencies": {
1818
"app-builder-lib": "workspace:*"
19+
},
20+
"pnpm": {
21+
"overrides": {
22+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
23+
"minimatch@<3.0.5": ">=3.0.5"
24+
}
1925
}
2026
}

Diff for: ‎packages/electron-forge-maker-nsis-web/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@
1616
],
1717
"dependencies": {
1818
"app-builder-lib": "workspace:*"
19+
},
20+
"pnpm": {
21+
"overrides": {
22+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
23+
"minimatch@<3.0.5": ">=3.0.5"
24+
}
1925
}
2026
}

Diff for: ‎packages/electron-forge-maker-nsis/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@
1616
],
1717
"dependencies": {
1818
"app-builder-lib": "workspace:*"
19+
},
20+
"pnpm": {
21+
"overrides": {
22+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
23+
"minimatch@<3.0.5": ">=3.0.5"
24+
}
1925
}
2026
}

Diff for: ‎packages/electron-forge-maker-snap/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@
1616
],
1717
"dependencies": {
1818
"app-builder-lib": "workspace:*"
19+
},
20+
"pnpm": {
21+
"overrides": {
22+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
23+
"minimatch@<3.0.5": ">=3.0.5"
24+
}
1925
}
2026
}

Diff for: ‎packages/electron-publish/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@
1919
"builder-util": "workspace:*",
2020
"builder-util-runtime": "workspace:*",
2121
"chalk": "^4.1.1",
22-
"fs-extra": "^10.0.0",
22+
"fs-extra": "^10.1.0",
2323
"lazy-val": "^1.0.5",
2424
"mime": "^2.5.2"
2525
},
2626
"typings": "./out/publisher.d.ts",
2727
"devDependencies": {
2828
"@types/mime": "2.0.3"
29+
},
30+
"pnpm": {
31+
"overrides": {
32+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
33+
"minimatch@<3.0.5": ">=3.0.5"
34+
}
2935
}
3036
}

Diff for: ‎packages/electron-updater/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"dependencies": {
1919
"@types/semver": "^7.3.6",
2020
"builder-util-runtime": "workspace:*",
21-
"fs-extra": "^10.0.0",
21+
"fs-extra": "^10.1.0",
2222
"js-yaml": "^4.1.0",
2323
"lazy-val": "^1.0.5",
2424
"lodash.escaperegexp": "^4.1.2",
@@ -35,5 +35,11 @@
3535
"typings": "./out/main.d.ts",
3636
"publishConfig": {
3737
"tag": "next"
38+
},
39+
"pnpm": {
40+
"overrides": {
41+
"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
42+
"minimatch@<3.0.5": ">=3.0.5"
43+
}
3844
}
3945
}

Diff for: ‎patches/@[email protected] renamed to ‎patches/@[email protected]

+6-21
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/dist/cli.cjs.dev.js b/dist/cli.cjs.dev.js
2-
index f01eca6b49e81a043d12f90597dfd13bc911f2e9..bf26ef5e9f7c31fb67e21ced826143b44e776a76 100644
2+
index e903107505f8f55defc76fafa07009c907499e31..b428b718e26aeacebe23d6f9ebdf6b3ac3907ee5 100644
33
--- a/dist/cli.cjs.dev.js
44
+++ b/dist/cli.cjs.dev.js
5-
@@ -1142,8 +1142,8 @@ async function run$1(cwd) {
5+
@@ -1268,8 +1268,8 @@ async function run$1(cwd) {
66
} = await getPackages.getPackages(cwd);
77
const allExistingTags = await git.getAllTags(cwd);
88

@@ -14,32 +14,17 @@ index f01eca6b49e81a043d12f90597dfd13bc911f2e9..bf26ef5e9f7c31fb67e21ced826143b4
1414
if (allExistingTags.has(tag)) {
1515
logger.log("Skipping tag (already exists): ", tag);
1616
diff --git a/dist/cli.cjs.prod.js b/dist/cli.cjs.prod.js
17-
index d6303927c8ac508650cf90aba54ea60327c9dc9a..e18f1050e83926e633bbd96ec290e93a211008c3 100644
17+
index fe411b261d240a2683308a54be71fd982f4f211b..d2896a5f5277370abf3530bf7e7dd74e18287b50 100644
1818
--- a/dist/cli.cjs.prod.js
1919
+++ b/dist/cli.cjs.prod.js
20-
@@ -628,8 +628,8 @@ async function pre(cwd, options) {
20+
@@ -687,8 +687,8 @@ async function pre(cwd, options) {
2121

2222
async function run$1(cwd) {
2323
const {packages: packages, tool: tool} = await getPackages.getPackages(cwd), allExistingTags = await git.getAllTags(cwd);
2424
- for (const pkg of packages) {
2525
- const tag = "root" !== tool ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : "v" + pkg.packageJson.version;
2626
+ for (const pkg of packages.filter(pkg => ["electron-builder", "electron-updater"].includes(pkg.packageJson.name))) {
27-
+ const tag = (tool !== "root" && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`;
27+
+ const tag = ("root" !== tool && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : "v" + pkg.packageJson.version;
2828
allExistingTags.has(tag) ? logger.log("Skipping tag (already exists): ", tag) : (logger.log("New tag: ", tag),
2929
await git.tag(tag, cwd));
30-
}
31-
diff --git a/dist/cli.esm.js b/dist/cli.esm.js
32-
index abaa3c80216fa7eada35656b8df2763a67ea3359..c7131b5349070a557f91a801842c8fe32e7fe6b0 100644
33-
--- a/dist/cli.esm.js
34-
+++ b/dist/cli.esm.js
35-
@@ -1119,8 +1119,8 @@ async function run$1(cwd) {
36-
} = await getPackages(cwd);
37-
const allExistingTags = await getAllTags(cwd);
38-
39-
- for (const pkg of packages) {
40-
- const tag$1 = tool !== "root" ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`;
41-
+ for (const pkg of packages.filter(pkg => ["electron-builder", "electron-updater"].includes(pkg.packageJson.name))) {
42-
+ const tag$1 = (tool !== "root" && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`;
43-
44-
if (allExistingTags.has(tag$1)) {
45-
log("Skipping tag (already exists): ", tag$1);
30+
}

0 commit comments

Comments
 (0)