@nx/next 0.0.0-pr-29993-0fbf3d3 → 0.0.0-pr-29720-06f67e5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "0.0.0-pr-29993-0fbf3d3",
+  "version": "0.0.0-pr-29720-06f67e5",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-29993-0fbf3d3",
+    "@nx/devkit": "0.0.0-pr-29720-06f67e5",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -44,11 +44,11 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "0.0.0-pr-29993-0fbf3d3",
-    "@nx/eslint": "0.0.0-pr-29993-0fbf3d3",
-    "@nx/react": "0.0.0-pr-29993-0fbf3d3",
-    "@nx/web": "0.0.0-pr-29993-0fbf3d3",
-    "@nx/webpack": "0.0.0-pr-29993-0fbf3d3",
+    "@nx/js": "0.0.0-pr-29720-06f67e5",
+    "@nx/eslint": "0.0.0-pr-29720-06f67e5",
+    "@nx/react": "0.0.0-pr-29720-06f67e5",
+    "@nx/web": "0.0.0-pr-29720-06f67e5",
+    "@nx/webpack": "0.0.0-pr-29720-06f67e5",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -28,7 +28,6 @@ const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
-        useProjectJson: true,
         ...schema,
     });
 }
@@ -40,8 +39,8 @@ async function applicationGeneratorInternal(host, schema) {
         js: options.js,
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
-        addTsPlugin: options.isTsSolutionSetup,
-        formatter: options.formatter,
+        addTsPlugin: schema.useTsSolution,
+        formatter: schema.formatter,
         platform: 'web',
     });
     tasks.push(jsInitTask);
@@ -52,11 +51,6 @@ async function applicationGeneratorInternal(host, schema) {
     tasks.push(nextTask);
     (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
-    // If we are using the new TS solution
-    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
-    if (options.isTsSolutionSetup) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
-    }
     const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
     tasks.push(e2eTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options);
@@ -106,6 +100,11 @@ async function applicationGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['.next', 'eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : ['.next'], options.src ? 'src' : '.');
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.useTsSolution) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

package/src/generators/application/lib/add-e2e.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const eslint_1 = require("@nx/eslint");
-const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
+const web_1 = require("@nx/web");
+const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function addE2e(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -24,15 +25,17 @@ async function addE2e(host, options) {
                 spa: true,
             });
         }
-        const packageJson = {
-            name: options.e2eProjectName,
-            version: '0.0.1',
-            private: true,
-        };
-        if (!options.useProjectJson) {
-            packageJson.nx = {
-                implicitDependencies: [options.projectName],
-            };
+        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -44,9 +47,6 @@ async function addE2e(host, options) {
                 implicitDependencies: [options.projectName],
             });
         }
-        if (!options.useProjectJson || options.isTsSolutionSetup) {
-            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-        }
         const e2eTask = await configurationGenerator(host, {
             ...options,
             linter: eslint_1.Linter.EsLint,
@@ -81,15 +81,17 @@ async function addE2e(host, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-        const packageJson = {
-            name: options.e2eProjectName,
-            version: '0.0.1',
-            private: true,
-        };
-        if (!options.useProjectJson) {
-            packageJson.nx = {
-                implicitDependencies: [options.projectName],
-            };
+        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -101,9 +103,6 @@ async function addE2e(host, options) {
                 implicitDependencies: [options.projectName],
             });
         }
-        if (!options.useProjectJson || options.isTsSolutionSetup) {
-            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-        }
         const e2eTask = await configurationGenerator(host, {
             rootProject: options.rootProject,
             project: options.e2eProjectName,

package/src/generators/application/lib/add-project.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const versions_1 = require("../../../utils/versions");
 const react_1 = require("@nx/react");
 function addProject(host, options) {
@@ -55,31 +57,27 @@ function addProject(host, options) {
         targets,
         tags: options.parsedTags,
     };
-    const packageJson = {
-        name: options.importPath,
-        version: '0.0.1',
-        private: true,
-        dependencies: {
-            next: versions_1.nextVersion,
-            react: react_1.reactVersion,
-            'react-dom': react_1.reactDomVersion,
-        },
-    };
-    if (!options.useProjectJson) {
-        if (options.projectName !== options.importPath) {
-            packageJson.nx = { name: options.projectName };
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(host, options.name),
+            version: '0.0.1',
+            private: true,
+            dependencies: {
+                next: versions_1.nextVersion,
+                react: react_1.reactVersion,
+                'react-dom': react_1.reactDomVersion,
+            },
+            nx: {
+                name: options.name,
+                projectType: 'application',
+                sourceRoot: options.appProjectRoot,
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
             ...project,
         });
     }
-    if (!options.useProjectJson || options.isTsSolutionSetup) {
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
-    }
 }

package/src/generators/application/lib/create-application-files.js

@@ -18,7 +18,7 @@ function createApplicationFiles(host, options) {
                 : 'pages/'
         : '';
     const templateVariables = {
-        ...(0, devkit_1.names)(options.projectSimpleName),
+        ...(0, devkit_1.names)(options.name),
         ...options,
         dot: '.',
         tmpl: '',

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,17 +1,14 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
-export interface NormalizedSchema extends Omit<Schema, 'name' | 'useTsSolution'> {
+export interface NormalizedSchema extends Schema {
     projectName: string;
-    projectSimpleName: string;
     appProjectRoot: string;
-    importPath: string;
     outputPath: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
     parsedTags: string[];
     fileName: string;
     styledModule: null | string;
-    isTsSolutionSetup: boolean;
     js?: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

package/src/generators/application/lib/normalize-options.js

@@ -5,10 +5,9 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
 const assertion_1 = require("@nx/react/src/utils/assertion");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -19,11 +18,10 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
-    const isTsSolutionSetup = options.useTsSolution || (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
-    const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [projectNames.projectFileName] : []));
+    const name = (0, devkit_1.names)(options.name).fileName;
+    const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [name] : []));
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -44,15 +42,12 @@ async function normalizeOptions(host, options) {
         e2eTestRunner: options.e2eTestRunner || 'playwright',
         fileName,
         linter: options.linter || eslint_1.Linter.EsLint,
+        name,
         outputPath,
         parsedTags,
         projectName: appProjectName,
-        projectSimpleName: projectNames.projectSimpleName,
         style: options.style || 'css',
         styledModule,
         unitTestRunner: options.unitTestRunner || 'jest',
-        importPath,
-        isTsSolutionSetup,
-        useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
     };
 }

package/src/generators/application/schema.d.ts

@@ -22,5 +22,4 @@ export interface Schema {
   addPlugin?: boolean;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
-  useProjectJson?: boolean;
 }

package/src/generators/application/schema.json

@@ -144,10 +144,6 @@
       "default": false,
       "hidden": true,
       "x-priority": "internal"
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],

package/src/generators/library/lib/normalize-options.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
@@ -16,12 +16,10 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         importPath,
         projectRoot,
-        isUsingTsSolutionConfig,
-        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
 }

package/src/generators/library/library.js

@@ -14,7 +14,6 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
-        useProjectJson: true,
         ...rawOptions,
     });
 }
@@ -97,7 +96,7 @@ async function libraryGeneratorInternal(host, rawOptions) {
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {

package/src/generators/library/schema.d.ts

@@ -24,5 +24,4 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   addPlugin?: boolean;
-  useProjectJson?: boolean;
 }

package/src/generators/library/schema.json

@@ -158,10 +158,6 @@
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],

package/tailwind.d.ts

@@ -1,7 +1,6 @@
 /**
  * Generates a set of glob patterns based off the source root of the app and its dependencies
  * @param dirPath workspace relative directory path that will be used to infer the parent project and dependencies
- * @param fileGlobPatternToInclude pass a custom glob pattern to be used
- * @param fileGlobPatternToExclude pass a custom glob pattern for files to be excluded
+ * @param fileGlobPattern pass a custom glob pattern to be used
  */
-export declare function createGlobPatternsForDependencies(dirPath: string, fileGlobPatternToInclude?: string, fileGlobPatternToExclude?: string): any;
+export declare function createGlobPatternsForDependencies(dirPath: string, fileGlobPatternToInclude?: string, fileGlobPatternToExclude?: string): string[];

package/tailwind.js

@@ -6,36 +6,27 @@ const path_1 = require("path");
 /**
  * Generates a set of glob patterns based off the source root of the app and its dependencies
  * @param dirPath workspace relative directory path that will be used to infer the parent project and dependencies
- * @param fileGlobPatternToInclude pass a custom glob pattern to be used
- * @param fileGlobPatternToExclude pass a custom glob pattern for files to be excluded
+ * @param fileGlobPattern pass a custom glob pattern to be used
  */
 function createGlobPatternsForDependencies(dirPath, fileGlobPatternToInclude = '/**/*.{tsx,ts,jsx,js,html}', fileGlobPatternToExclude = '/**/*.{stories,spec}.{tsx,ts,jsx,js,html}') {
-    /**
-     * There is an issue with TailwindCSS v4 and how globs patterns are consumed.
-     * This is a temporary workaround to support both TailwindCSS v4 and v3.
-     * Once TailwindCSS v3 is no longer supported, this workaround can be removed.
-     */
-    const tailwindVersion = require(require.resolve('tailwindcss/package.json', {
-        paths: [dirPath],
-    })).version;
-    if (tailwindVersion && typeof tailwindVersion === 'string') {
-        const majorVersion = parseInt(tailwindVersion.split('.')[0], 10);
-        if (majorVersion >= 4) {
-            try {
-                return [
-                    ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude).map((glob) => (0, path_1.relative)(dirPath, glob)),
-                    ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToExclude).map((glob) => `!${(0, path_1.relative)(dirPath, glob)}`),
-                ];
-            }
-            catch (e) {
-                console.warn('\nWARNING: There was an error creating glob patterns, returning an empty array\n' +
-                    `${e.message}\n`);
-            }
-        }
-        else {
-            const { createGlobPatternsForDependencies: reactGlobPatternFunction, } = require('@nx/react/tailwind');
-            return reactGlobPatternFunction(dirPath, fileGlobPatternToInclude);
-        }
+    try {
+        return [
+            ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude).map((glob) => (0, path_1.relative)(dirPath, glob)),
+            ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToExclude).map((glob) => `!${(0, path_1.relative)(dirPath, glob)}`),
+        ];
+    }
+    catch (e) {
+        /**
+         * It should not be possible to reach this point when the utility is invoked as part of the normal
+         * lifecycle of Nx executors. However, other tooling, such as the VSCode Tailwind IntelliSense plugin
+         * or JetBrains editors such as WebStorm, may execute the tailwind.config.js file in order to provide
+         * autocomplete features, for example.
+         *
+         * In order to best support that use-case, we therefore do not hard error when the ProjectGraph is
+         * fundamently unavailable in this tailwind-specific context.
+         */
+        console.warn('\nWARNING: There was an error creating glob patterns, returning an empty array\n' +
+            `${e.message}\n`);
+        return [];
     }
-    return [];
 }