@nx/next 17.3.0-beta.1 → 17.3.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "17.3.0-beta.1",
+  "version": "17.3.0-beta.3",
   "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.1",
+    "@nx/devkit": "17.3.0-beta.3",
     "@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.1",
-    "@nx/eslint": "17.3.0-beta.1",
-    "@nx/react": "17.3.0-beta.1",
-    "@nx/web": "17.3.0-beta.1",
-    "@nx/workspace": "17.3.0-beta.1",
-    "@nrwl/next": "17.3.0-beta.1"
+    "@nx/js": "17.3.0-beta.3",
+    "@nx/eslint": "17.3.0-beta.3",
+    "@nx/react": "17.3.0-beta.3",
+    "@nx/web": "17.3.0-beta.3",
+    "@nx/workspace": "17.3.0-beta.3",
+    "@nrwl/next": "17.3.0-beta.3"
   },
   "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/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/migrations/update-17-2-7/remove-eslint-rules-patch.js

@@ -5,6 +5,8 @@ const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 async function update(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
     projects.forEach((project) => {
+        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, project.root))
+            return;
         (0, eslint_file_1.updateOverrideInLintConfig)(tree, project.root, (o) => o.rules?.['@next/next/no-html-link-for-pages'] &&
             o.files?.includes('**/*.*'), (o) => undefined);
     });

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);
@@ -107,11 +106,22 @@ async function getOutputs(projectRoot, nextConfig) {
         // If nextConfig is an object, directly use its 'distDir' property.
         dir = nextConfig.distDir;
     }
-    return `{workspaceRoot}/${projectRoot}/${dir}`;
+    if (projectRoot === '.') {
+        return `{projectRoot}/${dir}`;
+    }
+    else {
+        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) {
@@ -131,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;