ci: add bun package manager to e2e tests

alan-agius4 · dgp1130 · commit 1737ce2bbd58 · 2025-11-19T14:14:44.000-08:00
This commit introduces support for the `bun` package manager in our end-to-end tests. (cherry picked from commit 76ed178)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -162,7 +162,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node: [22]
-        subset: [yarn, pnpm]
+        subset: [yarn, pnpm, bun]
         shard: [0, 1, 2]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -180,7 +180,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node: [22]
-        subset: [yarn, pnpm]
+        subset: [yarn, pnpm, bun]
         shard: [0, 1, 2]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/packages/angular/cli/src/commands/add/cli.ts b/packages/angular/cli/src/commands/add/cli.ts
@@ -493,7 +493,9 @@ export default class AddCommandModule
     // Only show if installation will actually occur
     task.title = 'Installing package';
 
-    if (context.savePackage === false) {
+    if (context.savePackage === false && packageManager.name !== PackageManager.Bun) {
+      // Bun has a `--no-save` option which we are using to
+      // install the package and not update the package.json and the lock file.
       task.title += ' in temporary location';
 
       // Temporary packages are located in a different directory
diff --git a/packages/angular/cli/src/utilities/package-manager.ts b/packages/angular/cli/src/utilities/package-manager.ts
@@ -61,7 +61,7 @@ export class PackageManagerUtils {
   /** Install a single package. */
   async install(
     packageName: string,
-    save: 'dependencies' | 'devDependencies' | true = true,
+    save: 'dependencies' | 'devDependencies' | boolean = true,
     extraArgs: string[] = [],
     cwd?: string,
   ): Promise<boolean> {
@@ -70,6 +70,8 @@ export class PackageManagerUtils {
 
     if (save === 'devDependencies') {
       installArgs.push(packageManagerArgs.saveDev);
+    } else if (save === false) {
+      installArgs.push(packageManagerArgs.noLockfile);
     }
 
     return this.run([...installArgs, ...extraArgs], { cwd, silent: true });
@@ -158,11 +160,11 @@ export class PackageManagerUtils {
         };
       case PackageManager.Bun:
         return {
-          saveDev: '--development',
+          saveDev: '--dev',
           install: 'add',
           installAll: 'install',
           prefix: '--cwd',
-          noLockfile: '',
+          noLockfile: '--no-save',
         };
       default:
         return {
diff --git a/tests/legacy-cli/e2e/assets/BUILD.bazel b/tests/legacy-cli/e2e/assets/BUILD.bazel
@@ -2,6 +2,9 @@ load("//tools:defaults.bzl", "copy_to_bin")
 
 copy_to_bin(
     name = "assets",
-    srcs = glob(["**"]),
+    srcs = glob(
+        include = ["**"],
+        exclude = ["BUILD.bazel"],
+    ),
     visibility = ["//visibility:public"],
 )
diff --git a/tests/legacy-cli/e2e/assets/add-collection-dir/collection.json b/tests/legacy-cli/e2e/assets/add-collection-dir/collection.json
diff --git a/tests/legacy-cli/e2e/assets/add-collection-dir/index.js b/tests/legacy-cli/e2e/assets/add-collection-dir/index.js
diff --git a/tests/legacy-cli/e2e/assets/add-collection-dir/package.json b/tests/legacy-cli/e2e/assets/add-collection-dir/package.json
diff --git a/tests/legacy-cli/e2e/setup/100-global-cli.ts b/tests/legacy-cli/e2e/setup/100-global-cli.ts
@@ -6,7 +6,7 @@ const PACKAGE_MANAGER_VERSION = {
   'npm': '10.8.1',
   'yarn': '1.22.22',
   'pnpm': '10.17.1',
-  'bun': '1.2.21',
+  'bun': '1.3.2',
 };
 
 export default async function () {
diff --git a/tests/legacy-cli/e2e/tests/commands/add/base.ts b/tests/legacy-cli/e2e/tests/commands/add/base.ts
@@ -4,7 +4,7 @@ import { ng } from '../../../utils/process';
 import { expectToFail } from '../../../utils/utils';
 
 export default async function () {
-  await symlinkFile(assetDir('add-collection'), `./node_modules/add-collection`, 'dir');
+  await symlinkFile(assetDir('add-collection-dir'), `./node_modules/add-collection`, 'dir');
 
   await ng('add', 'add-collection');
   await expectFileToExist('empty-file');
diff --git a/tests/legacy-cli/e2e/tests/commands/add/dir.ts b/tests/legacy-cli/e2e/tests/commands/add/dir.ts
@@ -1,8 +1,19 @@
+import { cp } from 'node:fs/promises';
+import { resolve } from 'node:path';
 import { assetDir } from '../../../utils/assets';
 import { expectFileToExist } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 
 export default async function () {
-  await ng('add', assetDir('add-collection'), '--name=blah', '--skip-confirmation');
+  const collectionName = 'add-collection-dir';
+  const dirCollectionPath = resolve(collectionName);
+
+  // Copy locally as bun doesn't install the dependency correctly if it has symlinks.
+  await cp(assetDir(collectionName), dirCollectionPath, {
+    recursive: true,
+    dereference: true,
+  });
+
+  await ng('add', dirCollectionPath, '--name=blah', '--skip-confirmation');
   await expectFileToExist('blah');
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/peer.ts b/tests/legacy-cli/e2e/tests/commands/add/peer.ts
@@ -1,24 +1,44 @@
 import assert from 'node:assert/strict';
+import { resolve } from 'node:path';
+import { cp } from 'node:fs/promises';
 import { assetDir } from '../../../utils/assets';
 import { ng } from '../../../utils/process';
 
-const warning = 'Adding the package may not succeed.';
+export default async function (): Promise<void> {
+  const warning = /Adding the package may not succeed/;
 
-export default async function () {
-  const { stdout: bad } = await ng(
-    'add',
-    assetDir('add-collection-peer-bad'),
-    '--skip-confirmation',
+  const stdout1 = await runNgAdd('add-collection-peer-bad');
+  assert.match(
+    stdout1,
+    warning,
+    `Peer warning should be shown for add-collection-peer-bad but was not.`,
   );
-  assert.match(bad, new RegExp(warning), 'peer warning not shown on bad package');
 
-  const { stdout: base } = await ng('add', assetDir('add-collection'), '--skip-confirmation');
-  assert.doesNotMatch(base, new RegExp(warning), 'peer warning shown on base package');
+  const stdout2 = await runNgAdd('add-collection-dir');
+  assert.doesNotMatch(
+    stdout2,
+    warning,
+    `Peer warning should NOT be shown for add-collection-dir but was.`,
+  );
 
-  const { stdout: good } = await ng(
-    'add',
-    assetDir('add-collection-peer-good'),
-    '--skip-confirmation',
+  const stdout3 = await runNgAdd('add-collection-peer-good');
+  assert.doesNotMatch(
+    stdout3,
+    warning,
+    `Peer warning should NOT be shown for add-collection-peer-good but was.`,
   );
-  assert.doesNotMatch(good, new RegExp(warning), 'peer warning shown on good package');
+}
+
+async function runNgAdd(collectionName: string): Promise<string> {
+  const collectionPath = resolve(collectionName);
+
+  // Copy locally as bun doesn't install the dependency correctly if it has symlinks.
+  await cp(assetDir(collectionName), collectionPath, {
+    recursive: true,
+    dereference: true,
+  });
+
+  const { stdout } = await ng('add', collectionPath, '--skip-confirmation');
+
+  return stdout;
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/secure-registry.ts b/tests/legacy-cli/e2e/tests/commands/add/secure-registry.ts
@@ -1,42 +1,49 @@
-import { expectFileNotToExist, expectFileToExist } from '../../../utils/fs';
+import { expectFileNotToExist, expectFileToExist, rimraf } from '../../../utils/fs';
 import { getActivePackageManager, installWorkspacePackages } from '../../../utils/packages';
 import { git, ng } from '../../../utils/process';
 import { createNpmConfigForAuthentication } from '../../../utils/registry';
 import { expectToFail } from '../../../utils/utils';
 
 export default async function () {
-  // The environment variable has priority over the .npmrc
-  delete process.env['NPM_CONFIG_REGISTRY'];
-  const isNpm = getActivePackageManager() === 'npm';
+  const originalNpmConfigRegistry = process.env['NPM_CONFIG_REGISTRY'];
+  try {
+    // The environment variable has priority over the .npmrc
+    delete process.env['NPM_CONFIG_REGISTRY'];
+    const packageManager = getActivePackageManager();
+    const supportsUnscopedAuth = packageManager !== 'bun' && packageManager !== 'npm';
+    const command = ['add', '@angular/pwa', '--skip-confirmation'];
 
-  const command = ['add', '@angular/pwa', '--skip-confirmation'];
-  await expectFileNotToExist('public/manifest.webmanifest');
+    await expectFileNotToExist('public/manifest.webmanifest');
 
-  // Works with unscoped registry authentication details
-  if (!isNpm) {
-    // NPM no longer support unscoped.
-    await createNpmConfigForAuthentication(false);
+    // Works with unscoped registry authentication details
+    if (supportsUnscopedAuth) {
+      // Some package managers such as Bun and NPM do not support unscoped auth.
+      await createNpmConfigForAuthentication(false);
+      await ng(...command);
+      await expectFileToExist('public/manifest.webmanifest');
+      await git('clean', '-dxf');
+    }
+
+    // Works with scoped registry authentication details
+    await expectFileNotToExist('public/manifest.webmanifest');
+
+    await createNpmConfigForAuthentication(true);
     await ng(...command);
     await expectFileToExist('public/manifest.webmanifest');
     await git('clean', '-dxf');
-  }
-  // Works with scoped registry authentication details
-  await expectFileNotToExist('public/manifest.webmanifest');
 
-  await createNpmConfigForAuthentication(true);
-  await ng(...command);
-  await expectFileToExist('public/manifest.webmanifest');
+    // Invalid authentication token
+    if (!supportsUnscopedAuth) {
+      // Some package managers such as Bun and NPM do not support unscoped auth.
+      await createNpmConfigForAuthentication(false, true);
+      await expectToFail(() => ng(...command));
+    }
 
-  // Invalid authentication token
-  if (isNpm) {
-    // NPM no longer support unscoped.
-    await createNpmConfigForAuthentication(false, true);
+    await createNpmConfigForAuthentication(true, true);
     await expectToFail(() => ng(...command));
+  } finally {
+    process.env['NPM_CONFIG_REGISTRY'] = originalNpmConfigRegistry;
+    await git('clean', '-dxf');
+    await installWorkspacePackages();
   }
-
-  await createNpmConfigForAuthentication(true, true);
-  await expectToFail(() => ng(...command));
-
-  await git('clean', '-dxf');
-  await installWorkspacePackages();
 }
