@nx/next 17.2.8 → 17.3.0-beta.2

package/README.md

@@ -1,4 +1,9 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
 
 <div style="text-align: center;">
 
@@ -15,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart, Fast and Extensible Build System
+# Nx: Smart Monorepos · Fast CI
 
-Nx is a next generation build system with first class monorepo support and powerful integrations.
+Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
 
 This package is a [Next.js plugin for Nx](https://nx.dev/next/overview).
 
@@ -59,5 +64,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "17.2.8",
+  "version": "17.3.0-beta.2",
   "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.2.8",
+    "@nx/devkit": "17.3.0-beta.2",
     "@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.2.8",
-    "@nx/eslint": "17.2.8",
-    "@nx/react": "17.2.8",
-    "@nx/web": "17.2.8",
-    "@nx/workspace": "17.2.8",
-    "@nrwl/next": "17.2.8"
+    "@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"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/build/lib/update-package-json.js

@@ -10,7 +10,16 @@ function updatePackageJson(packageJson, context) {
     }
     packageJson.dependencies ??= {};
     // These are always required for a production Next.js app to run.
-    const requiredPackages = ['react', 'react-dom', 'next', 'typescript'];
+    // sharp is for next/image https://nextjs.org/docs/messages/sharp-missing-in-production
+    // critters is required for experimental optimizing CSS
+    const requiredPackages = [
+        'react',
+        'react-dom',
+        'next',
+        'typescript',
+        'sharp',
+        'critters',
+    ];
     for (const pkg of requiredPackages) {
         const externalNode = context.projectGraph.externalNodes[`npm:${pkg}`];
         if (externalNode) {

package/src/executors/export/export.impl.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const export_1 = require("next/dist/export");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const nextTrace = require("next/dist/trace");
 const os_1 = require("os");
 const child_process_1 = require("child_process");
 const chalk = require("chalk");
+const semver_1 = require("semver");
 // platform specific command name
 const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 /**
@@ -22,11 +22,9 @@ const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
  * Read https://nextjs.org/docs/pages/building-your-application/deploying/static-exports
  **/
 async function exportExecutor(options, context) {
-    let dependencies = [];
-    if (!options.buildLibsFromSource) {
-        const result = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // this should be generalized
-        context.configurationName);
-        dependencies = result.dependencies;
+    const nextJsVersion = require('next/package.json').version;
+    if ((0, semver_1.satisfies)(nextJsVersion, '>=14.0.0')) {
+        throw new Error('The export command has been removed in Next.js 14. Please update your Next config to use the output property. Read more: https://nextjs.org/docs/pages/building-your-application/deploying/static-exports');
     }
     // Returns { project: ProjectGraphNode; target: string; configuration?: string;}
     const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context);

package/src/executors/server/schema.json

@@ -52,6 +52,10 @@
     "turbo": {
       "type": "boolean",
       "description": "Activate the incremental bundler for Next.js, which is implemented in Rust. Please note, this feature is exclusively available in development mode."
+    },
+    "experimentalHttps": {
+      "type": "boolean",
+      "description": "Enable HTTPS support for the Next.js development server."
     }
   },
   "required": ["buildTarget"],

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

@@ -32,9 +32,10 @@ async function* serveExecutor(options, context) {
     const nextDir = (0, path_1.resolve)(context.root, buildOptions.outputPath);
     const mode = options.dev ? 'dev' : 'start';
     const turbo = options.turbo && options.dev ? '--turbo' : '';
+    const experimentalHttps = options.experimentalHttps && options.dev ? '--experimental-https' : '';
     const nextBin = require.resolve('next/dist/bin/next');
     yield* (0, async_iterable_1.createAsyncIterable)(async ({ done, next, error }) => {
-        const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo], {
+        const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo, experimentalHttps], {
             cwd: options.dev ? projectRoot : nextDir,
             stdio: 'inherit',
         });

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

@@ -294,7 +294,7 @@ function createAppJsx(name) {
                   <path strokeWidth="2" d="M23 6v14.1667C23 21.7307 21.7307 23 20.1667 23H6c0-3.128 2.53867-5.6667 5.6667-5.6667 3.128 0 5.6666-2.5386 5.6666-5.6666C17.3333 8.53867 19.872 6 23 6Z" />
                 </svg>
                 <h2>
-                  NxCloud
+                  Nx Cloud
                   <span>
                     Enable faster CI & better DX
                   </span>

package/src/plugins/plugin.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { CreateDependencies, CreateNodes } from '@nx/devkit';
 export interface NextPluginOptions {
     buildTargetName?: string;
@@ -6,3 +7,4 @@ 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.createNodes = exports.createDependencies = void 0;
+exports.loadEsmModule = 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");
@@ -23,9 +23,8 @@ const createDependencies = () => {
     return [];
 };
 exports.createDependencies = createDependencies;
-// TODO(nicholas): Add support for .mjs files
 exports.createNodes = [
-    '**/next.config.{js, cjs}',
+    '**/next.config.{js,cjs,mjs}',
     async (configFilePath, options, context) => {
         const projectRoot = (0, path_1.dirname)(configFilePath);
         // Do not create a project if package.json and project.json isn't there.
@@ -52,7 +51,7 @@ exports.createNodes = [
     },
 ];
 async function buildNextTargets(nextConfigPath, projectRoot, options, context) {
-    const nextConfig = getNextConfig(nextConfigPath, context);
+    const nextConfig = await getNextConfig(nextConfigPath, context);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
     targets[options.buildTargetName] = await getBuildTargetConfig(namedInputs, projectRoot, nextConfig);
@@ -114,9 +113,15 @@ async function getOutputs(projectRoot, nextConfig) {
         return `{workspaceRoot}/${projectRoot}/${dir}`;
     }
 }
-function getNextConfig(configFilePath, context) {
+async function getNextConfig(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
-    const module = load(resolvedPath);
+    let module;
+    if ((0, path_1.extname)(configFilePath) === '.mjs') {
+        module = await loadEsmModule(resolvedPath);
+    }
+    else {
+        module = load(resolvedPath);
+    }
     return module.default ?? module;
 }
 function normalizeOptions(options) {
@@ -136,16 +141,29 @@ 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 k of Object.keys(require.cache)) {
-            delete require.cache[k];
+        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/types.d.ts

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

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
-export declare const nextVersion = "13.4.4";
-export declare const eslintConfigNextVersion = "13.4.4";
+export declare const nextVersion = "14.0.4";
+export declare const eslintConfigNextVersion = "14.0.4";
 export declare const sassVersion = "1.62.1";
 export declare const lessLoader = "11.1.0";
 export declare const emotionServerVersion = "11.11.0";

package/src/utils/versions.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.nextVersion = '13.4.4';
-exports.eslintConfigNextVersion = '13.4.4';
+exports.nextVersion = '14.0.4';
+exports.eslintConfigNextVersion = '14.0.4';
 exports.sassVersion = '1.62.1';
 exports.lessLoader = '11.1.0';
 exports.emotionServerVersion = '11.11.0';