chore(repo): remove populate-storage scripts, consolidate into nx-release

.github/workflows/publish.yml

@@ -596,7 +596,7 @@ jobs:
           echo "Version set to: $VERSION"
           echo "DRY_RUN set to: $DRY_RUN"
           echo ""
-          pnpm nx-release --local=false $VERSION $DRY_RUN
+          pnpm nx nx-release-npm @nx/nx-source -- $VERSION $DRY_RUN
 
       - name: (Stable Release Only) Trigger Docs Release
         # Publish docs only on a full release

.nx/workflows/dynamic-changesets.yaml

@@ -78,6 +78,7 @@ assignment-rules:
   # These projects should not need to be isolated.
   - projects:
       - nx-dev
+      - astro-docs
     targets:
       - build*
     run-on:

e2e/utils/global-setup.ts

@@ -1,10 +1,9 @@
 import { Config } from '@jest/types';
 import { existsSync, removeSync } from 'fs-extra';
 import * as isCI from 'is-ci';
-import { exec, execSync } from 'node:child_process';
+import { ChildProcess, exec, execSync, spawn } from 'node:child_process';
 import { join } from 'node:path';
 import { registerTsConfigPaths } from '../../packages/nx/src/plugins/js/utils/register';
-import { runLocalRelease } from '../../scripts/local-registry/populate-storage';
 
 export default async function (globalConfig: Config.ConfigGlobals) {
   try {
@@ -25,14 +24,23 @@ export default async function (globalConfig: Config.ConfigGlobals) {
     const registry = `http://${listenAddress}:${port}`;
     const authToken = 'secretVerdaccioToken';
 
-    while (true) {
-      await new Promise((resolve) => setTimeout(resolve, 250));
-      try {
-        await assertLocalRegistryIsRunning(registry);
-        break;
-      } catch {
-        console.log(`Waiting for Local registry to start on ${registry}...`);
-      }
+    // When running outside of Nx (e.g. Jest directly), start verdaccio ourselves
+    let verdaccioProcess: ChildProcess | undefined;
+    if (requiresLocalRelease && !(await isLocalRegistryRunning(registry))) {
+      console.log(
+        `Local registry not detected at ${registry}, starting verdaccio...`
+      );
+      verdaccioProcess = spawn(
+        'npx',
+        [
+          'verdaccio',
+          '--config',
+          '.verdaccio/config.yml',
+          '--listen',
+          `${listenAddress}:${port}`,
+        ],
+        { stdio: 'ignore' }
+      );
     }
 
     process.env.npm_config_registry = registry;
@@ -54,6 +62,11 @@ export default async function (globalConfig: Config.ConfigGlobals) {
     global.e2eTeardown = () => {
       // Clean up environment variable instead of npm config command
       delete process.env[`npm_config_//${listenAddress}:${port}/:_authToken`];
+      // Kill verdaccio if we started it
+      if (verdaccioProcess) {
+        verdaccioProcess.kill();
+        verdaccioProcess = undefined;
+      }
     };
 
     /**
@@ -77,8 +90,26 @@ export default async function (globalConfig: Config.ConfigGlobals) {
       if (requiresLocalRelease) {
         console.log('Publishing packages to local registry');
         const publishVersion = process.env.PUBLISHED_VERSION ?? 'major';
-        // Always show full release logs on CI, they should only happen once via e2e-ci
-        await runLocalRelease(publishVersion, isCI || isVerbose);
+        const verbose = isCI || isVerbose;
+        const releaseCommand = `pnpm nx-release --local ${publishVersion}`;
+        console.log(`> ${releaseCommand}`);
+        await new Promise<void>((resolve, reject) => {
+          const child = exec(releaseCommand, {
+            maxBuffer: 1024 * 1000000,
+            windowsHide: false,
+          });
+          if (verbose) {
+            child.stdout?.pipe(process.stdout);
+            child.stderr?.pipe(process.stderr);
+          }
+          child.on('exit', (code) => {
+            if (code === 0) {
+              resolve();
+            } else {
+              reject(new Error(`Local release failed with exit code ${code}`));
+            }
+          });
+        });
       }
     }
   } catch (err) {
@@ -112,9 +143,11 @@ function getPublishedVersion(): Promise<string | undefined> {
   });
 }
 
-async function assertLocalRegistryIsRunning(url) {
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(`HTTP error! status: ${response.status}`);
+async function isLocalRegistryRunning(url: string): Promise<boolean> {
+  try {
+    const response = await fetch(url);
+    return response.ok;
+  } catch {
+    return false;
   }
 }

nx.json

@@ -343,7 +343,7 @@
   "nxCloudId": "62d013ea0852fe0a2df74438",
   "nxCloudUrl": "https://staging.nx.app",
   "parallel": 1,
-  "bust": 2,
+  "bust": 3,
   "defaultBase": "master",
   "sync": {
     "applyChanges": true

project.json

@@ -22,27 +22,30 @@
           "input": "production",
           "projects": ["tag:maven:dev.nx.maven"]
         },
-        "{workspaceRoot}/scripts/local-registry",
         "native"
       ],
+      "dependsOn": ["local-registry", "nx-release"],
+      "command": "echo 'Registry storage populated via nx-release dependency'",
+      "outputs": ["{workspaceRoot}/dist/local-registry/storage"]
+    },
+    "nx-release": {
       "dependsOn": [
         "local-registry",
         {
           "target": "build",
           "projects": ["tag:npm:public"]
         }
       ],
-      "command": "node ./scripts/local-registry/run-populate-storage.mjs",
-      "outputs": ["{workspaceRoot}/dist/local-registry/storage"]
+      "command": "ts-node -P ./scripts/tsconfig.release.json ./scripts/nx-release.ts"
     },
-    "nx-release": {
+    "nx-release-npm": {
       "dependsOn": [
         {
           "target": "build",
           "projects": ["tag:npm:public"]
         }
       ],
-      "command": "ts-node -P ./scripts/tsconfig.release.json ./scripts/nx-release.ts"
+      "command": "ts-node -P ./scripts/tsconfig.release.json ./scripts/nx-release.ts --local false"
     },
     "start-docker-registry": {
       "continuous": true,

scripts/nx-release.ts

@@ -218,6 +218,13 @@ const VALID_AUTHORS_FOR_LATEST = [
 
   hackFixForDevkitPeerDependencies();
 
+  if (options.local) {
+    const port = process.env.NX_LOCAL_REGISTRY_PORT ?? '4873';
+    const localRegistryUrl = `http://localhost:${port}`;
+    await waitForLocalRegistry(localRegistryUrl);
+    process.env.npm_config_registry = localRegistryUrl;
+  }
+
   // Run with dynamic output-style so that we have more minimal logs by default but still always see errors
   let publishCommand = `pnpm nx release publish --registry=${getRegistry()} --tag=${distTag} --output-style=dynamic --parallel=8`;
   if (options.dryRun) {
@@ -400,10 +407,6 @@ function parseArgs() {
             'Registry is still set to localhost! Run "pnpm local-registry disable" or pass --force'
           );
         }
-      } else {
-        if (!args.force && !registryIsLocalhost) {
-          throw new Error('--local was passed and registry is not localhost');
-        }
       }
 
       return true;
@@ -476,6 +479,33 @@ function determineDistTag(
   return distTag;
 }
 
+function waitForLocalRegistry(registryUrl: string): Promise<void> {
+  console.log(`Waiting for local registry at ${registryUrl}...`);
+  return new Promise<void>((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      clearInterval(interval);
+      reject(
+        new Error(
+          `Local registry at ${registryUrl} did not become available within 60 seconds`
+        )
+      );
+    }, 60_000);
+    const interval = setInterval(async () => {
+      try {
+        const response = await fetch(registryUrl);
+        if (response.ok) {
+          clearInterval(interval);
+          clearTimeout(timeout);
+          console.log('Local registry is ready.');
+          resolve();
+        }
+      } catch {
+        // Registry not up yet
+      }
+    }, 50);
+  });
+}
+
 //TODO(@Coly010): Remove this after fixing up the release peer dep handling
 function hackFixForDevkitPeerDependencies() {
   const { readFileSync, writeFileSync } = require('fs');