@nx/next 17.0.2 → 17.0.4

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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/generators.json

@@ -4,7 +4,7 @@
   "extends": ["@nx/react"],
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#nextInitGenerator",
+      "factory": "./src/generators/init/init#nextInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
       "description": "Initialize the `@nrwl/next` plugin.",
       "hidden": true
@@ -39,7 +39,7 @@
       "description": "Set up a custom server."
     },
     "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration",
+      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigurationInternal",
       "schema": "./src/generators/cypress-component-configuration/schema.json",
       "description": "cypress-component-configuration generator"
     }

package/migrations.json

@@ -23,6 +23,12 @@
       "version": "16.4.0-beta.3",
       "description": "Update package.json moving @nx/next from dependency to devDependency",
       "implementation": "./src/migrations/update-16-4-0/update-nx-next-dependency"
+    },
+    "update-17-2-7": {
+      "cli": "nx",
+      "version": "17.2.7",
+      "description": "Remove patched eslint rule for @next/next/no-html-link-for-pages",
+      "implementation": "./src/migrations/update-17-2-7/remove-eslint-rules-patch"
     }
   },
   "packageJsonUpdates": {
@@ -77,6 +83,24 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "17.3.1-beta.0": {
+      "version": "17.3.1-beta.0",
+      "packages": {
+        "next": {
+          "version": "14.0.4",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "18.0.4": {
+      "version": "18.0.4-beta.0",
+      "packages": {
+        "@swc-node/register": {
+          "version": "~1.8.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "17.0.2",
+  "version": "17.0.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": {
@@ -31,26 +31,28 @@
     "migrations": "./migrations.json"
   },
   "peerDependencies": {
-    "next": ">=13.0.0"
+    "next": ">=14.0.0"
   },
   "dependencies": {
+    "@nx/devkit": "17.0.4",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
+    "file-loader": "^6.2.0",
     "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
-    "semver": "7.5.3",
+    "semver": "^7.5.3",
     "url-loader": "^4.1.1",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.0.2",
-    "@nx/js": "17.0.2",
-    "@nx/eslint": "17.0.2",
-    "@nx/react": "17.0.2",
-    "@nx/web": "17.0.2",
-    "@nx/workspace": "17.0.2",
-    "@nrwl/next": "17.0.2"
+    "@nx/js": "17.0.4",
+    "@nx/eslint": "17.0.4",
+    "@nx/react": "17.0.4",
+    "@nx/web": "17.0.4",
+    "@nx/webpack": "17.0.4",
+    "@nx/workspace": "17.0.4",
+    "@nrwl/next": "17.0.4"
   },
   "publishConfig": {
     "access": "public"

package/plugin.d.ts

@@ -0,0 +1 @@
+export { createNodes, NextPluginOptions } from './src/plugins/plugin';

package/plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodes = void 0;
+var plugin_1 = require("./src/plugins/plugin");
+Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });

package/plugins/component-testing.d.ts

@@ -1,12 +1,2 @@
 import { NxComponentTestingOptions } from '@nx/cypress/plugins/cypress-preset';
-export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
-    specPattern: string;
-    devServer: {
-        webpackConfig: import("webpack").Configuration;
-        framework: "react";
-        bundler: "webpack";
-    };
-    videosFolder: string;
-    screenshotsFolder: string;
-    chromeWebSecurity: boolean;
-};
+export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): any;

package/plugins/component-testing.js

@@ -8,17 +8,25 @@ const react_1 = require("@nx/react");
 const webpack_1 = require("@nx/webpack");
 const path_1 = require("path");
 function nxComponentTestingPreset(pathToConfig, options) {
+    if (global.NX_GRAPH_CREATION || global.NX_CYPRESS_INIT_GENERATOR_RUNNING) {
+        // this is only used by plugins, so we don't need the component testing
+        // options, cast to any to avoid type errors
+        return (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig);
+    }
     const graph = (0, devkit_1.readCachedProjectGraph)();
     const { targets: ctTargets, name: ctProjectName } = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctTargetName = options?.ctTargetName || 'component-test';
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
     const ctExecutorContext = (0, ct_helpers_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
-    const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
-        project: ctProjectName,
-        target: ctTargetName,
-        configuration: ctConfigurationName,
-    }, ctExecutorContext);
-    const buildTarget = ctExecutorOptions.devServerTarget;
+    let buildTarget = options?.buildTarget;
+    if (!buildTarget) {
+        const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
+            project: ctProjectName,
+            target: ctTargetName,
+            configuration: ctConfigurationName,
+        }, ctExecutorContext);
+        buildTarget = ctExecutorOptions.devServerTarget;
+    }
     let buildAssets = [];
     let buildFileReplacements = [];
     let buildOuputPath = `dist/${ctProjectName}/.next`;
@@ -31,6 +39,13 @@ function nxComponentTestingPreset(pathToConfig, options) {
             projectGraph: graph,
         });
         const buildProjectConfig = graph.nodes[parsedBuildTarget.project]?.data;
+        if (buildProjectConfig?.targets?.[parsedBuildTarget.target]?.executor !==
+            '@nx/next:build') {
+            throw new Error(`The '${parsedBuildTarget.target}' target of the '${[
+                parsedBuildTarget.project,
+            ]}' project is not using the '@nx/next:build' executor. ` +
+                `Please make sure to use '@nx/next:build' executor in that target to use Cypress Component Testing.`);
+        }
         const buildExecutorContext = (0, ct_helpers_1.createExecutorContext)(graph, buildProjectConfig.targets, parsedBuildTarget.project, parsedBuildTarget.target, parsedBuildTarget.configuration);
         const buildExecutorOptions = (0, devkit_1.readTargetOptions)({
             project: parsedBuildTarget.project,
@@ -56,20 +71,21 @@ Able to find CT project, ${!!ctProjectConfig}.`);
         assets: buildAssets,
         outputPath: buildOuputPath,
         outputFileName: 'main.js',
-        compiler: 'swc',
+        compiler: options?.compiler || 'swc',
         tsConfig: (0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, 'tsconfig.json'),
     };
-    const configure = (0, webpack_1.composePluginsSync)((0, webpack_1.withNx)(), (0, react_1.withReact)({
+    const configure = (0, webpack_1.composePluginsSync)((0, webpack_1.withNx)({
+        target: 'web',
         styles: [],
         scripts: [],
         postcssConfig: ctProjectConfig.root,
-    }));
+    }), (0, react_1.withReact)({}));
     const webpackConfig = configure({}, {
         options: webpackOptions,
         context: ctExecutorContext,
     });
     return {
-        ...(0, cypress_preset_1.nxBaseCypressPreset)(__filename),
+        ...(0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig),
         specPattern: '**/*.cy.{js,jsx,ts,tsx}',
         devServer: {
             ...{ framework: 'react', bundler: 'webpack' },

package/plugins/with-nx.d.ts

@@ -4,7 +4,7 @@
  */
 import type { NextConfig } from 'next';
 import type { NextConfigFn } from '../src/utils/config';
-import type { ProjectGraphProjectNode } from '@nx/devkit';
+import { type ProjectGraphProjectNode } from '@nx/devkit';
 export interface WithNxOptions extends NextConfig {
     nx?: {
         svgr?: boolean;

package/plugins/with-nx.js

@@ -1,42 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNx = exports.forNextVersion = exports.getAliasForProject = exports.getNextConfig = void 0;
-const baseNXEnvironmentVariables = [
-    'NX_BASE',
-    'NX_CACHE_DIRECTORY',
-    'NX_CACHE_PROJECT_GRAPH',
-    'NX_DAEMON',
-    'NX_DEFAULT_PROJECT',
-    'NX_HEAD',
-    'NX_PERF_LOGGING',
-    'NX_PROFILE',
-    'NX_PROJECT_GRAPH_CACHE_DIRECTORY',
-    'NX_INVOKED_BY_RUNNER',
-    'NX_PROJECT_GRAPH_MAX_WORKERS',
-    'NX_RUNNER',
-    'NX_SKIP_NX_CACHE',
-    'NX_TASKS_RUNNER',
-    'NX_TASKS_RUNNER_DYNAMIC_OUTPUT',
-    'NX_VERBOSE_LOGGING',
-    'NX_DRY_RUN',
-    'NX_INTERACTIVE',
-    'NX_GENERATE_QUIET',
-    'NX_PREFER_TS_NODE',
-    'NX_TASK_TARGET_PROJECT',
-    'NX_TASK_TARGET_TARGET',
-    'NX_TASK_TARGET_CONFIGURATION',
-    'NX_CLI_SET',
-    'NX_LOAD_DOT_ENV_FILES',
-    'NX_WORKSPACE_ROOT',
-    'NX_TASK_HASH',
-    'NX_NEXT_DIR',
-    'NX_NEXT_OUTPUT_PATH',
-    'NX_E2E_RUN_E2E',
-    'NX_E2E_CI_CACHE_KEY',
-    'NX_MAPPINGS',
-    'NX_FILE_TO_RUN',
-    'NX_NEXT_PUBLIC_DIR',
-];
 function regexEqual(x, y) {
     return (x instanceof RegExp &&
         y instanceof RegExp &&
@@ -94,10 +58,13 @@ function getNxContext(graph, target) {
  */
 function withNx(_nextConfig = {}, context = getWithNxContext()) {
     return async (phase) => {
-        const { PHASE_PRODUCTION_SERVER } = await Promise.resolve().then(() => require('next/constants'));
-        if (phase === PHASE_PRODUCTION_SERVER) {
-            // If we are running an already built production server, just return the configuration.
-            // NOTE: Avoid any `require(...)` or `import(...)` statements here. Development dependencies are not available at production runtime.
+        const { PHASE_PRODUCTION_SERVER, PHASE_DEVELOPMENT_SERVER } = await Promise.resolve().then(() => require('next/constants'));
+        // Two scenarios where we want to skip graph creation:
+        // 1. Running production server means the build is already done so we just need to start the Next.js server.
+        // 2. During graph creation (i.e. create nodes), we won't have a graph to read, and it is not needed anyway since it's a build-time concern.
+        //
+        // NOTE: Avoid any `require(...)` or `import(...)` statements here. Development dependencies are not available at production runtime.
+        if (PHASE_PRODUCTION_SERVER === phase || global.NX_GRAPH_CREATION) {
             const { nx, ...validNextConfig } = _nextConfig;
             return {
                 distDir: '.next',
@@ -106,21 +73,20 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
         }
         else {
             const { createProjectGraphAsync, joinPathFragments, offsetFromRoot, workspaceRoot, } = require('@nx/devkit');
-            // Otherwise, add in webpack and eslint configuration for build or test.
-            let dependencies = [];
-            const graph = await createProjectGraphAsync();
+            let graph;
+            try {
+                graph = await createProjectGraphAsync();
+            }
+            catch (e) {
+                throw new Error('Could not create project graph. Please ensure that your workspace is valid.', { cause: e });
+            }
             const originalTarget = {
                 project: process.env.NX_TASK_TARGET_PROJECT,
                 target: process.env.NX_TASK_TARGET_TARGET,
                 configuration: process.env.NX_TASK_TARGET_CONFIGURATION,
             };
-            const { node: projectNode, options, projectName: project, targetName, configurationName, } = getNxContext(graph, originalTarget);
+            const { node: projectNode, options, projectName: project, } = getNxContext(graph, originalTarget);
             const projectDirectory = projectNode.data.root;
-            if (options.buildLibsFromSource === false && targetName) {
-                const { calculateProjectDependencies, } = require('@nx/js/src/utils/buildable-libs-utils');
-                const result = calculateProjectDependencies(graph, workspaceRoot, project, targetName, configurationName);
-                dependencies = result.dependencies;
-            }
             // Get next config
             const nextConfig = getNextConfig(_nextConfig, context);
             // For Next.js 13.1 and greater, make sure workspace libs are transpiled.
@@ -144,13 +110,20 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
                 process.env.NX_NEXT_OUTPUT_PATH || options.outputPath;
             // outputPath may be undefined if using run-commands or other executors other than @nx/next:build.
             // In this case, the user should set distDir in their next.config.js.
-            if (options.outputPath) {
+            if (options.outputPath && phase !== PHASE_DEVELOPMENT_SERVER) {
                 const outputDir = `${offsetFromRoot(projectDirectory)}${options.outputPath}`;
+                // If running dev-server, we should keep `.next` inside project directory since Turbopack expects this.
+                // See: https://github.com/nrwl/nx/issues/19365
                 nextConfig.distDir =
                     nextConfig.distDir && nextConfig.distDir !== '.next'
                         ? joinPathFragments(outputDir, nextConfig.distDir)
                         : joinPathFragments(outputDir, '.next');
             }
+            // If we are running a static serve of the Next.js app, we need to change the output to 'export' and the distDir to 'out'.
+            if (process.env.NX_SERVE_STATIC_BUILD_RUNNING === 'true') {
+                nextConfig.output = 'export';
+                nextConfig.distDir = 'out';
+            }
             const userWebpackConfig = nextConfig.webpack;
             const { createWebpackConfig } = require('@nx/next/src/utils/config');
             nextConfig.webpack = (a, b) => createWebpackConfig(workspaceRoot, projectDirectory, options.fileReplacements, options.assets)(userWebpackConfig ? userWebpackConfig(a, b) : a, b);
@@ -251,36 +224,51 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
              */
             // Default SVGR support to be on for projects.
             if (nx?.svgr !== false) {
+                // TODO(v20): Remove file-loader and use `?react` querystring to differentiate between asset and SVGR.
+                // It should be:
+                // use: [{
+                //   test: /\.svg$/i,
+                //   type: 'asset',
+                //   resourceQuery: /react/, // *.svg?react
+                // },
+                // {
+                //   test: /\.svg$/i,
+                //   issuer: /\.[jt]sx?$/,
+                //   resourceQuery: { not: [/react/] }, // exclude react component if *.svg?react
+                //   use: ['@svgr/webpack'],
+                // }],
+                // See:
+                // - SVGR: https://react-svgr.com/docs/webpack/#use-svgr-and-asset-svg-in-the-same-project
+                // - Vite: https://www.npmjs.com/package/vite-plugin-svgr
+                // - Rsbuild: https://github.com/web-infra-dev/rsbuild/pull/1783
+                // Note: We also need a migration for any projects that are using SVGR to convert
+                //       `import { ReactComponent as X } from './x.svg` to
+                //       `import X from './x.svg?react';
                 config.module.rules.push({
                     test: /\.svg$/,
-                    oneOf: [
-                        // If coming from JS/TS file, then transform into React component using SVGR.
+                    issuer: { not: /\.(css|scss|sass)$/ },
+                    resourceQuery: {
+                        not: [
+                            /__next_metadata__/,
+                            /__next_metadata_route__/,
+                            /__next_metadata_image_meta__/,
+                        ],
+                    },
+                    use: [
                         {
-                            issuer: /\.[jt]sx?$/,
-                            use: [
-                                {
-                                    loader: require.resolve('@svgr/webpack'),
-                                    options: {
-                                        svgo: false,
-                                        titleProp: true,
-                                        ref: true,
-                                    },
-                                },
-                                {
-                                    loader: require.resolve('url-loader'),
-                                    options: {
-                                        limit: 10000,
-                                        name: '[name].[hash:7].[ext]',
-                                    },
-                                },
-                            ],
+                            loader: require.resolve('@svgr/webpack'),
+                            options: {
+                                svgo: false,
+                                titleProp: true,
+                                ref: true,
+                            },
                         },
-                        // Fallback to plain URL loader if someone just imports the SVG and references it on the <img src> tag
                         {
-                            loader: require.resolve('url-loader'),
+                            loader: require.resolve('file-loader'),
                             options: {
-                                limit: 10000,
-                                name: '[name].[hash:7].[ext]',
+                                // Next.js hard-codes assets to load from "static/media".
+                                // See: https://github.com/vercel/next.js/blob/53d017d/packages/next/src/build/webpack-config.ts#L1993
+                                name: 'static/media/[name].[hash].[ext]',
                             },
                         },
                     ],
@@ -291,20 +279,19 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
     };
 }
 exports.getNextConfig = getNextConfig;
-function getNonBaseVariables(oldEnv) {
-    return Object.keys(oldEnv).filter((env) => !baseNXEnvironmentVariables.includes(env));
-}
+// 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) => /^NX_/i.test(env))
+        .filter((env) => !excludedKeys.includes(env) && /^NX_/i.test(env))
         .reduce((env, key) => {
         env[key] = process.env[key];
         return env;
     }, {});
 }
-let hasWarnedAboutDeprecatedEnvVariables = false;
 /**
- * TODO(v18)
+ * 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) {
@@ -317,16 +304,11 @@ function addNxEnvVariables(config) {
             .map(([name, value]) => [`process.env.${name}`, `"${value}"`])
             .filter(([name]) => !maybeDefinePlugin.definitions[name])
             .forEach(([name, value]) => (maybeDefinePlugin.definitions[name] = value));
-        const vars = getNonBaseVariables(env);
-        if (vars.length > 0 && !hasWarnedAboutDeprecatedEnvVariables) {
-            hasWarnedAboutDeprecatedEnvVariables = true;
-            console.warn(`Warning, in Nx 18 environment variables starting with NX_ will not be available in the browser, and currently will not work with @nx/next:server executor.\nPlease rename the following environment variables: ${vars.join(', ')} using Next.js' built-in support for environment variables. Reference https://nextjs.org/docs/pages/api-reference/next-config-js/env`);
-        }
     }
 }
 function getAliasForProject(node, paths) {
     // Match workspace libs to their alias in tsconfig paths.
-    for (const [alias, lookup] of Object.entries(paths)) {
+    for (const [alias, lookup] of Object.entries(paths ?? {})) {
         const lookupContainsDepNode = lookup.some((lookupPath) => lookupPath.startsWith(node?.data?.root) ||
             lookupPath.startsWith('./' + node?.data?.root));
         if (lookupContainsDepNode) {

package/plugins/with-stylus.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withStylus = void 0;
-// TODO(v18): Remove file, it is here until users migrate over to SASS manually.
+// TODO(v19): 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/build.impl.js

@@ -12,6 +12,7 @@ const create_next_config_file_1 = require("./lib/create-next-config-file");
 const check_project_1 = require("./lib/check-project");
 const child_process_1 = require("child_process");
 const create_cli_options_1 = require("../../utils/create-cli-options");
+const exit_codes_1 = require("nx/src/utils/exit-codes");
 let childProcess;
 async function buildExecutor(options, context) {
     // Cast to any to overwrite NODE_ENV
@@ -34,9 +35,14 @@ async function buildExecutor(options, context) {
     try {
         await runCliBuild(devkit_1.workspaceRoot, projectRoot, options);
     }
-    catch (error) {
-        devkit_1.logger.error(`Error occurred while trying to run the build command`);
-        devkit_1.logger.error(error);
+    catch ({ error, code, signal }) {
+        if (code || signal) {
+            devkit_1.logger.error(`Build process exited due to ${code ? 'code ' + code : ''} ${code && signal ? 'and' : ''} ${signal ? 'signal ' + signal : ''}`);
+        }
+        else {
+            devkit_1.logger.error(`Error occurred while trying to run the build command`);
+            devkit_1.logger.error(error);
+        }
         return { success: false };
     }
     finally {
@@ -85,21 +91,26 @@ function runCliBuild(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
         childProcess = (0, child_process_1.fork)(require.resolve('next/dist/bin/next'), ['build', ...args], {
             cwd: (0, path_1.resolve)(workspaceRoot, projectRoot),
-            stdio: 'inherit',
+            stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
             env: process.env,
         });
         // Ensure the child process is killed when the parent exits
         process.on('exit', () => childProcess.kill());
-        process.on('SIGTERM', () => childProcess.kill());
+        process.on('SIGTERM', (signal) => {
+            reject({ code: (0, exit_codes_1.signalToCode)(signal), signal });
+        });
+        process.on('SIGINT', (signal) => {
+            reject({ code: (0, exit_codes_1.signalToCode)(signal), signal });
+        });
         childProcess.on('error', (err) => {
-            reject(err);
+            reject({ error: err });
         });
-        childProcess.on('exit', (code) => {
+        childProcess.on('exit', (code, signal) => {
             if (code === 0) {
-                resolve(code);
+                resolve({ code, signal });
             }
             else {
-                reject(code);
+                reject({ code, signal });
             }
         });
     });

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

@@ -41,7 +41,10 @@ function createNextConfigFile(options, context) {
     const moduleFilesToCopy = getRelativeFilesToCopy(configRelativeToProjectRoot, projectRoot);
     for (const moduleFile of moduleFilesToCopy) {
         (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, path_1.join)(context.root, options.outputPath, moduleFile)));
-        (0, fs_extra_1.copyFileSync)((0, path_1.join)(context.root, projectRoot, moduleFile), (0, path_1.join)(context.root, options.outputPath, moduleFile));
+        // We already generate a build version of package.json in the dist folder.
+        if (moduleFile !== 'package.json') {
+            (0, fs_extra_1.copyFileSync)((0, path_1.join)(context.root, projectRoot, moduleFile), (0, path_1.join)(context.root, options.outputPath, moduleFile));
+        }
     }
 }
 exports.createNextConfigFile = createNextConfigFile;
@@ -80,7 +83,7 @@ exports.getWithNxContent = getWithNxContent;
 function findNextConfigPath(dirname, userDefinedConfigPath) {
     if (userDefinedConfigPath) {
         const file = userDefinedConfigPath;
-        if ((0, fs_extra_1.existsSync)(file))
+        if ((0, fs_extra_1.existsSync)((0, path_1.join)(dirname, file)))
             return file;
         throw new Error(`Cannot find the Next.js config file: ${userDefinedConfigPath}. Is the path correct in project.json?`);
     }

package/src/executors/build/lib/test-fixtures/ensure-exts/baz.json

@@ -0,0 +1 @@
+{}

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/build/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "pipe",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "title": "Next Build",
   "description": "Build a Next.js app.",