@nx/next 19.0.0-beta.0 → 19.0.0-beta.10

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "add-style-packages": {
-      "cli": "nx",
-      "version": "15.8.8-beta.0",
-      "description": "Add less and stylus packages if used.",
-      "factory": "./src/migrations/update-15-8-8/add-style-packages"
-    },
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
@@ -32,40 +26,6 @@
     }
   },
   "packageJsonUpdates": {
-    "15.0.4": {
-      "version": "15.0.4-beta.0",
-      "packages": {
-        "next": {
-          "version": "13.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "eslint-config-next": {
-          "version": "13.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "less-loader": {
-          "version": "11.1.0",
-          "alwaysAddToPackageJson": false
-        },
-        "stylus-loader": {
-          "version": "7.1.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "15.4.5": {
-      "version": "15.4.5-beta.0",
-      "packages": {
-        "next": {
-          "version": "13.1.1",
-          "alwaysAddToPackageJson": false
-        },
-        "eslint-config-next": {
-          "version": "13.1.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "16.0.0": {
       "version": "16.0.0-beta.0",
       "packages": {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nx/next",
-  "version": "19.0.0-beta.0",
+  "version": "19.0.0-beta.10",
   "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.",
+  "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": {
     "type": "git",
     "url": "https://github.com/nrwl/nx.git",
@@ -34,7 +34,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.0-beta.0",
+    "@nx/devkit": "19.0.0-beta.10",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -45,13 +45,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "19.0.0-beta.0",
-    "@nx/eslint": "19.0.0-beta.0",
-    "@nx/react": "19.0.0-beta.0",
-    "@nx/web": "19.0.0-beta.0",
-    "@nx/webpack": "19.0.0-beta.0",
-    "@nx/workspace": "19.0.0-beta.0",
-    "@nrwl/next": "19.0.0-beta.0"
+    "@nx/js": "19.0.0-beta.10",
+    "@nx/eslint": "19.0.0-beta.10",
+    "@nx/react": "19.0.0-beta.10",
+    "@nx/web": "19.0.0-beta.10",
+    "@nx/webpack": "19.0.0-beta.10",
+    "@nx/workspace": "19.0.0-beta.10",
+    "@nrwl/next": "19.0.0-beta.10"
   },
   "publishConfig": {
     "access": "public"

package/plugins/with-nx.js

@@ -216,11 +216,7 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
                 delete nextGlobalCssLoader.issuer.and;
             }
             /**
-             * 5. Add env variables prefixed with NX_
-             */
-            addNxEnvVariables(config);
-            /**
-             * 6. Add SVGR support if option is on.
+             * 5. Add SVGR support if option is on.
              */
             // Default SVGR support to be on for projects.
             if (nx?.svgr !== false) {
@@ -279,33 +275,6 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
     };
 }
 exports.getNextConfig = getNextConfig;
-// Prevent sensitive keys from being bundled when source code uses entire `process.env` object rather than individual keys (e.g. `process.env.NX_FOO`).
-// TODO(v19): BREAKING: Only support NEXT_PUBLIC_ env vars and ignore NX_ vars since this is a standard Next.js feature.
-const excludedKeys = ['NX_CLOUD_ACCESS_TOKEN', 'NX_CLOUD_ENCRYPTION_KEY'];
-function getNxEnvironmentVariables() {
-    return Object.keys(process.env)
-        .filter((env) => !excludedKeys.includes(env) && /^NX_/i.test(env))
-        .reduce((env, key) => {
-        env[key] = process.env[key];
-        return env;
-    }, {});
-}
-/**
- * TODO(v19)
- * @deprecated Use Next.js 9.4+ built-in support for environment variables. Reference https://nextjs.org/docs/pages/api-reference/next-config-js/env
- */
-function addNxEnvVariables(config) {
-    const maybeDefinePlugin = config.plugins?.find((plugin) => {
-        return plugin.definitions?.['process.env.NODE_ENV'];
-    });
-    if (maybeDefinePlugin) {
-        const env = getNxEnvironmentVariables();
-        Object.entries(env)
-            .map(([name, value]) => [`process.env.${name}`, `"${value}"`])
-            .filter(([name]) => !maybeDefinePlugin.definitions[name])
-            .forEach(([name, value]) => (maybeDefinePlugin.definitions[name] = value));
-    }
-}
 function getAliasForProject(node, paths) {
     // Match workspace libs to their alias in tsconfig paths.
     for (const [alias, lookup] of Object.entries(paths ?? {})) {

package/plugins/with-stylus.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withStylus = void 0;
-// TODO(v19): Remove file, it is here until users migrate over to SASS manually.
+// TODO(v20): Remove file, it is here until users migrate over to SASS manually.
 function withStylus(configOrFn) {
     return async (phase) => {
         throw new Error(`Stylus support has been removed and you should use the built-in SASS support. Remove the "withStylus" plugin from your Next.js config, and rename your files from .styl to .scss.`);

package/src/executors/build/lib/create-next-config-file.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const typescript_1 = require("nx/src/utils/typescript");
+const js_1 = require("@nx/js");
 function createNextConfigFile(options, context) {
     // Don't overwrite the next.config.js file if output path is the same as the source path.
     if (options.outputPath.replace(/\/$/, '') ===
@@ -57,7 +57,7 @@ function readSource(getFile) {
 // Exported for testing
 function getWithNxContent({ file, content } = readSource(() => (0, path_1.join)(__dirname, '../../../../plugins/with-nx.js'))) {
     const withNxSource = ts.createSourceFile(file, content, ts.ScriptTarget.Latest, true);
-    const getWithNxContextDeclaration = (0, typescript_1.findNodes)(withNxSource, ts.SyntaxKind.FunctionDeclaration)?.find((node) => node.name?.text === 'getWithNxContext');
+    const getWithNxContextDeclaration = (0, js_1.findNodes)(withNxSource, ts.SyntaxKind.FunctionDeclaration)?.find((node) => node.name?.text === 'getWithNxContext');
     if (getWithNxContextDeclaration) {
         content = (0, devkit_1.applyChangesToString)(content, [
             {
@@ -122,7 +122,7 @@ exports.getRelativeFilesToCopy = getRelativeFilesToCopy;
 // Exported for testing
 function getRelativeImports({ file, content, }) {
     const source = ts.createSourceFile(file, content, ts.ScriptTarget.Latest, true);
-    const callExpressionsOrImportDeclarations = (0, typescript_1.findNodes)(source, [
+    const callExpressionsOrImportDeclarations = (0, js_1.findNodes)(source, [
         ts.SyntaxKind.CallExpression,
         ts.SyntaxKind.ImportDeclaration,
     ]);

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

@@ -19,7 +19,8 @@ exports.default = serveExecutor;
 async function* runCustomServer(root, options, context) {
     process.env.NX_NEXT_DIR ??= root;
     process.env.NX_NEXT_PUBLIC_DIR = (0, path_1.join)(root, 'public');
-    const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
+    const httpProtocol = options.customServerHttps ? 'https' : 'http';
+    const baseUrl = `${httpProtocol}://${options.hostname || 'localhost'}:${options.port}`;
     const customServerBuild = await (0, devkit_1.runExecutor)((0, devkit_1.parseTargetString)(options.customServerTarget, context), {
         watch: options.dev ? true : false,
     }, context);

package/src/executors/server/schema.json

@@ -56,6 +56,10 @@
     "experimentalHttps": {
       "type": "boolean",
       "description": "Enable HTTPS support for the Next.js development server."
+    },
+    "customServerHttps:": {
+      "type": "boolean",
+      "description": "Enable HTTPS support for the custom server."
     }
   },
   "required": ["buildTarget"],

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

@@ -52,6 +52,7 @@ async function addE2e(host, options) {
             root: options.e2eProjectRoot,
             sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
             targets: {},
+            tags: [],
             implicitDependencies: [options.projectName],
         });
         return configurationGenerator(host, {

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

@@ -66,7 +66,7 @@ async function normalizeOptions(host, options) {
         e2eWebServerAddress,
         e2eWebServerTarget,
         e2ePort,
-        e2eTestRunner: options.e2eTestRunner || 'cypress',
+        e2eTestRunner: options.e2eTestRunner || 'playwright',
         fileName,
         linter: options.linter || eslint_1.Linter.EsLint,
         name,

package/src/generators/application/schema.json

@@ -89,10 +89,10 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "playwright", "none"],
+      "enum": ["playwright", "cypress", "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"
+      "default": "playwright"
     },
     "tags": {
       "type": "string",

package/src/generators/component/component.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const react_1 = require("@nx/react");
 const styles_1 = require("../../utils/styles");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-// TODO(v19): Remove this logic once we no longer derive directory.
+// TODO(v20): Remove this logic once we no longer derive directory.
 function maybeGetDerivedDirectory(host, options) {
     if (!options.project)
         return options.directory;

package/src/generators/page/page.js

@@ -46,7 +46,7 @@ async function normalizeOptions(host, options) {
     let routerDirectory;
     if (options.project) {
         // Legacy behavior, detect app vs page router from specified project.
-        // TODO(v19): remove this logic
+        // TODO(v20): remove this logic
         const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
         // app/ is a reserved folder in nextjs so it is safe to check it's existence
         isAppRouter =

package/src/plugins/plugin.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { CreateDependencies, CreateNodes } from '@nx/devkit';
 export interface NextPluginOptions {
     buildTargetName?: string;
@@ -8,4 +7,3 @@ export interface NextPluginOptions {
 }
 export declare const createDependencies: CreateDependencies;
 export declare const createNodes: CreateNodes<NextPluginOptions>;
-export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;

package/src/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadEsmModule = exports.createNodes = exports.createDependencies = void 0;
+exports.createNodes = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
@@ -8,6 +8,7 @@ const fs_1 = require("fs");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const js_1 = require("@nx/js");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'next.hash');
 const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
 const calculatedTargets = {};
@@ -72,6 +73,9 @@ async function getBuildTargetConfig(namedInputs, projectRoot, nextConfig) {
         inputs: getInputs(namedInputs),
         outputs: [nextOutputPath, `${nextOutputPath}/!(cache)`],
     };
+    // TODO(ndcunningham): Update this to be consider different versions of next.js which is running
+    // This doesn't actually need to be tty, but next.js has a bug, https://github.com/vercel/next.js/issues/62906, where it exits 0 when SIGINT is sent.
+    targetConfig.options.tty = false;
     return targetConfig;
 }
 function getDevTargetConfig(projectRoot) {
@@ -127,16 +131,9 @@ async function getOutputs(projectRoot, nextConfig) {
         return `{workspaceRoot}/${projectRoot}/${dir}`;
     }
 }
-async function getNextConfig(configFilePath, context) {
+function getNextConfig(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
-    let module;
-    if ((0, path_1.extname)(configFilePath) === '.mjs') {
-        module = await loadEsmModule(resolvedPath);
-    }
-    else {
-        module = load(resolvedPath);
-    }
-    return module.default ?? module;
+    return (0, config_utils_1.loadConfigFile)(resolvedPath);
 }
 function normalizeOptions(options) {
     options ??= {};
@@ -156,29 +153,3 @@ function getInputs(namedInputs) {
         },
     ];
 }
-const packageInstallationDirectories = ['node_modules', '.yarn'];
-/**
- * Load the module after ensuring that the require cache is cleared.
- */
-function load(path) {
-    // Clear cache if the path is in the cache
-    if (require.cache[path]) {
-        for (const key of Object.keys(require.cache)) {
-            if (!packageInstallationDirectories.some((dir) => key.includes(dir))) {
-                delete require.cache[key];
-            }
-        }
-    }
-    // Then require
-    return require(path);
-}
-/**
- * Lazily compiled dynamic import loader function.
- */
-let dynamicLoad;
-function loadEsmModule(modulePath) {
-    const modulePathWithCacheBust = `${modulePath}?version=${Date.now()}`;
-    dynamicLoad ??= new Function('modulePath', `return import(modulePath);`);
-    return dynamicLoad(modulePathWithCacheBust);
-}
-exports.loadEsmModule = loadEsmModule;

package/src/utils/create-cli-options.js

@@ -5,7 +5,10 @@ function createCliOptions(obj) {
     return Object.entries(obj).reduce((arr, [key, value]) => {
         if (value !== undefined) {
             const kebabCase = key.replace(/[A-Z]/g, (m) => '-' + m.toLowerCase());
-            arr.push(`--${kebabCase}=${value}`);
+            if (value === true || typeof value !== 'boolean') {
+                // Boolean flags don't need a value (e.g. --debug)
+                arr.push(`--${kebabCase}` + (typeof value !== 'boolean' ? `=${value}` : ''));
+            }
         }
         return arr;
     }, []);

package/src/utils/types.d.ts

@@ -45,6 +45,7 @@ export interface NextServeBuilderOptions {
     keepAliveTimeout?: number;
     turbo?: boolean;
     experimentalHttps?: boolean;
+    customServerHttps?: boolean;
 }
 export interface NextExportBuilderOptions {
     buildTarget: string;

package/src/migrations/update-15-8-8/add-style-packages.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function update(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;
-export default update;

package/src/migrations/update-15-8-8/add-style-packages.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.update = void 0;
-const devkit_1 = require("@nx/devkit");
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    const missingDeps = {};
-    for (const [, config] of projects) {
-        if (config.targets?.build?.executor === '@nrwl/next:build' &&
-            tree.exists((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'))) {
-            const nextConfigContent = tree.read((0, devkit_1.joinPathFragments)(config.root, 'next.config.js'), 'utf-8');
-            if (nextConfigContent.includes('@nrwl/next/plugins/with-less')) {
-                missingDeps['less'] = '3.12.2';
-            }
-            if (nextConfigContent.includes('@nrwl/next/plugins/with-stylus')) {
-                missingDeps['stylus'] = '^0.55.0';
-            }
-        }
-    }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, missingDeps);
-}
-exports.update = update;
-exports.default = update;