chore(deps): Updating deps and fixing pnpm audit with dependency ov…

…errides (#7213)
electron-userland · Oct 27, 2022 · 1786367 · 1786367
1 parent d42fa79
commit 1786367
Show file tree

Hide file tree

Showing 17 changed files with 974 additions and 634 deletions.
diff --git a/.changeset/swift-ties-love.md b/.changeset/swift-ties-love.md
@@ -0,0 +1,11 @@
+---
+"app-builder-lib": patch
+"builder-util": patch
+"dmg-builder": patch
+"electron-builder-squirrel-windows": patch
+"electron-builder": patch
+"electron-publish": patch
+"electron-updater": patch
+---
+
+chore(deps): Updating dependencies and fixing `pnpm audit` with dependency overrides
diff --git a/package.json b/package.json
@@ -46,18 +46,18 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "7.15.4",
-    "@changesets/changelog-github": "0.4.2",
-    "@changesets/cli": "2.19.0",
+    "@changesets/changelog-github": "0.4.7",
+    "@changesets/cli": "2.25.0",
     "@types/node": "16.11.43",
     "@typescript-eslint/eslint-plugin": "5.41.0",
     "@typescript-eslint/parser": "5.41.0",
     "catharsis": "0.9.0",
-    "conventional-changelog-cli": "2.1.1",
-    "dmd": "6.0.0",
+    "conventional-changelog-cli": "2.2.2",
+    "dmd": "6.1.0",
+    "fs-extra": "10.1.0",
     "eslint": "8.26.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.2.1",
-    "fs-extra": "10.0.0",
     "globby": "11.1.0",
     "husky": "7.0.4",
     "jest-cli": "27.5.1",
@@ -79,7 +79,16 @@
   },
   "pnpm": {
     "patchedDependencies": {
-      "@changesets/cli@2.19.0": "patches/@changesets__cli@2.19.0.patch"
+      "@changesets/cli@2.25.0": "patches/@changesets__cli@2.25.0.patch"
+    },
+    "overrides": {
+      "markdown-it@<12.3.2": ">=12.3.2",
+      "@braintree/sanitize-url@<6.0.0": ">=6.0.0",
+      "mermaid@>=8.0.0 <9.1.2": ">=9.1.2",
+      "d3-color@<3.1.0": ">=3.1.0",
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5",
+      "@types/keyv": "3.1.4"
     }
   }
 }
diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
@@ -49,23 +49,23 @@
   "dependencies": {
     "7zip-bin": "~5.1.1",
     "@develar/schema-utils": "~2.6.5",
-    "@electron/universal": "1.2.1",
+    "@electron/universal": "1.3.3",
     "@malept/flatpak-bundler": "^0.4.0",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
     "builder-util": "workspace:*",
     "builder-util-runtime": "workspace:*",
     "chromium-pickle-js": "^0.2.0",
     "debug": "^4.3.4",
-    "ejs": "^3.1.7",
+    "ejs": "^3.1.8",
     "electron-osx-sign": "^0.6.0",
     "electron-publish": "workspace:*",
     "electron-rebuild": "^3.2.9",
     "form-data": "^4.0.0",
     "fs-extra": "^10.1.0",
     "hosted-git-info": "^4.1.0",
     "is-ci": "^3.0.0",
-    "isbinaryfile": "^4.0.10",
+    "isbinaryfile": "^5.0.0",
     "js-yaml": "^4.1.0",
     "lazy-val": "^1.0.5",
     "minimatch": "^3.1.2",
@@ -108,5 +108,11 @@
     "electron-builder-squirrel-windows": "workspace:*"
   },
   "//": "electron-builder-squirrel-windows and dmg-builder added as dev dep for tests (as otherwise `require` doesn't work using Yarn 2)",
-  "typings": "./out/index.d.ts"
+  "typings": "./out/index.d.ts",
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
+  }
 }
diff --git a/packages/builder-util-runtime/package.json b/packages/builder-util-runtime/package.json
@@ -25,5 +25,11 @@
     "@types/debug": "4.1.7",
     "@types/sax": "1.2.3"
   },
-  "types": "./out/index.d.ts"
+  "types": "./out/index.d.ts",
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
+  }
 }
diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
@@ -24,7 +24,7 @@
     "chalk": "^4.1.1",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
     "is-ci": "^3.0.0",
@@ -39,5 +39,11 @@
     "@types/is-ci": "3.0.0",
     "@types/js-yaml": "4.0.3",
     "@types/source-map-support": "0.5.4"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/packages/dmg-builder/package.json b/packages/dmg-builder/package.json
@@ -20,7 +20,7 @@
 		"app-builder-lib": "workspace:*",
 		"builder-util": "workspace:*",
 		"builder-util-runtime": "workspace:*",
-		"fs-extra": "^10.0.0",
+		"fs-extra": "^10.1.0",
 		"iconv-lite": "^0.6.2",
 		"js-yaml": "^4.1.0"
 	},
@@ -32,5 +32,11 @@
 		"@types/js-yaml": "4.0.3",
 		"temp-file": "3.4.0"
 	},
-	"typings": "./out/dmg.d.ts"
+	"typings": "./out/dmg.d.ts",
+	"pnpm": {
+		"overrides": {
+			"ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+			"minimatch@<3.0.5": ">=3.0.5"
+		}
+	}
 }
diff --git a/packages/electron-builder-squirrel-windows/package.json b/packages/electron-builder-squirrel-windows/package.json
@@ -18,7 +18,7 @@
     "app-builder-lib": "workspace:*",
     "archiver": "^5.3.1",
     "builder-util": "workspace:*",
-    "fs-extra": "^10.0.0"
+    "fs-extra": "^10.1.0"
   },
   "devDependencies": {
     "@types/archiver": "5.3.1",
@@ -27,5 +27,11 @@
   "optionalDependencies": {
     "7zip-bin": "~5.1.1"
   },
-  "types": "./out/SquirrelWindowsTarget.d.ts"
+  "types": "./out/SquirrelWindowsTarget.d.ts",
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
+  }
 }
diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
@@ -56,7 +56,7 @@
     "builder-util-runtime": "workspace:*",
     "chalk": "^4.1.1",
     "dmg-builder": "workspace:*",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "is-ci": "^3.0.0",
     "lazy-val": "^1.0.5",
     "read-config-file": "6.3.2",
@@ -70,5 +70,11 @@
   "typings": "./out/index.d.ts",
   "publishConfig": {
     "tag": "next"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/packages/electron-forge-maker-appimage/package.json b/packages/electron-forge-maker-appimage/package.json
@@ -16,5 +16,11 @@
   ],
   "dependencies": {
     "app-builder-lib": "workspace:*"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/packages/electron-forge-maker-nsis-web/package.json b/packages/electron-forge-maker-nsis-web/package.json
@@ -16,5 +16,11 @@
   ],
   "dependencies": {
     "app-builder-lib": "workspace:*"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/packages/electron-forge-maker-nsis/package.json b/packages/electron-forge-maker-nsis/package.json
@@ -16,5 +16,11 @@
   ],
   "dependencies": {
     "app-builder-lib": "workspace:*"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/packages/electron-forge-maker-snap/package.json b/packages/electron-forge-maker-snap/package.json
@@ -16,5 +16,11 @@
   ],
   "dependencies": {
     "app-builder-lib": "workspace:*"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/packages/electron-publish/package.json b/packages/electron-publish/package.json
@@ -19,12 +19,18 @@
     "builder-util": "workspace:*",
     "builder-util-runtime": "workspace:*",
     "chalk": "^4.1.1",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "lazy-val": "^1.0.5",
     "mime": "^2.5.2"
   },
   "typings": "./out/publisher.d.ts",
   "devDependencies": {
     "@types/mime": "2.0.3"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@types/semver": "^7.3.6",
     "builder-util-runtime": "workspace:*",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "js-yaml": "^4.1.0",
     "lazy-val": "^1.0.5",
     "lodash.escaperegexp": "^4.1.2",
@@ -35,5 +35,11 @@
   "typings": "./out/main.d.ts",
   "publishConfig": {
     "tag": "next"
+  },
+  "pnpm": {
+    "overrides": {
+      "ansi-regex@>=4.0.0 <4.1.1": ">=4.1.1",
+      "minimatch@<3.0.5": ">=3.0.5"
+    }
   }
 }
diff --git a/patches/@changesets__cli@2.19.0.patch → patches/@changesets__cli@2.25.0.patch b/patches/@changesets__cli@2.19.0.patch → patches/@changesets__cli@2.25.0.patch
@@ -1,8 +1,8 @@
 diff --git a/dist/cli.cjs.dev.js b/dist/cli.cjs.dev.js
-index f01eca6b49e81a043d12f90597dfd13bc911f2e9..bf26ef5e9f7c31fb67e21ced826143b44e776a76 100644
+index e903107505f8f55defc76fafa07009c907499e31..b428b718e26aeacebe23d6f9ebdf6b3ac3907ee5 100644
 --- a/dist/cli.cjs.dev.js
 +++ b/dist/cli.cjs.dev.js
-@@ -1142,8 +1142,8 @@ async function run$1(cwd) {
+@@ -1268,8 +1268,8 @@ async function run$1(cwd) {
    } = await getPackages.getPackages(cwd);
    const allExistingTags = await git.getAllTags(cwd);
 
@@ -14,32 +14,17 @@ index f01eca6b49e81a043d12f90597dfd13bc911f2e9..bf26ef5e9f7c31fb67e21ced826143b4
      if (allExistingTags.has(tag)) {
        logger.log("Skipping tag (already exists): ", tag);
 diff --git a/dist/cli.cjs.prod.js b/dist/cli.cjs.prod.js
-index d6303927c8ac508650cf90aba54ea60327c9dc9a..e18f1050e83926e633bbd96ec290e93a211008c3 100644
+index fe411b261d240a2683308a54be71fd982f4f211b..d2896a5f5277370abf3530bf7e7dd74e18287b50 100644
 --- a/dist/cli.cjs.prod.js
 +++ b/dist/cli.cjs.prod.js
-@@ -628,8 +628,8 @@ async function pre(cwd, options) {
+@@ -687,8 +687,8 @@ async function pre(cwd, options) {
 
  async function run$1(cwd) {
    const {packages: packages, tool: tool} = await getPackages.getPackages(cwd), allExistingTags = await git.getAllTags(cwd);
 -  for (const pkg of packages) {
 -    const tag = "root" !== tool ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : "v" + pkg.packageJson.version;
 +  for (const pkg of packages.filter(pkg => ["electron-builder", "electron-updater"].includes(pkg.packageJson.name))) {
-+    const tag = (tool !== "root" && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`;
++    const tag = ("root" !== tool && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : "v" + pkg.packageJson.version;
      allExistingTags.has(tag) ? logger.log("Skipping tag (already exists): ", tag) : (logger.log("New tag: ", tag), 
      await git.tag(tag, cwd));
-   }
-diff --git a/dist/cli.esm.js b/dist/cli.esm.js
-index abaa3c80216fa7eada35656b8df2763a67ea3359..c7131b5349070a557f91a801842c8fe32e7fe6b0 100644
---- a/dist/cli.esm.js
-+++ b/dist/cli.esm.js
-@@ -1119,8 +1119,8 @@ async function run$1(cwd) {
-   } = await getPackages(cwd);
-   const allExistingTags = await getAllTags(cwd);
-
--  for (const pkg of packages) {
--    const tag$1 = tool !== "root" ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`;
-+  for (const pkg of packages.filter(pkg => ["electron-builder", "electron-updater"].includes(pkg.packageJson.name))) {
-+    const tag$1 = (tool !== "root" && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`;
-
-     if (allExistingTags.has(tag$1)) {
-       log("Skipping tag (already exists): ", tag$1);
+   }