fix: fix test imports

push-based · Sep 24, 2024 · b6d651a · b6d651a
1 parent bf430f3
commit b6d651a
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 32 deletions.
diff --git a/nx.json b/nx.json
@@ -85,7 +85,7 @@
     {
       "plugin": "./projects/build-env/src/plugin/build-env.plugin.ts",
       "options": {
-        "publishable": {
+        "packages": {
           "filterByTags": ["publishable"]
         },
         "environments": {

diff --git a/projects/build-env/src/plugin/build-env.plugin.ts b/projects/build-env/src/plugin/build-env.plugin.ts
@@ -1,14 +1,23 @@
-import {type CreateNodes, type ProjectConfiguration, readJsonFile,} from '@nx/devkit';
-import {dirname, join} from 'node:path';
-import {getEnvTargets, isEnvProject, updateEnvTargetNames, verdaccioTargets} from "./targets/environment.targets";
-import {getPkgTargets, isPkgProject} from "./targets/package.targets";
-import {BuildEnvPluginCreateNodeOptions} from "./schema";
-import {normalizeCreateNodesOptions} from "./normalize-create-nodes-options";
+import {
+  type CreateNodes,
+  type ProjectConfiguration,
+  readJsonFile,
+} from '@nx/devkit';
+import { dirname, join } from 'node:path';
+import {
+  getEnvTargets,
+  isEnvProject,
+  updateEnvTargetNames,
+  verdaccioTargets,
+} from './targets/environment.targets';
+import { getPkgTargets, isPkgProject } from './targets/package.targets';
+import type { BuildEnvPluginCreateNodeOptions } from './schema';
+import { normalizeCreateNodesOptions } from './normalize-create-nodes-options';
 
 export const createNodes: CreateNodes = [
   '**/project.json',
   (projectConfigurationFile: string, opt: BuildEnvPluginCreateNodeOptions) => {
-    const {environments, publishable} = normalizeCreateNodesOptions(opt);
+    const { environments, packages } = normalizeCreateNodesOptions(opt);
 
     const projectConfiguration: ProjectConfiguration = readJsonFile(
       join(process.cwd(), projectConfigurationFile)
@@ -24,7 +33,7 @@ export const createNodes: CreateNodes = [
 
     if (
       !isEnvProject(projectConfiguration, environments) &&
-      !isPkgProject(projectConfiguration, publishable)
+      !isPkgProject(projectConfiguration, packages)
     ) {
       return {};
     }
@@ -42,16 +51,15 @@ export const createNodes: CreateNodes = [
               // bootstrap-env, setup-env, install-env (intermediate target to run dependency targets)
               ...getEnvTargets(projectConfiguration, environments),
               // adjust targets to run setup-env
-              ...updateEnvTargetNames(projectConfiguration, environments)
+              ...updateEnvTargetNames(projectConfiguration, environments),
             }),
             // === package targets ===
             // npm-publish, npm-install
-            ...(isPkgProject(projectConfiguration, publishable) &&
+            ...(isPkgProject(projectConfiguration, packages) &&
               getPkgTargets()),
           },
         },
       },
     };
   },
 ];
-
diff --git a/projects/build-env/src/plugin/normalize-create-nodes-options.ts b/projects/build-env/src/plugin/normalize-create-nodes-options.ts
@@ -1,9 +1,12 @@
-import {
+import type {
   BuildEnvEnvironmentsOptions,
   BuildEnvPluginCreateNodeOptions,
-  BuildEnvPublishingOptions
-} from "./schema";
-import {DEFAULT_ENVIRONMENTS_OUTPUT_DIR, DEFAULT_OPTION_ENVIRONMENT_TARGET_NAMES} from "./constants";
+  BuildEnvPackagesOptions,
+} from './schema';
+import {
+  DEFAULT_ENVIRONMENTS_OUTPUT_DIR,
+  DEFAULT_OPTION_ENVIRONMENT_TARGET_NAMES,
+} from './constants';
 
 export type NormalizedCreateNodeOptions = {
   environments: Omit<
@@ -13,15 +16,15 @@ export type NormalizedCreateNodeOptions = {
     Required<
       Pick<BuildEnvEnvironmentsOptions, 'targetNames' | 'environmentsDir'>
     >;
-  publishable: BuildEnvPublishingOptions;
+  packages: BuildEnvPackagesOptions;
 };
 
 export function normalizeCreateNodesOptions(
   options: BuildEnvPluginCreateNodeOptions
 ): NormalizedCreateNodeOptions {
   const {
     environments: givenEnvironments = {},
-    publishable: givenPublishable = {},
+    packages: givenPublishable = {},
   } = options ?? {};
 
   if (
@@ -39,7 +42,7 @@ export function normalizeCreateNodesOptions(
       targetNames: [DEFAULT_OPTION_ENVIRONMENT_TARGET_NAMES],
       ...givenEnvironments,
     },
-    publishable: {
+    packages: {
       ...givenPublishable,
     },
   };

diff --git a/projects/build-env/src/plugin/schema.ts b/projects/build-env/src/plugin/schema.ts
@@ -3,12 +3,12 @@ export type BuildEnvEnvironmentsOptions = {
   targetNames?: string[];
   filterByTags?: string[];
 };
-export type BuildEnvPublishingOptions = {
+export type BuildEnvPackagesOptions = {
   environmentsDir?: string;
   targetNames?: string[];
   filterByTags?: string[];
 };
 export type BuildEnvPluginCreateNodeOptions = {
   environments?: BuildEnvEnvironmentsOptions;
-  publishable?: BuildEnvPublishingOptions;
+  packages?: BuildEnvPackagesOptions;
 };
diff --git a/projects/build-env/src/plugin/targets/environment.targets.ts b/projects/build-env/src/plugin/targets/environment.targets.ts
@@ -1,11 +1,11 @@
-import type {ProjectConfiguration, TargetConfiguration} from "@nx/devkit";
-import {NormalizedCreateNodeOptions} from "../normalize-create-nodes-options";
-import {join} from "node:path";
-import {DEFAULT_NPM_INSTALL_TARGET} from "./package.targets";
-import {BuildEnvEnvironmentsOptions} from "../schema";
-import type {StartVerdaccioOptions} from "../../executors/bootstrap/verdaccio-registry";
-import {uniquePort} from "../../executors/bootstrap/unique-port";
-import {VERDACCIO_REGISTRY_JSON} from "../../executors/bootstrap/constants";
+import type { ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
+import type { NormalizedCreateNodeOptions } from '../normalize-create-nodes-options';
+import { join } from 'node:path';
+import { DEFAULT_NPM_INSTALL_TARGET } from './package.targets';
+import type { BuildEnvEnvironmentsOptions } from '../schema';
+import type { StartVerdaccioOptions } from '../../executors/bootstrap/verdaccio-registry';
+import { uniquePort } from '../../executors/bootstrap/unique-port';
+import { VERDACCIO_REGISTRY_JSON } from '../../executors/bootstrap/constants';
 
 export const DEFAULT_START_VERDACCIO_TARGET = 'build-env-verdaccio-start';
 export const DEFAULT_BOOTSTRAP_TARGET = 'build-env-env-bootstrap';

diff --git a/projects/build-env/src/plugin/targets/package.targets.ts b/projects/build-env/src/plugin/targets/package.targets.ts
@@ -1,12 +1,12 @@
-import type {ProjectConfiguration, TargetConfiguration} from "@nx/devkit";
-import {NormalizedCreateNodeOptions} from "../normalize-create-nodes-options";
+import type { ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
+import type { NormalizedCreateNodeOptions } from '../normalize-create-nodes-options';
 
 export const DEFAULT_NPM_INSTALL_TARGET = 'build-env-release-install';
 export const DEFAULT_NPM_PUBLISH_TARGET = 'build-env-release-publish';
 
 export function isPkgProject(
   projectConfig: ProjectConfiguration,
-  options: NormalizedCreateNodeOptions['publishable']
+  options: NormalizedCreateNodeOptions['packages']
 ): boolean {
   const { projectType, tags: existingTags = [] } = projectConfig;
   const { filterByTags: publishableTagFilters } = options;