isolate original setup code

push-based · Sep 15, 2024 · df86ee2 · df86ee2
1 parent 7173504
commit df86ee2
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 208 deletions.
diff --git a/e2e-examples/cli-e2e-original/setup/global-setup.ts b/e2e-examples/cli-e2e-original/setup/global-setup.ts
@@ -1,15 +1,17 @@
 import { rm } from 'node:fs/promises';
 import { executeProcess, objectToCliArgs } from '@org/test-utils';
 import {
-  configureRegistry,
   RegistryResult,
   startVerdaccioServer,
+} from '../tooling/utils/verdaccio-registry';
+import {
+  configureRegistry,
   unconfigureRegistry,
-} from '@org/tools-utils';
+} from '../tooling/utils/verdaccio-npm-env';
 
 const isVerbose = process.env['NX_VERBOSE_LOGGING'] === 'true' ?? false;
 const projectName = process.env['NX_TASK_TARGET_PROJECT'];
-let stopFn: () => void
+let stopFn: () => void;
 
 export async function setup() {
   if (projectName == null) {
@@ -32,9 +34,9 @@ export async function setup() {
       targets: 'original-npm-publish',
       exclude: 'tag:type:testing',
       skipNxCache: true,
-      verbose: isVerbose
+      verbose: isVerbose,
     }),
-    verbose: isVerbose
+    verbose: isVerbose,
   });
 
   // package install all projects
@@ -46,20 +48,18 @@ export async function setup() {
       exclude: 'tag:type:testing',
       skipNxCache: true,
       parallel: 1,
-      verbose: isVerbose
+      verbose: isVerbose,
     }),
-    verbose: isVerbose
+    verbose: isVerbose,
   });
 
   // @TODO figure out why named exports don't work https://vitest.dev/config/#globalsetup
-  stopFn = () => teardownSetup(registryResult)
+  stopFn = () => teardownSetup(registryResult);
   return () => stopFn();
 }
 
-
-
 export async function teardown() {
-  stopFn()
+  stopFn();
 }
 export async function teardownSetup({ registry, stop }: RegistryResult) {
   console.info(`Teardown ${projectName}`);

diff --git a/e2e-examples/cli-e2e-original/tooling/original.plugin.ts b/e2e-examples/cli-e2e-original/tooling/original.plugin.ts
@@ -5,7 +5,7 @@ import {
 } from '@nx/devkit';
 import { dirname, join } from 'node:path';
 import type { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
-import { getBuildOutputPathFromBuildTarget } from '@org/tools-utils';
+import { getBuildOutputPathFromBuildTarget } from './utils/build-target-helper';
 
 export const createNodes: CreateNodes = [
   '**/project.json',

diff --git a/...tils/src/lib/utils/build-target-helper.ts → ...inal/tooling/utils/build-target-helper.ts b/...tils/src/lib/utils/build-target-helper.ts → ...inal/tooling/utils/build-target-helper.ts
diff --git a/tooling/tools-utils/src/lib/utils/logging.ts → ...cli-e2e-original/tooling/utils/logging.ts b/tooling/tools-utils/src/lib/utils/logging.ts → ...cli-e2e-original/tooling/utils/logging.ts
diff --git a/tooling/tools-utils/src/lib/utils/npm.ts → ...les/cli-e2e-original/tooling/utils/npm.ts b/tooling/tools-utils/src/lib/utils/npm.ts → ...les/cli-e2e-original/tooling/utils/npm.ts
diff --git a/tooling/tools-utils/src/lib/utils/utils.ts → ...s/cli-e2e-original/tooling/utils/utils.ts b/tooling/tools-utils/src/lib/utils/utils.ts → ...s/cli-e2e-original/tooling/utils/utils.ts
diff --git a/...ls/src/lib/verdaccio/verdaccio-npm-env.ts → ...iginal/tooling/utils/verdaccio-npm-env.ts b/...ls/src/lib/verdaccio/verdaccio-npm-env.ts → ...iginal/tooling/utils/verdaccio-npm-env.ts
diff --git a/...s/src/lib/verdaccio/verdaccio-registry.ts → ...ginal/tooling/utils/verdaccio-registry.ts b/...s/src/lib/verdaccio/verdaccio-registry.ts → ...ginal/tooling/utils/verdaccio-registry.ts
diff --git a/tooling/tools-utils/.eslintrc.json b/tooling/tools-utils/.eslintrc.json
diff --git a/tooling/tools-utils/README.md b/tooling/tools-utils/README.md
diff --git a/tooling/tools-utils/package.json b/tooling/tools-utils/package.json
diff --git a/tooling/tools-utils/project.json b/tooling/tools-utils/project.json
diff --git a/tooling/tools-utils/src/index.ts b/tooling/tools-utils/src/index.ts
diff --git a/tooling/tools-utils/tsconfig.json b/tooling/tools-utils/tsconfig.json
diff --git a/tooling/tools-utils/tsconfig.lib.json b/tooling/tools-utils/tsconfig.lib.json
diff --git a/tooling/tools-utils/tsconfig.spec.json b/tooling/tools-utils/tsconfig.spec.json
diff --git a/tooling/tools-utils/vite.config.ts b/tooling/tools-utils/vite.config.ts
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -21,7 +21,6 @@
       "@org/models": ["projects/models/src/index.ts"],
       "@org/test-setup": ["testing/test-setup/src/index.ts"],
       "@org/test-utils": ["testing/test-utils/src/index.ts"],
-      "@org/tools-utils": ["tooling/tools-utils/src/index.ts"],
       "@org/utils": ["projects/utils/src/index.ts"]
     }
   },