build: update dependencies to clean up yarn audit (electron#1046)

* build: update dependencies to clean up yarn audit * build: use yarn resolutions to fix nan error * spec: update tests * fix: do not force stdc++17 * build: skip engines check for dev deps
cutephoton · Dec 5, 2022 · caa3c82 · caa3c82
1 parent a328ed2
commit caa3c82
Show file tree

Hide file tree

Showing 9 changed files with 1,167 additions and 2,889 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,7 @@ steps-test: &steps-test
               nvm use 12.22.4
               ;;
           esac
-    - run: yarn install --frozen-lockfile
+    - run: yarn install --frozen-lockfile --ignore-engines
     - save_cache:
         paths:
           - node_modules
@@ -87,7 +87,7 @@ jobs:
     steps:
       - checkout
       - *step-restore-cache
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --frozen-lockfile --ignore-engines
       - run: npx @continuous-auth/[email protected]
       - run: npx [email protected]
 

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@continuous-auth/semantic-release-npm": "^2.0.0",
+    "@continuous-auth/semantic-release-npm": "^3.0.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@types/chai": "^4.2.12",
     "@types/chai-as-promised": "^7.1.3",
@@ -73,7 +73,7 @@
     "chai-as-promised": "^7.1.1",
     "codecov": "^3.7.2",
     "cross-env": "^7.0.2",
-    "electron": "^12.0.2",
+    "electron": "^22.0.0",
     "eslint": "^7.7.0",
     "eslint-plugin-mocha": "^9.0.0",
     "mocha": "^9.0.1",

diff --git a/src/clang-fetcher.ts b/src/clang-fetcher.ts
@@ -61,7 +61,6 @@ export async function getClangEnvironmentVars(electronVersion: string, targetArc
     env: {
       CC: `"${path.resolve(clangDir, 'clang')}" ${clangArgs.join(' ')}`,
       CXX: `"${path.resolve(clangDir, 'clang++')}" ${clangArgs.join(' ')}`,
-      CFLAGS: `${cxxflags.join(' ')}`,
       CXXFLAGS: `${cxxflags.join(' ')}`
     },
     args: gypArgs,

diff --git a/src/sysroot-fetcher.ts b/src/sysroot-fetcher.ts
@@ -14,7 +14,7 @@ const sysrootArchAliases = {
   ia32: 'i386',
 }
 
-const SYSROOT_BASE_URL = 'https://s3.amazonaws.com/electronjs-sysroots/toolchain'
+const SYSROOT_BASE_URL = 'https://dev-cdn.electronjs.org/linux-sysroots'
 
 export async function downloadLinuxSysroot(electronVersion: string, targetArch: string): Promise<string> {
   d('fetching sysroot for Electron:', electronVersion);
@@ -25,7 +25,7 @@ export async function downloadLinuxSysroot(electronVersion: string, targetArch:
   const linuxArch = sysrootArchAliases[targetArch] || targetArch;
   const electronSysroots = JSON.parse(await fetch(`https://raw.githubusercontent.com/electron/electron/v${electronVersion}/script/sysroots.json`, 'text'));
 
-  const { Sha1Sum: sha, Tarball: fileName } = electronSysroots[`sid_${linuxArch}`];
+  const { Sha1Sum: sha, Tarball: fileName } = electronSysroots[`sid_${linuxArch}`] || electronSysroots[`bullseye_${linuxArch}`];
   const sysrootURL = `${SYSROOT_BASE_URL}/${sha}/${fileName}`;
   let sysrootBuffer = await fetch(sysrootURL, 'buffer');
 

diff --git a/test/arch.ts b/test/arch.ts
@@ -7,7 +7,7 @@ describe('uname()', () => {
   if (process.platform !== 'win32') {
     it('should return the correct arch for your system', () => {
       // assumes that the tests will always be run on an x64 system 😬
-      expect(uname()).to.equal('x86_64');
+      expect(uname()).to.equal(process.arch === 'arm64' ? 'arm64' : 'x86_64');
     });
   }
 });

diff --git a/test/fixture/native-app1/package.json b/test/fixture/native-app1/package.json
@@ -26,5 +26,8 @@
   },
   "optionalDependencies": {
     "bcrypt": "3.0.6"
+  },
+  "resolutions": {
+    "bcrypt/nan": "2.17.0"
   }
 }
diff --git a/test/helpers/module-setup.ts b/test/helpers/module-setup.ts
@@ -22,7 +22,7 @@ export async function resetTestModule(testModulePath: string, installModules = t
     path.resolve(testModulePath, 'package.json')
   );
   if (installModules) {
-    await spawn('npm', ['install'], { cwd: testModulePath });
+    await spawn('yarn', ['install'], { cwd: testModulePath });
   }
   resetMSVSVersion();
 }

diff --git a/test/rebuild.ts b/test/rebuild.ts
@@ -85,7 +85,7 @@ describe('rebuilder', () => {
         skipped++;
       });
       await rebuilder;
-      expect(skipped).to.equal(6);
+      expect(skipped).to.equal(7);
     });
 
     it('should rebuild all modules again when disabled but the electron ABI changed', async () => {
@@ -152,7 +152,7 @@ describe('rebuilder', () => {
       let built = 0;
       rebuilder.lifecycle.on('module-done', () => built++);
       await rebuilder;
-      expect(built).to.equal(2);
+      expect(built).to.equal(3);
     });
   });