Test revert verdaccio change

Author: devversion

.github/shared-actions/windows-bazel-test/action.yml

@@ -22,7 +22,7 @@ runs:
 
     - name: Initialize WSL
       id: init_wsl
-      uses: angular/dev-infra/github-actions/setup-wsl@10c9ccde0b22c30eefc13adc5a5121b5898902d1
+      uses: angular/dev-infra/github-actions/setup-wsl@9a3e28a515bf51cd2ecfd5f4d5b17613845e6f44
       with:
         wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
 

.github/workflows/ci.yml

@@ -95,7 +95,7 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d
       - name: Run CLI E2E tests
-        run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-package-managers:
     needs: test
@@ -117,7 +117,7 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d
       - name: Run CLI E2E tests
-        run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: yarn bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-snapshots:
     needs: test
@@ -139,7 +139,7 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d
       - name: Run CLI E2E tests
-        run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
+        run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
 
   browsers:
     needs: build

.github/workflows/pr.yml

@@ -123,7 +123,7 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d
       - name: Run CLI E2E tests
-        run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-windows-subset:
     # needs: build
@@ -154,7 +154,7 @@ jobs:
   #        with:
   #          command: |
   #            yarn bazel test \
-  #              --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} \
+  #              --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} \
   #              --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} \
 
   e2e-package-managers:
@@ -177,7 +177,7 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d
       - name: Run CLI E2E tests
-        run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: yarn bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-snapshots:
     needs: [analyze, build]
@@ -200,4 +200,4 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d
       - name: Run CLI E2E tests
-        run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
+        run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

WORKSPACE

@@ -193,11 +193,8 @@ npm_translate_lock(
     },
     pnpm_lock = "//:pnpm-lock.yaml",
     public_hoist_packages = {
-        # Pino of Verdaccio can't be bundled, so we make it loadable as runtime dep.
-        # Similarly, logger-prettify is dynamically loaded at runtime.
-        "pino": [""],
+        # TODO: Remove when https://github.com/verdaccio/verdaccio/commit/bf0e09a509e8e0a74167b0307d129202bc3f40d2 is available.
         "@verdaccio/config": [""],
-        "@verdaccio/logger-prettify": [""],
     },
     update_pnpm_lock = True,
     verify_node_modules_ignored = "//:.bazelignore",

test.sh

@@ -1,23 +1,10 @@
 load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@npm2//:rollup/package_json.bzl", rollup = "bin")
 load("//tools:interop.bzl", "ts_project")
 load(":e2e.bzl", "e2e_suites")
 
 package(default_visibility = ["//visibility:public"])
 
-bool_flag(
-    name = "enable_native_windows_testing",
-    build_setting_default = False,
-)
-
-config_setting(
-    name = "native_windows_testing",
-    flag_values = {
-        ":enable_native_windows_testing": "true",
-    },
-)
-
 ts_project(
     name = "runner",
     testonly = True,
@@ -72,16 +59,16 @@ e2e_suites(
         ":runner_bundled",
         "verdaccio.yaml",
         "verdaccio_auth.yaml",
-        "package.json",
 
         # Dynamically loaded.
-        "//:node_modules/verdaccio-auth-memory",
         "//tests/legacy-cli/e2e/assets",
+        "//:node_modules/verdaccio",
+        "//:node_modules/verdaccio-auth-memory",
 
-        # Runtime deps due to bundling issues
+        # Extra runtime deps due to bundling issues.
+        # TODO: Clean this up.
         "//:node_modules/@verdaccio/config",
-        "//:node_modules/@verdaccio/logger-prettify",
-        "//:node_modules/pino",
+        "//:node_modules/express",
     ],
     runner = ":runner_entrypoint",
 )

test2.sh

@@ -5,16 +5,19 @@ export default async function () {
   // Should be disabled by default.
   await configureTest(undefined /** analytics */);
   await execAndWaitForOutputToMatch('ng', ['analytics', 'info'], /Effective status: disabled/, {
+    ...process.env,
     NG_FORCE_TTY: '0', // Disable prompts
   });
 
   await configureTest('1dba0835-38a3-4957-bf34-9974e2df0df3' /** analytics */);
   await execAndWaitForOutputToMatch('ng', ['analytics', 'info'], /Effective status: enabled/, {
+    ...process.env,
     NG_FORCE_TTY: '0', // Disable prompts
   });
 
   await configureTest(false /** analytics */);
   await execAndWaitForOutputToMatch('ng', ['analytics', 'info'], /Effective status: disabled/, {
+    ...process.env,
     NG_FORCE_TTY: '0', // Disable prompts
   });
 }

tests/legacy-cli/BUILD.bazel

@@ -1,42 +1,44 @@
+import { ChildProcess, fork } from 'node:child_process';
+import { on } from 'node:events';
 import { join } from 'node:path';
 import { getGlobalVariable } from './env';
 import { writeFile, readFile } from './fs';
 import { mktempd } from './utils';
-import { runServer as runVerdaccioServer } from 'verdaccio';
-import { setup as setupVerdaccioLogger } from 'verdaccio/build/lib/logger';
 
 export async function createNpmRegistry(
   port: number,
   httpsPort: number,
   withAuthentication = false,
-): Promise<void> {
+): Promise<ChildProcess> {
   // Setup local package registry
   const registryPath = await mktempd('angular-cli-e2e-registry-');
 
   let configContent = await readFile(
-    join('tests/legacy-cli', withAuthentication ? 'verdaccio_auth.yaml' : 'verdaccio.yaml'),
+    join(__dirname, '../', withAuthentication ? 'verdaccio_auth.yaml' : 'verdaccio.yaml'),
   );
   configContent = configContent.replace(/\$\{HTTP_PORT\}/g, String(port));
   configContent = configContent.replace(/\$\{HTTPS_PORT\}/g, String(httpsPort));
   const configPath = join(registryPath, 'verdaccio.yaml');
   await writeFile(configPath, configContent);
 
-  const instancePort = withAuthentication ? httpsPort : port;
-
-  // Verdaccio config `log` section is not respected by the programmatic API.
-  setupVerdaccioLogger({
-    type: 'stdout',
-    level: 'warn',
-    format: 'pretty',
-  });
-
-  const server = await runVerdaccioServer(configPath);
-
-  await new Promise<void>((resolve) => {
-    server.listen(instancePort, () => resolve());
-  });
+  const verdaccioServer = fork(require.resolve('verdaccio/bin/verdaccio'), ['-c', configPath]);
+  for await (const events of on(verdaccioServer, 'message', {
+    signal: AbortSignal.timeout(30_000),
+  })) {
+    if (
+      events.some(
+        (event: unknown) =>
+          event &&
+          typeof event === 'object' &&
+          'verdaccio_started' in event &&
+          event.verdaccio_started,
+      )
+    ) {
+      break;
+    }
+  }
 
-  console.log(`Verdaccio running on: http://localhost:${instancePort}`);
+  return verdaccioServer;
 }
 
 // Token was generated using `echo -n 'testing:s3cret' | openssl base64`.

tests/legacy-cli/e2e/tests/commands/analytics/analytics-info.ts

@@ -223,8 +223,8 @@ Promise.all([findFreePort(), findFreePort(), findPackageTars()])
     setGlobalVariable('package-tars', packageTars);
 
     // NPM registries for the lifetime of the test execution
-    await createNpmRegistry(httpPort, httpPort);
-    await createNpmRegistry(httpPort, httpsPort, true);
+    const registryProcess = await createNpmRegistry(httpPort, httpPort);
+    const secureRegistryProcess = await createNpmRegistry(httpPort, httpsPort, true);
 
     try {
       await runSteps(runSetup, allSetups, 'setup');
@@ -261,8 +261,8 @@ Promise.all([findFreePort(), findFreePort(), findPackageTars()])
 
       process.exitCode = 1;
     } finally {
-      // Note: Need to exit as Verdaccio API does not expose a way to stop the server.
-      process.exit();
+      registryProcess.kill();
+      secureRegistryProcess.kill();
     }
   })
   .catch((err) => {