feat(nextjs): scope include to src

nrwl · Nov 15, 2024 · e453615 · e453615
1 parent f5b5ede
commit e453615
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/packages/next/src/generators/application/application.spec.ts b/packages/next/src/generators/application/application.spec.ts
@@ -916,18 +916,19 @@ describe('app (legacy)', () => {
             "dist",
             "node_modules",
             "jest.config.ts",
-            "**/*.spec.ts",
-            "**/*.test.ts",
+            "src/**/*.spec.ts",
+            "src/**/*.test.ts",
+            ".next",
             "eslint.config.js",
             "eslint.config.cjs",
             "eslint.config.mjs",
           ],
           "extends": "../tsconfig.base.json",
           "include": [
-            "**/*.ts",
-            "**/*.tsx",
-            "**/*.js",
-            "**/*.jsx",
+            "src/**/*.ts",
+            "src/**/*.tsx",
+            "src/**/*.js",
+            "src/**/*.jsx",
             "../myapp/.next/types/**/*.ts",
             "../dist/myapp/.next/types/**/*.ts",
             "next-env.d.ts",

diff --git a/packages/next/src/generators/application/application.ts b/packages/next/src/generators/application/application.ts
@@ -127,8 +127,8 @@ export async function applicationGeneratorInternal(host: Tree, schema: Schema) {
       moduleResolution: 'bundler',
     },
     options.linter === 'eslint'
-      ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
-      : undefined,
+      ? ['.next', 'eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+      : ['.next'],
     options.src ? 'src' : '.'
   );
 

diff --git a/packages/next/src/generators/application/lib/create-application-files.ts b/packages/next/src/generators/application/lib/create-application-files.ts
@@ -31,14 +31,15 @@ export function createApplicationFiles(host: Tree, options: NormalizedSchema) {
     '.next/types/**/*.ts'
   );
 
-  // scope tsconfig to the project directory so that it doesn't include other projects/libs
-  const rootPath = options.rootProject
-    ? options.src
-      ? 'src/'
-      : options.appDir
-      ? 'app/'
-      : 'pages/'
-    : '';
+  const rootPath =
+    options.rootProject || isUsingTsSolutionSetup(host)
+      ? options.src
+        ? 'src/'
+        : options.appDir
+        ? 'app/'
+        : 'pages/'
+      : '';
+
   const templateVariables = {
     ...names(options.name),
     ...options,