@nx/next 16.6.0 → 16.7.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.6.0",
+  "version": "16.7.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.6.0",
-    "@nx/devkit": "16.6.0",
-    "@nx/js": "16.6.0",
-    "@nx/linter": "16.6.0",
-    "@nx/react": "16.6.0",
-    "@nx/web": "16.6.0",
-    "@nx/workspace": "16.6.0",
+    "@nrwl/next": "16.7.0-beta.1",
+    "@nx/devkit": "16.7.0-beta.1",
+    "@nx/js": "16.7.0-beta.1",
+    "@nx/linter": "16.7.0-beta.1",
+    "@nx/react": "16.7.0-beta.1",
+    "@nx/web": "16.7.0-beta.1",
+    "@nx/workspace": "16.7.0-beta.1",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -57,5 +57,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "d02a8dbf06c85de78c0c76f64a17f10ae8085739"
+  "gitHead": "50a145bb64edcf76985184a9a83d1449dcd4f3d9"
 }

package/src/executors/build/build.impl.js

@@ -39,7 +39,12 @@ function buildExecutor(options, context) {
         // We can retrieve it inside plugins/with-nx
         (_d = (_g = process.env).NX_NEXT_OUTPUT_PATH) !== null && _d !== void 0 ? _d : (_g.NX_NEXT_OUTPUT_PATH = outputPath);
         const args = (0, create_cli_options_1.createCliOptions)({ experimentalAppOnly, profile, debug });
-        const command = `npx next build ${args.join(' ')}`;
+        const isYarnBerry = (0, devkit_1.detectPackageManager)() === 'yarn' &&
+            (0, semver_1.gte)((0, devkit_1.getPackageManagerVersion)('yarn', devkit_1.workspaceRoot), '2.0.0');
+        const buildCommand = isYarnBerry
+            ? `yarn next build ${projectRoot}`
+            : 'npx next build';
+        const command = `${buildCommand} ${args.join(' ')}`;
         const execSyncOptions = {
             stdio: 'inherit',
             encoding: 'utf-8',

package/src/executors/server/server.impl.js

@@ -58,7 +58,7 @@ function serveExecutor(options, context) {
             process.on('SIGINT', () => killServer());
             process.on('SIGTERM', () => killServer());
             process.on('SIGHUP', () => killServer());
-            yield (0, wait_for_port_open_1.waitForPortOpen)(port);
+            yield (0, wait_for_port_open_1.waitForPortOpen)(port, { host: options.hostname });
             next({
                 success: true,
                 baseUrl: `http://${(_a = options.hostname) !== null && _a !== void 0 ? _a : 'localhost'}:${port}`,

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

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

package/src/generators/application/application.js

@@ -4,7 +4,7 @@ exports.applicationSchematic = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
-const add_cypress_1 = require("./lib/add-cypress");
+const add_e2e_1 = require("./lib/add-e2e");
 const add_jest_1 = require("./lib/add-jest");
 const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
@@ -18,20 +18,26 @@ 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* () {
+        const tasks = [];
         const options = (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);
         (0, create_application_files_1.createApplicationFiles)(host, options);
         (0, add_project_1.addProject)(host, options);
-        const cypressTask = yield (0, add_cypress_1.addCypress)(host, options);
+        const e2eTask = yield (0, add_e2e_1.addE2e)(host, options);
+        tasks.push(e2eTask);
         const jestTask = yield (0, add_jest_1.addJest)(host, options);
+        tasks.push(jestTask);
         const lintTask = yield (0, add_linting_1.addLinting)(host, options);
-        (0, update_jest_config_1.updateJestConfig)(host, options);
-        (0, update_cypress_tsconfig_1.updateCypressTsConfig)(host, options);
+        tasks.push(lintTask);
         const styledTask = (0, styles_1.addStyleDependencies)(host, {
             style: options.style,
             swc: !host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, '.babelrc')),
         });
+        tasks.push(styledTask);
+        (0, update_jest_config_1.updateJestConfig)(host, options);
+        (0, update_cypress_tsconfig_1.updateCypressTsConfig)(host, options);
         (0, set_defaults_1.setDefaults)(host, options);
         if (options.customServer) {
             yield (0, custom_server_1.customServerGenerator)(host, {
@@ -42,7 +48,7 @@ function applicationGenerator(host, schema) {
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
         }
-        return (0, devkit_1.runTasksInSerial)(nextTask, cypressTask, jestTask, lintTask, styledTask);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 exports.applicationGenerator = applicationGenerator;

package/src/generators/application/lib/add-e2e.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+import { NormalizedSchema } from './normalize-options';
+export declare function addE2e(host: Tree, options: NormalizedSchema): Promise<import("@nx/devkit").GeneratorCallback>;

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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addE2e = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const linter_1 = require("@nx/linter");
+const versions_1 = require("../../../utils/versions");
+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 }));
+        }
+        else if (options.e2eTestRunner === 'playwright') {
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, ''),
+                targets: {},
+                implicitDependencies: [options.projectName],
+            });
+            return configurationGenerator(host, {
+                project: options.e2eProjectName,
+                skipFormat: true,
+                skipPackageJson: options.skipPackageJson,
+                directory: 'src',
+                js: false,
+                linter: options.linter,
+                setParserOptionsProject: options.setParserOptionsProject,
+                webServerAddress: 'http://127.0.0.1:4200',
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
+            });
+        }
+        return () => { };
+    });
+}
+exports.addE2e = addE2e;

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

@@ -8,7 +8,7 @@ export interface Schema {
   directory?: string;
   tags?: string;
   unitTestRunner?: 'jest' | 'none';
-  e2eTestRunner?: 'cypress' | 'none';
+  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   linter?: Linter;
   js?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/application/schema.json

@@ -84,8 +84,9 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
+      "x-prompt": "Which E2E test runner would you like to use?",
       "default": "cypress"
     },
     "tags": {

package/src/generators/init/init.js

@@ -28,11 +28,21 @@ function nextInitGenerator(host, schema) {
             const jestTask = yield jestInitGenerator(host, schema);
             tasks.push(jestTask);
         }
-        if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
+        if (schema.e2eTestRunner === 'cypress') {
             const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
             const cypressTask = yield cypressInitGenerator(host, {});
             tasks.push(cypressTask);
         }
+        else if (schema.e2eTestRunner === 'playwright') {
+            const { initGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
+            const playwrightTask = yield initGenerator(host, {
+                skipFormat: true,
+                skipPackageJson: schema.skipPackageJson,
+            });
+            tasks.push(playwrightTask);
+        }
+        // @ts-ignore
+        // TODO(jack): remove once the React Playwright PR lands first
         const reactTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, schema), { skipFormat: true }));
         tasks.push(reactTask);
         if (!schema.skipPackageJson) {

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

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

package/src/generators/application/lib/add-cypress.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-import { NormalizedSchema } from './normalize-options';
-export declare function addCypress(host: Tree, options: NormalizedSchema): Promise<() => void>;

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

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addCypress = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
-const versions_1 = require("../../../utils/versions");
-function addCypress(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.e2eTestRunner !== 'cypress') {
-            return () => { };
-        }
-        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 }));
-    });
-}
-exports.addCypress = addCypress;