@nx/next 17.3.0-beta.2 → 17.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "17.3.0-beta.2",
+  "version": "17.3.0-beta.4",
   "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": {
@@ -34,7 +34,7 @@
     "next": ">=13.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-beta.2",
+    "@nx/devkit": "17.3.0-beta.4",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -45,12 +45,12 @@
     "url-loader": "^4.1.1",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "17.3.0-beta.2",
-    "@nx/eslint": "17.3.0-beta.2",
-    "@nx/react": "17.3.0-beta.2",
-    "@nx/web": "17.3.0-beta.2",
-    "@nx/workspace": "17.3.0-beta.2",
-    "@nrwl/next": "17.3.0-beta.2"
+    "@nx/js": "17.3.0-beta.4",
+    "@nx/eslint": "17.3.0-beta.4",
+    "@nx/react": "17.3.0-beta.4",
+    "@nx/web": "17.3.0-beta.4",
+    "@nx/workspace": "17.3.0-beta.4",
+    "@nrwl/next": "17.3.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const versions_1 = require("@nx/react/src/utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_e2e_1 = require("./lib/add-e2e");
 const add_jest_1 = require("./lib/add-jest");
@@ -15,6 +17,7 @@ const add_linting_1 = require("./lib/add-linting");
 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");
+const versions_2 = require("../../utils/versions");
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -26,6 +29,12 @@ async function applicationGeneratorInternal(host, schema) {
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        js: options.js,
+        skipPackageJson: options.skipPackageJson,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const nextTask = await (0, init_1.nextInitGenerator)(host, {
         ...options,
         skipFormat: true,
@@ -53,6 +62,16 @@ async function applicationGeneratorInternal(host, schema) {
             compiler: options.swc ? 'swc' : 'tsc',
         });
     }
+    if (!options.skipPackageJson) {
+        const devDependencies = {
+            '@types/react': versions_1.typesReactVersion,
+            '@types/react-dom': versions_1.typesReactDomVersion,
+        };
+        if (schema.unitTestRunner && schema.unitTestRunner !== 'none') {
+            devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
+        }
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, devDependencies));
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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

@@ -5,8 +5,10 @@ const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("@nx/react/src/utils/lint");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const versions_1 = require("../../../utils/versions");
 async function addLinting(host, options) {
-    const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
+    const tasks = [];
+    tasks.push(await (0, eslint_1.lintProjectGenerator)(host, {
         linter: options.linter,
         project: options.projectName,
         tsConfigPaths: [
@@ -16,7 +18,7 @@ async function addLinting(host, options) {
         skipFormat: true,
         rootProject: options.rootProject,
         setParserOptionsProject: options.setParserOptionsProject,
-    });
+    }));
     if (options.linter === eslint_1.Linter.EsLint && (0, eslint_file_1.isEslintConfigSupported)(host)) {
         (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, [
             'plugin:@nx/react-typescript',
@@ -48,7 +50,12 @@ async function addLinting(host, options) {
         }
         (0, eslint_file_1.addIgnoresToLintConfig)(host, options.appProjectRoot, ['.next/**/*']);
     }
-    const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-    return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
+    if (!options.skipPackageJson) {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, {
+            ...lint_1.extraEslintDependencies.devDependencies,
+            'eslint-config-next': versions_1.eslintConfigNextVersion,
+        }));
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.addLinting = addLinting;

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

@@ -64,7 +64,6 @@ function createApplicationFiles(host, options) {
                     ...new Set([
                         ...(updatedJson.exclude || []),
                         ...(appJSON.exclude || []),
-                        '**e2e/**/*',
                         `dist/${options.projectName}/**/*`,
                     ]),
                 ],

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -15,11 +15,9 @@ async function cypressComponentConfiguration(tree, options) {
         jsx: true,
     }));
     const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
-    tasks.push(await webpackInitGenerator(tree, {
-        compiler: 'swc',
-        uiFramework: 'react',
-        skipFormat: true,
-    }));
+    tasks.push(await webpackInitGenerator(tree, { skipFormat: true }));
+    const { ensureDependencies } = await Promise.resolve().then(() => require('@nx/webpack/src/utils/ensure-dependencies'));
+    tasks.push(ensureDependencies(tree, { compiler: 'swc', uiFramework: 'react' }));
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     projectConfig.targets['component-test'].options = {
         ...projectConfig.targets['component-test'].options,

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import { InitSchema } from './schema';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import type { InitSchema } from './schema';
 export declare function nextInitGenerator(host: Tree, schema: InitSchema): Promise<GeneratorCallback>;
 export default nextInitGenerator;

package/src/generators/init/init.js

@@ -3,62 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nextInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/react/src/utils/versions");
-const init_1 = require("@nx/react/src/generators/init/init");
-const js_1 = require("@nx/js");
-const versions_2 = require("../../utils/versions");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
+const versions_2 = require("../../utils/versions");
 const add_plugin_1 = require("./lib/add-plugin");
-function updateDependencies(host) {
-    return (0, devkit_1.addDependenciesToPackageJson)(host, {
+function updateDependencies(host, schema) {
+    const tasks = [];
+    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/next'], []));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
         next: versions_2.nextVersion,
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
-        tslib: versions_2.tsLibVersion,
     }, {
         '@nx/next': versions_2.nxVersion,
-        'eslint-config-next': versions_2.eslintConfigNextVersion,
-    });
+    }));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function nextInitGenerator(host, schema) {
-    const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(host, {
-        ...schema,
-        skipFormat: true,
-    }));
-    if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-        const { jestInitGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_2.nxVersion);
-        const jestTask = await jestInitGenerator(host, schema);
-        tasks.push(jestTask);
-    }
-    if (schema.e2eTestRunner === 'cypress') {
-        const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
-        const cypressTask = await cypressInitGenerator(host, {});
-        tasks.push(cypressTask);
-    }
-    else if (schema.e2eTestRunner === 'playwright') {
-        const { initGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
-        const playwrightTask = await initGenerator(host, {
-            skipFormat: true,
-            skipPackageJson: schema.skipPackageJson,
-        });
-        tasks.push(playwrightTask);
-    }
-    // @ts-ignore
-    // TODO(jack): remove once the React Playwright PR lands first
-    const reactTask = await (0, init_1.default)(host, {
-        ...schema,
-        skipFormat: true,
-    });
-    tasks.push(reactTask);
-    if (!schema.skipPackageJson) {
-        const installTask = updateDependencies(host);
-        tasks.push(installTask);
-    }
-    (0, add_gitignore_entry_1.addGitIgnoreEntry)(host);
     if (process.env.NX_PCV3 === 'true') {
         (0, add_plugin_1.addPlugin)(host);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    (0, add_gitignore_entry_1.addGitIgnoreEntry)(host);
+    let installTask = () => { };
+    if (!schema.skipPackageJson) {
+        installTask = updateDependencies(host, schema);
+    }
+    return installTask;
 }
 exports.nextInitGenerator = nextInitGenerator;
 exports.default = nextInitGenerator;

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

@@ -1,8 +1,4 @@
 export interface InitSchema {
-  unitTestRunner?: 'jest' | 'none';
-  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
-  js?: boolean;
   skipPackageJson?: boolean;
-  rootProject?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,40 +6,16 @@
   "description": "Init Next Plugin.",
   "type": "object",
   "properties": {
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner.",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
-    "e2eTestRunner": {
-      "description": "Adds the specified e2e test runner.",
-      "type": "string",
-      "enum": ["cypress", "none"],
-      "default": "cypress"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false
     },
-    "js": {
-      "type": "boolean",
-      "default": false,
-      "description": "Use JavaScript instead of TypeScript"
-    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
-    },
-    "rootProject": {
-      "description": "Create an application at the root of the workspace.",
-      "type": "boolean",
-      "default": false,
-      "hidden": true,
-      "x-priority": "internal"
     }
   },
   "required": []

package/src/generators/library/library.js

@@ -4,8 +4,10 @@ exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const library_1 = require("@nx/react/src/generators/library/library");
 const js_1 = require("@nx/js");
+const versions_1 = require("@nx/react/src/utils/versions");
 const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
+const versions_2 = require("../../utils/versions");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -16,9 +18,14 @@ exports.libraryGenerator = libraryGenerator;
 async function libraryGeneratorInternal(host, rawOptions) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, rawOptions);
     const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        js: options.js,
+        skipPackageJson: options.skipPackageJson,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const initTask = await (0, init_1.nextInitGenerator)(host, {
         ...options,
-        e2eTestRunner: 'none',
         skipFormat: true,
     });
     tasks.push(initTask);
@@ -28,6 +35,16 @@ async function libraryGeneratorInternal(host, rawOptions) {
         skipFormat: true,
     });
     tasks.push(libTask);
+    if (!options.skipPackageJson) {
+        const devDependencies = {};
+        if (options.linter === 'eslint') {
+            devDependencies['eslint-config-next'] = versions_2.eslintConfigNextVersion;
+        }
+        if (options.unitTestRunner && options.unitTestRunner !== 'none') {
+            devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
+        }
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, devDependencies));
+    }
     const indexPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', `index.${options.js ? 'js' : 'ts'}`);
     const indexContent = host.read(indexPath, 'utf-8');
     host.write(indexPath, `// Use this file to export React client components (e.g. those with 'use client' directive) or other non-server utilities\n${indexContent}`);