build: update to yarn v4

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
           node-version: 20.x
           cache: 'yarn'
       - name: Install
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - uses: continuousauth/action@4e8a2573eeb706f6d7300d6a9f3ca6322740b72d # v1.0.5
         timeout-minutes: 60
         with:

.github/workflows/test.yml

@@ -45,9 +45,9 @@ jobs:
           cache: 'yarn'
       - name: Install (Node.js v16+)
         if : ${{ matrix.node-version != '14.21' }}
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - name: Install (Node.js v14)
         if : ${{ matrix.node-version == '14.21' }}
-        run: yarn install --frozen-lockfile --ignore-engines
+        run: yarn install --immutable --ignore-engines
       - name: Test
         run: yarn test

.gitignore

@@ -16,3 +16,4 @@ vendor/7z.dll
 vendor/7z.exe
 hook.log
 docs
+.yarn/install-state.gz

.yarnrc.yml

@@ -0,0 +1,10 @@
+enableScripts: false
+
+nodeLinker: node-modules
+
+npmMinimalAgeGate: 10080
+
+npmPreapprovedPackages:
+  - "@electron/*"
+
+yarnPath: .yarn/releases/yarn-4.10.3.cjs

package.json

@@ -19,13 +19,12 @@
     "!vendor/7z.exe"
   ],
   "scripts": {
-    "install": "node ./script/select-7z-arch.js",
     "build": "tsc",
     "docs": "npx typedoc",
-    "prepublish": "npm run build",
+    "prepack": "yarn build",
     "lint": "eslint --ext .ts src spec",
     "ava": "ava --timeout=60s",
-    "test": "npm run lint && npm run ava",
+    "test": "yarn lint && yarn ava",
     "tdd": "ava --watch"
   },
   "dependencies": {
@@ -69,5 +68,6 @@
     "require": [
       "ts-node/register/transpile-only"
     ]
-  }
+  },
+  "packageManager": "[email protected]+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f"
 }

src/7z.ts

@@ -0,0 +1,17 @@
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+
+export async function prepare7z() {
+  const baseDir = path.resolve(__dirname, '..');
+
+  /**
+   * Even if we're cross-compiling for a different arch like arm64,
+   * we still need to use the 7-Zip executable for the host arch
+   */
+  const arch = os.arch;
+
+  // Copy the 7-Zip executable for the configured architecture.
+  fs.copyFileSync(path.resolve(baseDir, 'vendor/7z-' + arch + '.exe'), path.resolve(baseDir, 'vendor/7z.exe'));
+  fs.copyFileSync(path.resolve(baseDir, 'vendor/7z-' + arch + '.dll'), path.resolve(baseDir, 'vendor/7z.dll'));
+}

src/index.ts

@@ -8,6 +8,7 @@ import { exec } from 'child_process';
 import spawn from './spawn-promise';
 import { template } from 'lodash';
 import { createSignTool, resetSignTool } from './sign';
+import { prepare7z } from './7z';
 
 export { SquirrelWindowsOptions } from './options';
 export { SquirrelWindowsOptions as Options} from './options';
@@ -50,6 +51,8 @@ function checkIfCommandExists(command: string): Promise<boolean> {
  * @see {@link https://github.com/Squirrel/Squirrel.Windows | Squirrel.Windows}
  */
 export async function createWindowsInstaller(options: SquirrelWindowsOptions): Promise<void> {
+  await prepare7z();
+
   let useMono = false;
 
   const monoExe = 'mono';