Merge branch 'master' into workspace

electron-userland · Oct 10, 2024 · a2871a1 · a2871a1
2 parents 6370376 + dfa35c3
commit a2871a1
Show file tree

Hide file tree

Showing 13 changed files with 1,633 additions and 2,782 deletions.
diff --git a/.changeset/lucky-tigers-do.md b/.changeset/lucky-tigers-do.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix: add additional default exclusions to copy logic
diff --git a/.changeset/real-cougars-watch.md b/.changeset/real-cougars-watch.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+chore(deps): update @electron/rebuild to v3.7.0
diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
@@ -49,7 +49,7 @@
     "@develar/schema-utils": "~2.6.5",
     "@electron/notarize": "2.5.0",
     "@electron/osx-sign": "1.3.1",
-    "@electron/rebuild": "3.6.1",
+    "@electron/rebuild": "3.7.0",
     "@electron/universal": "2.0.1",
     "@malept/flatpak-bundler": "^0.4.0",
     "@types/fs-extra": "9.0.13",

diff --git a/packages/app-builder-lib/src/electron/electronVersion.ts b/packages/app-builder-lib/src/electron/electronVersion.ts
@@ -60,7 +60,7 @@ export async function computeElectronVersion(projectDir: string): Promise<string
 
   const potentialRootDirs = [projectDir, await getProjectRootPath(projectDir)]
   let dependency: NameAndVersion | null = null
-  for await (const dir of potentialRootDirs) {
+  for (const dir of potentialRootDirs) {
     const metadata = await orNullIfFileNotExist(readJson(path.join(dir, "package.json")))
     dependency = metadata ? findFromPackageMetadata(metadata) : null
     if (dependency) {

diff --git a/packages/app-builder-lib/src/fileMatcher.ts b/packages/app-builder-lib/src/fileMatcher.ts
@@ -15,13 +15,13 @@ export const excludedNames =
   ".git,.hg,.svn,CVS,RCS,SCCS," +
   "__pycache__,.DS_Store,thumbs.db,.gitignore,.gitkeep,.gitattributes,.npmignore," +
   ".idea,.vs,.flowconfig,.jshintrc,.eslintrc,.circleci," +
-  ".yarn-integrity,.yarn-metadata.json,yarn-error.log,yarn.lock,package-lock.json,npm-debug.log," +
+  ".yarn-integrity,.yarn-metadata.json,yarn-error.log,yarn.lock,package-lock.json,npm-debug.log,pnpm-lock.yaml," +
   "appveyor.yml,.travis.yml,circle.yml,.nyc_output,.husky,.github,electron-builder.env"
 
 export const excludedExts =
   "iml,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,suo,xproj,cc,d.ts," +
   // https://github.com/electron-userland/electron-builder/issues/7512
-  "mk,a,o,forge-meta"
+  "mk,a,o,obj,forge-meta"
 
 function ensureNoEndSlash(file: string): string {
   if (path.sep !== "/") {

diff --git a/packages/app-builder-lib/src/util/NodeModuleCopyHelper.ts b/packages/app-builder-lib/src/util/NodeModuleCopyHelper.ts
@@ -10,10 +10,19 @@ import { NodeModuleInfo } from "./packageDependencies"
 import { realpathSync } from "fs"
 
 const excludedFiles = new Set(
-  [".DS_Store", "node_modules" /* already in the queue */, "CHANGELOG.md", "ChangeLog", "changelog.md", "Changelog.md", "Changelog", "binding.gyp", ".npmignore"].concat(
-    excludedNames.split(",")
-  )
-)
+  [
+    ".DS_Store",
+    "node_modules" /* already in the queue */,
+    "CHANGELOG.md",
+    "ChangeLog",
+    "changelog.md",
+    "Changelog.md",
+    "Changelog",
+    "binding.gyp",
+    ".npmignore",
+    "node_gyp_bins",
+  ].concat(excludedNames.split(",")))
+
 const topLevelExcludedFiles = new Set([
   "karma.conf.js",
   ".coveralls.yml",