refactor: move bootstrap out of setup target

.github/workflows/ci.yml

@@ -70,4 +70,4 @@ jobs:
       - name: Install dependencies
         run: npm i
       - name: E2E test affected projects
-        run: npx nx affected -t nxv-e2e --exclude="tag:type:example"
+        run: npx nx affected -t nxv-e2e --exclude="tag:type:example" --verbose

e2e/nx-verdaccio-e2e/test/__snapshots__/plugin-create-nodes.e2e.test.ts.snap

@@ -49,8 +49,13 @@ exports[`nx-verdaccio plugin create-nodes-v2 > should add environment targets to
     "parallelism": true,
   },
   "nxv-env-setup": {
-    "cache": true,
     "configurations": {},
+    "dependsOn": [
+      {
+        "params": "forward",
+        "target": "nxv-env-bootstrap",
+      },
+    ],
     "executor": "@push-based/nx-verdaccio:env-setup",
     "inputs": [
       "{projectRoot}/project.json",
@@ -93,9 +98,6 @@ exports[`nx-verdaccio plugin create-nodes-v2 > should add environment targets to
       "projectName": "lib-a-e2e",
       "storage": "tmp/environments/lib-a-e2e/storage",
     },
-    "outputs": [
-      "{options.environmentRoot}/storage",
-    ],
     "parallelism": true,
   },
   "nxv-verdaccio-stop": {

e2e/nx-verdaccio-e2e/test/plugin-create-nodes.e2e.test.ts

@@ -210,13 +210,17 @@ describe('nx-verdaccio plugin create-nodes-v2', () => {
           ],
           executor: 'nx:run-commands',
           options: {
-            environmentRoot: 'tmp/environments/lib-a-e2e',
             command:
               'echo "dependencies installed for tmp/environments/lib-a-e2e"',
           },
         }),
         [TARGET_ENVIRONMENT_SETUP]: expect.objectContaining({
-          cache: true,
+          dependsOn: [
+            {
+              params: 'forward',
+              target: TARGET_ENVIRONMENT_BOOTSTRAP,
+            },
+          ],
           executor: '@push-based/nx-verdaccio:env-setup',
           options: {},
           inputs: [

projects/nx-verdaccio/src/executors/env-setup/executor.ts

@@ -10,12 +10,9 @@ import {
 import type { SetupEnvironmentExecutorOptions } from './schema';
 import { VERDACCIO_REGISTRY_JSON } from '../env-bootstrap/constants';
 import {
-  TARGET_ENVIRONMENT_BOOTSTRAP,
   TARGET_ENVIRONMENT_INSTALL,
 } from '../../plugin/targets/environment.targets';
-import { runSingleExecutor } from '../../internal/run-executor';
 import { rm } from 'node:fs/promises';
-import { options } from 'yargs';
 import { getEnvironmentRoot } from '../../internal/environment-root';
 
 export type ExecutorOutput = {
@@ -34,28 +31,6 @@ export default async function runSetupEnvironmentExecutor(
     context,
     terminalAndExecutorOptions
   );
-  try {
-    await runSingleExecutor(
-      {
-        project: projectName,
-        target: TARGET_ENVIRONMENT_BOOTSTRAP,
-        configuration,
-      },
-      {
-        ...terminalAndExecutorOptions,
-        // we always want to keep the server running as in the next step we install packages
-        // the `keepServerRunning` passed in `options` is only used to stop the server after the installation (or keep it running for debug reasons)
-        keepServerRunning: true,
-      },
-      context
-    );
-  } catch (error) {
-    logger.error(error.message);
-    return {
-      success: false,
-      command: `Failed executing target ${TARGET_ENVIRONMENT_BOOTSTRAP}\n ${error.message}`,
-    };
-  }
 
   try {
     await executeProcess({

projects/nx-verdaccio/src/executors/env-setup/executor.unit-test.ts

@@ -49,7 +49,7 @@ describe('runSetupEnvironmentExecutor', () => {
       .mockResolvedValueOnce(
         new MockAsyncIterableIterator<{ success: boolean; command: string }>({
           success: true,
-          command: 'Bootstraped environemnt successfully.',
+          command: 'Bootstrapped environment successfully.',
         })
       )
       .mockResolvedValueOnce(
@@ -95,18 +95,7 @@ describe('runSetupEnvironmentExecutor', () => {
       cwd: '/test',
     });
 
-    expect(runExecutorSpy).toHaveBeenCalledTimes(2);
-    expect(runExecutorSpy).toHaveBeenCalledWith(
-      {
-        configuration: undefined,
-        project: projectName,
-        target: TARGET_ENVIRONMENT_BOOTSTRAP,
-      },
-      {
-        keepServerRunning: true,
-      },
-      context
-    );
+    expect(runExecutorSpy).toHaveBeenCalledTimes(1);
     expect(runExecutorSpy).toHaveBeenCalledWith(
       {
         configuration: undefined,
@@ -121,36 +110,6 @@ describe('runSetupEnvironmentExecutor', () => {
     );
   });
 
-  it('should catch error cause by runBootstrapEnvironment', async () => {
-    runExecutorSpy.mockRejectedValueOnce(
-      new Error('Error in runBootstrapEnvironment')
-    );
-
-    await expect(
-      runSetupEnvironmentExecutor(
-        {},
-        {
-          cwd: 'test',
-          isVerbose: false,
-          root: 'tmp/environments/test',
-          projectName: 'my-lib-e2e',
-          projectsConfigurations: {
-            version: 2,
-            projects: {
-              'my-lib': {
-                root: 'e2e/my-lib-e2e',
-              },
-            },
-          },
-        }
-      )
-    ).resolves.toStrictEqual({
-      success: false,
-      command:
-        'Failed executing target nxv-env-bootstrap\n Error in runBootstrapEnvironment',
-    });
-  });
-
   it('should keep server running if keepServerRunning is passed', async () => {
     runExecutorSpy
       .mockResolvedValueOnce(
@@ -220,19 +179,7 @@ describe('runSetupEnvironmentExecutor', () => {
       cwd: '/test',
     });
 
-    expect(runExecutorSpy).toHaveBeenCalledTimes(1);
-    expect(runExecutorSpy).toHaveBeenCalledWith(
-      {
-        configuration: undefined,
-        project: 'my-lib-e2e',
-        target: TARGET_ENVIRONMENT_BOOTSTRAP,
-      },
-      expect.objectContaining({
-        environmentRoot: 'tmp/environments/my-lib-e2e',
-        keepServerRunning: true,
-      }),
-      context
-    );
+    expect(runExecutorSpy).toHaveBeenCalledTimes(0);
 
     expect(devkit.logger.info).toHaveBeenCalledTimes(1);
     expect(devkit.logger.info).toHaveBeenCalledWith(

projects/nx-verdaccio/src/plugin/nx-verdaccio.plugin.ts

@@ -94,6 +94,9 @@ export const createNodesV2: CreateNodesV2<NxVerdaccioCreateNodeOptions> = [
   },
 ];
 
+/**
+ * @deprecated Use `createNodesV2` form instead.
+ */
 export const createNodes: CreateNodes = [
   PROJECT_JSON_FILE_GLOB,
   (

projects/nx-verdaccio/src/plugin/targets/environment.targets.ts

@@ -112,7 +112,7 @@ export function getEnvTargets(
     [TARGET_ENVIRONMENT_BOOTSTRAP]: {
       executor: `${PACKAGE_NAME}:${EXECUTOR_ENVIRONMENT_BOOTSTRAP}`,
     },
-    // intermediate task just here to execute dependent pkg-install tasks with the correct environmentProject
+    // intermediate task called in enc-setup to execute dependent pkg-install tasks with the correct environmentProject
     [TARGET_ENVIRONMENT_INSTALL]: {
       dependsOn: [
         {
@@ -121,12 +121,17 @@ export function getEnvTargets(
           params: 'forward',
         },
       ],
-      options: { environmentRoot },
       // This is here to make it appear in the graph in older nx versions (otherwise it is filtered out)
       command: `echo "dependencies installed for ${environmentRoot}"`,
     },
-    // runs env-bootstrap-env, install-env and stop-verdaccio
+    // runs install-env and stop-verdaccio
     [TARGET_ENVIRONMENT_SETUP]: {
+      dependsOn: [
+        {
+          target: TARGET_ENVIRONMENT_BOOTSTRAP,
+          params: 'forward',
+        },
+      ],
       // list of inputs that all subsequent tasks depend on
       inputs: [
         '{projectRoot}/project.json',