Test revert verdaccio change

Author: devversion

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",

tests/legacy-cli/BUILD.bazel

@@ -75,13 +75,14 @@ e2e_suites(
         "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",
 )

tests/legacy-cli/e2e/utils/registry.ts

@@ -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_runner.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) => {

tests/legacy-cli/rollup.config.mjs

@@ -25,7 +25,7 @@ for (const file of testFiles) {
 
 export default {
   input: chunks,
-  external: ['pino', '@verdaccio/logger-prettify'],
+  external: [],
   plugins: [
     nodeResolve({
       preferBuiltins: true,

tests/legacy-cli/verdaccio.yaml

@@ -3,7 +3,7 @@ storage: ./storage
 auth:
   auth-memory:
     users: {}
-listen: 0.0.0.0:${HTTP_PORT}
+listen: localhost:${HTTP_PORT}
 uplinks:
   npmjs:
     url: https://registry.npmjs.org/
@@ -41,6 +41,11 @@ packages:
     access: $all
     proxy: npmjs
 
+log:
+  type: stdout
+  format: pretty
+  level: warn
+
 # https://github.com/verdaccio/verdaccio/issues/301
 server:
   keepAliveTimeout: 0

tests/legacy-cli/verdaccio_auth.yaml

@@ -5,10 +5,10 @@ auth:
       testing:
         name: testing
         password: s3cret
-listen: 0.0.0.0:${HTTPS_PORT}
+listen: localhost:${HTTPS_PORT}
 uplinks:
   local:
-    url: http://127.0.0.1:${HTTP_PORT}
+    url: http://localhost:${HTTP_PORT}
     cache: false
     maxage: 20m
     max_fails: 32
@@ -23,6 +23,11 @@ packages:
     access: $authenticated
     proxy: local
 
+log:
+  type: stdout
+  format: pretty
+  level: warn
+
 # https://github.com/verdaccio/verdaccio/issues/301
 server:
   keepAliveTimeout: 0