fix(nuxt): tsconfig types and output dir

nrwl · Feb 22, 2024 · 59a97ad · 59a97ad
1 parent 5d6abe4
commit 59a97ad
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 56 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
@@ -34,7 +34,6 @@ import { defineNuxtConfig } from 'nuxt/config';
 export default defineNuxtConfig({
   workspaceDir: '../',
   srcDir: 'src',
-  buildDir: '../dist/my-app/.nuxt',
   devtools: { enabled: true },
   devServer: {
     host: 'localhost',
@@ -53,11 +52,6 @@ export default defineNuxtConfig({
   vite: {
     plugins: [nxViteTsPaths()],
   },
-  nitro: {
-    output: {
-      dir: '../dist/my-app/.output',
-    },
-  },
 });
 "
 `;
@@ -77,7 +71,7 @@ exports[`app generated files content - as-provided general application should co
 "{
   "compilerOptions": {},
   "files": [],
-  "include": [],
+  "include": [".nuxt/nuxt.d.ts"],
   "references": [
     {
       "path": "./tsconfig.app.json"
@@ -161,7 +155,7 @@ exports[`app generated files content - as-provided general application should co
 "{
   "compilerOptions": {},
   "files": [],
-  "include": [],
+  "include": [".nuxt/nuxt.d.ts"],
   "references": [
     {
       "path": "./tsconfig.app.json"
@@ -221,7 +215,6 @@ import { defineNuxtConfig } from 'nuxt/config';
 export default defineNuxtConfig({
   workspaceDir: '../',
   srcDir: 'src',
-  buildDir: '../dist/myapp1/.nuxt',
   devtools: { enabled: true },
   devServer: {
     host: 'localhost',
@@ -242,11 +235,6 @@ export default defineNuxtConfig({
   vite: {
     plugins: [nxViteTsPaths()],
   },
-  nitro: {
-    output: {
-      dir: '../dist/myapp1/.output',
-    },
-  },
 });
 "
 `;
@@ -259,7 +247,6 @@ import { defineNuxtConfig } from 'nuxt/config';
 export default defineNuxtConfig({
   workspaceDir: '../',
   srcDir: 'src',
-  buildDir: '../dist/myapp3/.nuxt',
   devtools: { enabled: true },
   devServer: {
     host: 'localhost',
@@ -280,11 +267,6 @@ export default defineNuxtConfig({
   vite: {
     plugins: [nxViteTsPaths()],
   },
-  nitro: {
-    output: {
-      dir: '../dist/myapp3/.output',
-    },
-  },
 });
 "
 `;
@@ -297,7 +279,6 @@ import { defineNuxtConfig } from 'nuxt/config';
 export default defineNuxtConfig({
   workspaceDir: '../',
   srcDir: 'src',
-  buildDir: '../dist/myapp2/.nuxt',
   devtools: { enabled: true },
   devServer: {
     host: 'localhost',
@@ -318,11 +299,6 @@ export default defineNuxtConfig({
   vite: {
     plugins: [nxViteTsPaths()],
   },
-  nitro: {
-    output: {
-      dir: '../dist/myapp2/.output',
-    },
-  },
 });
 "
 `;
@@ -335,7 +311,6 @@ import { defineNuxtConfig } from 'nuxt/config';
 export default defineNuxtConfig({
   workspaceDir: '../',
   srcDir: 'src',
-  buildDir: '../dist/myapp4/.nuxt',
   devtools: { enabled: true },
   devServer: {
     host: 'localhost',
@@ -354,11 +329,6 @@ export default defineNuxtConfig({
   vite: {
     plugins: [nxViteTsPaths()],
   },
-  nitro: {
-    output: {
-      dir: '../dist/myapp4/.output',
-    },
-  },
 });
 "
 `;
diff --git a/packages/nuxt/src/generators/application/application.ts b/packages/nuxt/src/generators/application/application.ts
@@ -66,10 +66,6 @@ export async function applicationGenerator(tree: Tree, schema: Schema) {
       tmpl: '',
       style: options.style,
       projectRoot: options.appProjectRoot,
-      buildDirectory: joinPathFragments(`dist/${options.appProjectRoot}/.nuxt`),
-      nitroOutputDir: joinPathFragments(
-        `dist/${options.appProjectRoot}/.output`
-      ),
       hasVitest: options.unitTestRunner === 'vitest',
     }
   );

diff --git a/packages/nuxt/src/generators/application/files/nuxt.config.ts__tmpl__ b/packages/nuxt/src/generators/application/files/nuxt.config.ts__tmpl__
@@ -5,7 +5,6 @@ import { defineNuxtConfig } from 'nuxt/config';
 export default defineNuxtConfig({
   workspaceDir: '<%= offsetFromRoot %>',
   srcDir: 'src',
-  buildDir: '<%= offsetFromRoot %><%= buildDirectory %>',
   devtools: { enabled: true },
   devServer: {
     host: 'localhost',
@@ -28,9 +27,4 @@ export default defineNuxtConfig({
       nxViteTsPaths()
     ],
   },
-  nitro: {
-    output: {
-      dir: '<%= offsetFromRoot %><%= nitroOutputDir %>',
-    },
-  },
 });
diff --git a/packages/nuxt/src/plugins/plugin.ts b/packages/nuxt/src/plugins/plugin.ts
@@ -93,11 +93,7 @@ async function buildNuxtTargets(
     buildDir: string;
   } = await getInfoFromNuxtConfig(configFilePath, context, projectRoot);
 
-  const { buildOutputs } = getOutputs(
-    nuxtConfig,
-
-    projectRoot
-  );
+  const { buildOutputs } = getOutputs(nuxtConfig, projectRoot);
 
   const namedInputs = getNamedInputs(projectRoot, context);
 
@@ -179,16 +175,14 @@ function getOutputs(
 } {
   let nuxtBuildDir = nuxtConfig?.buildDir;
   if (nuxtConfig?.buildDir && basename(nuxtConfig?.buildDir) === '.nuxt') {
-    // buildDir will most probably be `../dist/my-app/.nuxt`
-    // we want the "general" outputPath to be `../dist/my-app`
+    // if buildDir exists, it will be `something/something/.nuxt`
+    // we want the "general" outputPath to be `something/something`
     nuxtBuildDir = nuxtConfig.buildDir.replace(
       basename(nuxtConfig.buildDir),
       ''
     );
   }
-  const buildOutputPath =
-    normalizeOutputPath(nuxtBuildDir, projectRoot) ??
-    '{workspaceRoot}/dist/{projectRoot}';
+  const buildOutputPath = normalizeOutputPath(nuxtBuildDir, projectRoot);
 
   return {
     buildOutputs: [buildOutputPath],
@@ -198,12 +192,12 @@ function getOutputs(
 function normalizeOutputPath(
   outputPath: string | undefined,
   projectRoot: string
-): string | undefined {
+): string {
   if (!outputPath) {
     if (projectRoot === '.') {
-      return `{projectRoot}/dist`;
+      return `{projectRoot}`;
     } else {
-      return `{workspaceRoot}/dist/{projectRoot}`;
+      return `{workspaceRoot}/{projectRoot}`;
     }
   } else {
     if (isAbsolute(outputPath)) {

diff --git a/packages/nuxt/src/utils/create-ts-config.ts b/packages/nuxt/src/utils/create-ts-config.ts
@@ -14,7 +14,7 @@ export function createTsConfig(
   const json = {
     compilerOptions: {},
     files: [],
-    include: [],
+    include: ['.nuxt/nuxt.d.ts'],
     references: [
       {
         path: './tsconfig.app.json',