@nx/next 16.7.2 → 16.8.0-beta.1

package/generators.json

@@ -40,7 +40,7 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#applicationGenerator",
+      "factory": "./src/generators/application/application#applicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
@@ -57,7 +57,7 @@
       "description": "Create a component."
     },
     "library": {
-      "factory": "./src/generators/library/library#libraryGenerator",
+      "factory": "./src/generators/library/library#libraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.7.2",
+  "version": "16.8.0-beta.1",
   "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, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,13 +35,13 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.22.7",
-    "@nrwl/next": "16.7.2",
-    "@nx/devkit": "16.7.2",
-    "@nx/js": "16.7.2",
-    "@nx/linter": "16.7.2",
-    "@nx/react": "16.7.2",
-    "@nx/web": "16.7.2",
-    "@nx/workspace": "16.7.2",
+    "@nrwl/next": "16.8.0-beta.1",
+    "@nx/devkit": "16.8.0-beta.1",
+    "@nx/js": "16.8.0-beta.1",
+    "@nx/linter": "16.8.0-beta.1",
+    "@nx/react": "16.8.0-beta.1",
+    "@nx/web": "16.8.0-beta.1",
+    "@nx/workspace": "16.8.0-beta.1",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -57,5 +57,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "b024f44a1ad4e1773e80f6dc72f9d22766b950f9"
+  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
 }

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

@@ -1,4 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function applicationGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function applicationGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare const applicationSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/application/application.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applicationSchematic = exports.applicationGenerator = void 0;
+exports.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -17,9 +17,15 @@ const custom_server_1 = require("../custom-server/custom-server");
 const update_cypress_tsconfig_1 = require("./lib/update-cypress-tsconfig");
 const show_possible_warnings_1 = require("./lib/show-possible-warnings");
 function applicationGenerator(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield applicationGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.applicationGenerator = applicationGenerator;
+function applicationGeneratorInternal(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
-        const options = (0, normalize_options_1.normalizeOptions)(host, schema);
+        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
         (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
         const nextTask = yield (0, init_1.nextInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
         tasks.push(nextTask);
@@ -41,7 +47,7 @@ function applicationGenerator(host, schema) {
         (0, set_defaults_1.setDefaults)(host, options);
         if (options.customServer) {
             yield (0, custom_server_1.customServerGenerator)(host, {
-                project: options.name,
+                project: options.projectName,
                 compiler: options.swc ? 'swc' : 'tsc',
             });
         }
@@ -51,5 +57,5 @@ function applicationGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.applicationGenerator = applicationGenerator;
+exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.applicationSchematic = (0, devkit_1.convertNxGenerator)(applicationGenerator);

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

@@ -9,7 +9,9 @@ function addE2e(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.e2eTestRunner === 'cypress') {
             const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: options.e2eProjectName, directory: options.directory, project: options.projectName, skipFormat: true }));
+            return cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, name: options.e2eProjectName, directory: options.e2eProjectRoot, 
+                // the name and root are already normalized, instruct the generator to use them as is
+                projectNameAndRootFormat: 'as-provided', project: options.projectName, skipFormat: true }));
         }
         else if (options.e2eTestRunner === 'playwright') {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
@@ -28,7 +30,7 @@ function addE2e(host, options) {
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
                 webServerAddress: 'http://127.0.0.1:4200',
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.projectName}`,
             });
         }
         return () => { };

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

@@ -12,7 +12,7 @@ function createApplicationFiles(host, options) {
     const layoutTypeDistPath = (0, devkit_1.joinPathFragments)(offsetFromRoot, options.outputPath, '.next/types/**/*.ts');
     const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { dot: '.', tmpl: '', offsetFromRoot,
         layoutTypeSrcPath,
-        layoutTypeDistPath, rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot), appContent: (0, create_application_files_helpers_1.createAppJsx)(options.name), styleContent: (0, create_application_files_helpers_1.createStyleRules)(), pageStyleContent: `.page {}`, stylesExt: options.style === 'less' || options.style === 'styl'
+        layoutTypeDistPath, rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot), appContent: (0, create_application_files_helpers_1.createAppJsx)(options.projectName), styleContent: (0, create_application_files_helpers_1.createStyleRules)(), pageStyleContent: `.page {}`, stylesExt: options.style === 'less' || options.style === 'styl'
             ? options.style
             : 'css' });
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/common'), options.appProjectRoot, templateVariables);
@@ -50,7 +50,7 @@ function createApplicationFiles(host, options) {
                         ...(updatedJson.exclude || []),
                         ...(appJSON.exclude || []),
                         '**e2e/**/*',
-                        `dist/${options.name}/**/*`,
+                        `dist/${options.projectName}/**/*`,
                     ]),
                 ] });
             return updatedJson;

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

@@ -11,4 +11,4 @@ export interface NormalizedSchema extends Schema {
     styledModule: null | string;
     js?: boolean;
 }
-export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -1,40 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const assertion_1 = require("@nx/react/src/utils/assertion");
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const linter_1 = require("@nx/linter");
+const assertion_1 = require("@nx/react/src/utils/assertion");
 function normalizeOptions(host, options) {
     var _a;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const appDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
-        : (0, devkit_1.names)(options.name).fileName;
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(host).appsDir;
-    const appProjectName = appDirectory.replace(new RegExp('/', 'g'), '-');
-    const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
-    const appProjectRoot = options.rootProject
-        ? '.'
-        : (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
-    const e2eProjectRoot = options.rootProject
-        ? 'e2e'
-        : (0, devkit_1.joinPathFragments)(appsDir, `${appDirectory}-e2e`);
-    const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [name] : []));
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const fileName = 'index';
-    const appDir = (_a = options.appDir) !== null && _a !== void 0 ? _a : true;
-    const styledModule = /^(css|scss|less|styl)$/.test(options.style)
-        ? null
-        : options.style;
-    (0, assertion_1.assertValidStyle)(options.style);
-    return Object.assign(Object.assign({}, options), { appDir,
-        appProjectRoot,
-        e2eProjectName,
-        e2eProjectRoot, e2eTestRunner: options.e2eTestRunner || 'cypress', fileName, linter: options.linter || linter_1.Linter.EsLint, name,
-        outputPath,
-        parsedTags, projectName: appProjectName, style: options.style || 'css', styledModule, unitTestRunner: options.unitTestRunner || 'jest' });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            rootProject: options.rootProject,
+            callingGenerator: '@nx/next:application',
+        });
+        options.rootProject = appProjectRoot === '.';
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        let e2eProjectName = 'e2e';
+        let e2eProjectRoot = 'e2e';
+        if (!options.rootProject) {
+            const projectNameAndRoot = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+                name: `${options.name}-e2e`,
+                projectType: 'application',
+                directory: options.directory,
+                projectNameAndRootFormat: options.projectNameAndRootFormat,
+                rootProject: options.rootProject,
+                callingGenerator: '@nx/next:application',
+            });
+            e2eProjectName = projectNameAndRoot.projectName;
+            e2eProjectRoot = projectNameAndRoot.projectRoot;
+        }
+        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())
+            : [];
+        const fileName = 'index';
+        const appDir = (_a = options.appDir) !== null && _a !== void 0 ? _a : true;
+        const styledModule = /^(css|scss|less|styl)$/.test(options.style)
+            ? null
+            : options.style;
+        (0, assertion_1.assertValidStyle)(options.style);
+        return Object.assign(Object.assign({}, options), { appDir,
+            appProjectRoot,
+            e2eProjectName,
+            e2eProjectRoot, e2eTestRunner: options.e2eTestRunner || 'cypress', fileName, linter: options.linter || linter_1.Linter.EsLint, name,
+            outputPath,
+            parsedTags, projectName: appProjectName, style: options.style || 'css', styledModule, unitTestRunner: options.unitTestRunner || 'jest' });
+    });
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -1,11 +1,13 @@
-import { Linter } from '@nx/linter';
-import { SupportedStyles } from '@nx/react';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
+import type { SupportedStyles } from '@nx/react';
 
 export interface Schema {
   name: string;
   style?: SupportedStyles;
   skipFormat?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';

package/src/generators/application/schema.json

@@ -14,7 +14,7 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z].*$",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
     "directory": {
@@ -23,6 +23,11 @@
       "alias": "d",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",

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

@@ -4,4 +4,4 @@ export interface NormalizedSchema extends Schema {
     importPath: string;
     projectRoot: string;
 }
-export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const devkit_1 = require("@nx/devkit");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+const tslib_1 = require("tslib");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function normalizeOptions(host, options) {
-    var _a;
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const projectDirectory = options.directory
-        ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
-        : name;
-    const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
-    return Object.assign(Object.assign({}, options), { importPath: (_a = options.importPath) !== null && _a !== void 0 ? _a : (0, get_import_path_1.getImportPath)(host, projectDirectory), projectRoot });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectRoot, importPath, projectNameAndRootFormat } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'library',
+            directory: options.directory,
+            importPath: options.importPath,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/next:library',
+        });
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        return Object.assign(Object.assign({}, options), { importPath,
+            projectRoot });
+    });
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function libraryGenerator(host: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
+export declare function libraryGeneratorInternal(host: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;
 export declare const librarySchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/library.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.librarySchematic = exports.libraryGenerator = void 0;
+exports.librarySchematic = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const library_1 = require("@nx/react/src/generators/library/library");
@@ -9,7 +9,13 @@ const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 function libraryGenerator(host, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, normalize_options_1.normalizeOptions)(host, rawOptions);
+        return yield libraryGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, rawOptions));
+    });
+}
+exports.libraryGenerator = libraryGenerator;
+function libraryGeneratorInternal(host, rawOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield (0, normalize_options_1.normalizeOptions)(host, rawOptions);
         const tasks = [];
         const initTask = yield (0, init_1.nextInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
         tasks.push(initTask);
@@ -58,6 +64,6 @@ function libraryGenerator(host, rawOptions) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.libraryGenerator = libraryGenerator;
+exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;
 exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);

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

@@ -1,9 +1,11 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-directory-utils';
+import type { Linter } from '@nx/linter';
 import type { SupportedStyles } from '@nx/react';
 
 export interface Schema {
   name: string;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   style: SupportedStyles;
   skipTsConfig?: boolean;
   skipFormat?: boolean;

package/src/generators/library/schema.json

@@ -14,7 +14,7 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the library?",
-      "pattern": "^[a-zA-Z].*$",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
       "x-priority": "important"
     },
     "directory": {
@@ -23,6 +23,11 @@
       "alias": "dir",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",