fix: ignore node_gyp_bins if it exists (#1391)

electron · Aug 11, 2022 · b0f27bc · b0f27bc
1 parent a6db65f
commit b0f27bc
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/src/copy-filter.js b/src/copy-filter.js
@@ -12,7 +12,8 @@ const DEFAULT_IGNORES = [
   '/yarn\\.lock$',
   '/\\.git($|/)',
   '/node_modules/\\.bin($|/)',
-  '\\.o(bj)?$'
+  '\\.o(bj)?$',
+  '/node_gyp_bins($|/)'
 ]
 
 function populateIgnoredPaths (opts) {

diff --git a/test/copy-filter.js b/test/copy-filter.js
@@ -76,6 +76,7 @@ test('generateIgnoredOutDirs ignores all possible platform/arch permutations', (
   t.is(ignores.length, util.allPlatformArchCombosCount)
 })
 
+test('ignore default: node_gyp_bins files', util.testSinglePlatform(ignoreTest, null, 'node_gyp_bins'))
 test('ignore default: .o files', util.testSinglePlatform(ignoreTest, null, 'ignore.o'))
 test('ignore default: .obj files', util.testSinglePlatform(ignoreTest, null, 'ignore.obj'))
 test('ignore default: package manager lock files', util.testSinglePlatform(async (t, opts) => {

diff --git a/test/darwin.js b/test/darwin.js
@@ -479,10 +479,11 @@ if (!(process.env.CI && process.platform === 'win32')) {
     const finalPath = (await packager(opts))[0]
     const plistObj = await parseInfoPlist(t, opts, finalPath)
     t.is(typeof plistObj.ElectronAsarIntegrity, 'object')
+    // Note: If updating thr basic app fixture (used here in baseOpts), ths hash should also be updated.
     t.deepEqual(plistObj.ElectronAsarIntegrity, {
       'Resources/app.asar': {
         algorithm: 'SHA256',
-        hash: '27f2dba4273f6c119000ec7059c27d86e27306d5dbbb83cfdfb862d92c679574'
+        hash: '2ef4c03f6fc8adf03f782b40fddcfcdd26d1f3f3669ecedffeea5de5d28897c3'
       }
     })
   }))

diff --git a/test/fixtures/basic/node_modules/ffi-napi/build/node_gyp_bins/python3 b/test/fixtures/basic/node_modules/ffi-napi/build/node_gyp_bins/python3
diff --git a/test/fixtures/basic/node_modules/ffi-napi/package.json b/test/fixtures/basic/node_modules/ffi-napi/package.json
diff --git a/test/fixtures/basic/package.json b/test/fixtures/basic/package.json
@@ -11,6 +11,7 @@
   "devDependencies": {
     "ncp": "^2.0.0",
     "run-waterfall": "^1.1.1",
-    "electron-prebuilt": "1.4.13"
+    "electron-prebuilt": "1.4.13",
+    "ffi-napi": "4.0.3"
   }
 }