build: Yarn 4 CI hardening (#4028)

* build: run tsc on `prepack`

* chore: update. lockfiles on postpack

* Revert "chore: update. lockfiles on postpack"

This reverts commit 3588cc9.

* test

* remove hack due to immutable

* test again

* update deps

Author: erickzhao

CONTRIBUTING.md

@@ -146,7 +146,6 @@ This guide is for maintainers who have:
 - Check that the latest CI run passed on `main` on [GitHub](https://github.com/electron/forge/actions?query=workflow:CI).
 - Remove all untracked files and directories from your checkout with `git clean -fdx`.
 - Install dependencies with `yarn install`.
-- Build packages with `yarn build`.
 
 ### 2. Publish all npm packages
 

package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "clean": "node -e \"fs.rmSync('dist', { recursive: true, force: true })\" && lerna exec -- \"node -e \\\"fs.rmSync('dist', { recursive: true, force: true })\\\" && node -e \\\"fs.rmSync('tsconfig.tsbuildinfo', { recursive: true, force: true })\\\"\"",
     "build": "tsc -b packages && ts-node tools/test-dist",
-    "build:watch": "yarn build --watch",
+    "build:watch": "tsc -b packages --watch",
     "docs": "yarn build && typedoc",
     "lerna:publish": "lerna publish --force-publish --conventional-commits --no-changelog --exact",
     "lint:js": "prettier --check . --experimental-cli && eslint . --cache",
@@ -18,6 +18,7 @@
     "lint:markdown-links": "electron-lint-markdown-links --root . --ignore-path .markdownlintignore \"**/*.md\"",
     "lint": "npm run lint:js && npm run lint:markdown && npm run lint:markdown-js && npm run lint:markdown-links",
     "lint:fix": "prettier --write . --experimental-cli && eslint --fix . --cache",
+    "prepack": "yarn build",
     "test": "xvfb-maybe vitest run --project fast --project slow",
     "test:fast": "xvfb-maybe vitest run --project fast",
     "test:slow": "xvfb-maybe vitest run --project slow",
@@ -35,6 +36,8 @@
     "@electron/packager": "^18.3.5",
     "@electron/rebuild": "^3.7.0",
     "@google-cloud/storage": "^7.5.0",
+    "@inquirer/prompts": "^6.0.1",
+    "@listr2/prompt-adapter-inquirer": "^2.0.22",
     "@malept/cross-spawn-promise": "^2.0.0",
     "@octokit/core": "^5.2.1",
     "@octokit/plugin-retry": "^6.1.0",

packages/api/core/spec/slow/api.slow.spec.ts

@@ -53,22 +53,15 @@ describe.each([
   let dir: string;
 
   beforeAll(async () => {
+    const originalCorepackStrict = process.env.COREPACK_ENABLE_STRICT;
     if (pm.executable === 'pnpm') {
       // temporarily disable corepack to enable pnpm to set links
-      const originalCorepackStrict = process.env.COREPACK_ENABLE_STRICT;
       process.env.COREPACK_ENABLE_STRICT = '0';
-      try {
-        await spawnPackageManager(
-          pm,
-          'config set node-linker hoisted'.split(' '),
-        );
-      } finally {
-        if (originalCorepackStrict === undefined) {
-          delete process.env.COREPACK_ENABLE_STRICT;
-        } else {
-          process.env.COREPACK_ENABLE_STRICT = originalCorepackStrict;
-        }
-      }
+
+      await spawnPackageManager(
+        pm,
+        'config set node-linker hoisted'.split(' '),
+      );
     }
 
     return async () => {
@@ -78,19 +71,14 @@ describe.each([
         await spawnPackageManager(pm, ['unlink', '--all']);
       } else if (pm.executable === 'pnpm') {
         // pnpm doesn't support --all, and requires Corepack bypass
-        const originalCorepackStrict = process.env.COREPACK_ENABLE_STRICT;
-        process.env.COREPACK_ENABLE_STRICT = '0';
-        try {
-          await spawnPackageManager(pm, ['unlink']);
-        } finally {
-          if (originalCorepackStrict === undefined) {
-            delete process.env.COREPACK_ENABLE_STRICT;
-          } else {
-            process.env.COREPACK_ENABLE_STRICT = originalCorepackStrict;
-          }
-        }
+        await spawnPackageManager(pm, ['unlink']);
       }
       delete process.env.NODE_INSTALLER;
+      if (originalCorepackStrict === undefined) {
+        delete process.env.COREPACK_ENABLE_STRICT;
+      } else {
+        process.env.COREPACK_ENABLE_STRICT = originalCorepackStrict;
+      }
     };
   });
 

packages/api/core/src/api/init.ts

@@ -87,7 +87,7 @@ export default async ({
         title: `Resolving package manager`,
         task: async (ctx, task) => {
           ctx.pm = await resolvePackageManager();
-          task.title = `Resolving package manager: ${chalk.cyan(ctx.pm.executable)}`;
+          task.title = `Resolving package manager: ${chalk.cyan(ctx.pm.executable)} v${ctx.pm.version}`;
         },
       },
       {

packages/template/base/src/BaseTemplate.ts

@@ -140,11 +140,18 @@ export class BaseTemplate implements ForgeTemplate {
 
     const pm = await resolvePackageManager();
 
-    // As of pnpm v10, no postinstall scripts will run unless allowlisted through `onlyBuiltDependencies`
     if (pm.executable === 'pnpm') {
+      d('Adding Electron dependencies to `onlyBuiltDependencies`');
       packageJSON.pnpm = {
         onlyBuiltDependencies: ['electron', 'electron-winstaller'],
       };
+    } else if (
+      pm.executable === 'yarn' &&
+      typeof pm.version === 'string' &&
+      semver.gte(pm.version, '2.0.0')
+    ) {
+      d('Detected Yarn 2+, adding packageManager field to package.json');
+      packageJSON.packageManager = `yarn@${pm.version}`;
     }
 
     packageJSON.scripts.lint = 'echo "No linting configured"';

packages/template/vite-typescript/spec/ViteTypeScriptTemplate.slow.spec.ts

@@ -75,20 +75,6 @@ describe('ViteTypeScriptTemplate', () => {
       // Vite resolves plugins via cwd
       cwd = process.cwd();
       process.chdir(dir);
-      // We need the version of vite to match exactly during development due to a quirk in
-      // typescript type-resolution.  In prod no one has to worry about things like this
-      const pj = JSON.parse(
-        await fs.promises.readFile(path.resolve(dir, 'package.json'), 'utf-8'),
-      );
-      pj.resolutions = {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        vite: `${require('../../../../node_modules/vite/package.json').version}`,
-      };
-      await fs.promises.writeFile(
-        path.resolve(dir, 'package.json'),
-        JSON.stringify(pj),
-      );
-
       /**
        * LOCKFILE FIXTURE USAGE:
        * We use a pre-generated lockfile to avoid needing to disable Yarn's security features.