chore(misc): address feedback

nrwl · Dec 12, 2024 · 02f8d62 · 02f8d62
1 parent 3a15f57
commit 02f8d62
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 21 deletions.
diff --git a/packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -108,7 +108,6 @@ exports[`app generated files content - as-provided - my-app general application
 
 exports[`app generated files content - as-provided - my-app general application should configure tsconfig and project.json correctly 2`] = `
 "{
-  "compilerOptions": {},
   "files": [],
   "include": [".nuxt/nuxt.d.ts"],
   "references": [
@@ -190,7 +189,6 @@ exports[`app generated files content - as-provided - my-app general application
 
 exports[`app generated files content - as-provided - my-app general application should configure vitest correctly 3`] = `
 "{
-  "compilerOptions": {},
   "files": [],
   "include": [".nuxt/nuxt.d.ts"],
   "references": [
@@ -469,7 +467,6 @@ exports[`app generated files content - as-provided - myApp general application s
 
 exports[`app generated files content - as-provided - myApp general application should configure tsconfig and project.json correctly 2`] = `
 "{
-  "compilerOptions": {},
   "files": [],
   "include": [".nuxt/nuxt.d.ts"],
   "references": [
@@ -551,7 +548,6 @@ exports[`app generated files content - as-provided - myApp general application s
 
 exports[`app generated files content - as-provided - myApp general application should configure vitest correctly 3`] = `
 "{
-  "compilerOptions": {},
   "files": [],
   "include": [".nuxt/nuxt.d.ts"],
   "references": [

diff --git a/packages/nuxt/src/generators/application/application.spec.ts b/packages/nuxt/src/generators/application/application.spec.ts
@@ -244,7 +244,6 @@ describe('app', () => {
       `);
       expect(readJson(tree, 'myapp/tsconfig.json')).toMatchInlineSnapshot(`
         {
-          "compilerOptions": {},
           "extends": "../tsconfig.base.json",
           "files": [],
           "include": [

diff --git a/packages/nuxt/src/utils/create-ts-config.ts b/packages/nuxt/src/utils/create-ts-config.ts
@@ -12,7 +12,6 @@ export function createTsConfig(
 ) {
   createAppTsConfig(host, options);
   const json = {
-    compilerOptions: {},
     files: [],
     include: ['.nuxt/nuxt.d.ts'],
     references: [

diff --git a/packages/vue/src/generators/library/lib/create-library-files.ts b/packages/vue/src/generators/library/lib/create-library-files.ts
@@ -44,6 +44,7 @@ export function createLibraryFiles(host: Tree, options: NormalizedSchema) {
         '.': {
           import: './index.mjs',
           require: './index.js',
+          types: './index.d.ts',
         },
       },
     });

diff --git a/packages/vue/src/utils/create-ts-config.ts b/packages/vue/src/utils/create-ts-config.ts
@@ -43,8 +43,7 @@ export function createTsConfigForTsSolution(
     style?: string;
     rootProject?: boolean;
     unitTestRunner?: string;
-  },
-  relativePathToRootTsConfig: string
+  }
 ) {
   const json = {
     files: [],
@@ -56,18 +55,6 @@ export function createTsConfigForTsSolution(
     ],
   } as any;
 
-  // inline tsconfig.base.json into the project
-  if (options.rootProject) {
-    json.compileOnSave = false;
-    json.compilerOptions = {
-      ...shared.tsConfigBaseOptions,
-      ...json.compilerOptions,
-    };
-    json.exclude = ['node_modules', 'tmp'];
-  } else {
-    json.extends = relativePathToRootTsConfig;
-  }
-
   writeJson(host, `${projectRoot}/tsconfig.json`, json);
 
   const tsconfigProjectPath = `${projectRoot}/tsconfig.${type}.json`;
@@ -82,7 +69,6 @@ export function createTsConfigForTsSolution(
 
       return json;
     });
-  } else {
   }
 }
 

diff --git a/packages/workspace/src/generators/preset/preset.ts b/packages/workspace/src/generators/preset/preset.ts
@@ -136,6 +136,7 @@ async function createPreset(tree: Tree, options: Schema) {
       addPlugin,
       nxCloudToken: options.nxCloudToken,
       useTsSolution: options.workspaces,
+      formatter: options.formatter,
     });
   } else if (options.preset === Preset.VueStandalone) {
     const { applicationGenerator: vueApplicationGenerator } = require('@nx' +
@@ -165,6 +166,7 @@ async function createPreset(tree: Tree, options: Schema) {
       addPlugin,
       nxCloudToken: options.nxCloudToken,
       useTsSolution: options.workspaces,
+      formatter: options.formatter,
     });
   } else if (options.preset === Preset.NuxtStandalone) {
     const { applicationGenerator: nuxtApplicationGenerator } = require('@nx' +
-Original file line number
+Diff line change
@@ Expand Up @@
             '.': {
               import: './index.mjs',
               require: './index.js',
+              types: './index.d.ts',
             },
           },
         });
@@ Expand Down @@