fix(core): read js lib defaults when generating js lib

nx-dotnet · Jul 28, 2024 · c8bac90 · c8bac90
1 parent 771de5b
commit c8bac90
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/packages/core/src/generators/add-swagger-target/add-swagger-target.ts b/packages/core/src/generators/add-swagger-target/add-swagger-target.ts
@@ -114,7 +114,10 @@ async function generateShellProject(
     };
 
     const { tasks: codegenTasks, name: codegenProjectName } =
-      await generateCodegenProject(host, options);
+      await generateCodegenProject(
+        host,
+        options as NormalizedOptions & { codegenProject: string },
+      );
 
     tasks.push(...codegenTasks);
 
@@ -155,21 +158,30 @@ async function generateShellProject(
 
 async function generateCodegenProject(
   host: Tree,
-  options: AddSwaggerJsonExecutorSchema,
+  options: AddSwaggerJsonExecutorSchema & {
+    codegenProject: string;
+  },
 ): Promise<{ name: string; tasks: GeneratorCallback[] }> {
   const tasks: GeneratorCallback[] = [];
   const nameWithDirectory = `generated-${options.codegenProject}`;
 
+  const nxJson = readNxJson(host);
+
   const {
     libraryGenerator,
   }: // eslint-disable-next-line @typescript-eslint/no-var-requires
   typeof import('@nx/js') = require('@nx/js');
+  const libraryGeneratorDefaults = {
+    ...nxJson?.generators?.['@nx/js:library'],
+    ...nxJson?.generators?.['@nx/js']?.library,
+  };
   tasks.push(
     await libraryGenerator(host, {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      name: options.codegenProject!,
+      ...libraryGeneratorDefaults,
+      name: options.codegenProject,
       directory: 'generated',
-      buildable: true,
+      unitTestRunner: 'none',
     }),
   );
   await updateProjectConfiguration(

diff --git a/project.json b/project.json
@@ -5,7 +5,7 @@
       "options": {
         "port": 4872,
         "config": ".verdaccio/config.yml",
-        "storage": "build/local-registry/storage"
+        "storage": "dist/local-registry/storage"
       }
     }
   },