@nx/next 16.8.0-beta.3 → 16.8.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.8.0-beta.3",
+  "version": "16.8.0-beta.5",
   "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.8.0-beta.3",
-    "@nx/devkit": "16.8.0-beta.3",
-    "@nx/js": "16.8.0-beta.3",
-    "@nx/linter": "16.8.0-beta.3",
-    "@nx/react": "16.8.0-beta.3",
-    "@nx/web": "16.8.0-beta.3",
-    "@nx/workspace": "16.8.0-beta.3",
+    "@nrwl/next": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
+    "@nx/linter": "16.8.0-beta.5",
+    "@nx/react": "16.8.0-beta.5",
+    "@nx/web": "16.8.0-beta.5",
+    "@nx/workspace": "16.8.0-beta.5",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -56,5 +56,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/plugins/component-testing.js

@@ -8,10 +8,9 @@ const react_1 = require("@nx/react");
 const webpack_1 = require("@nx/webpack");
 const path_1 = require("path");
 function nxComponentTestingPreset(pathToConfig, options) {
-    var _a, _b;
     const graph = (0, devkit_1.readCachedProjectGraph)();
     const { targets: ctTargets, name: ctProjectName } = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
-    const ctTargetName = (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test';
+    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)({
@@ -25,18 +24,18 @@ function nxComponentTestingPreset(pathToConfig, options) {
     let buildOuputPath = `dist/${ctProjectName}/.next`;
     if (buildTarget) {
         const parsedBuildTarget = (0, devkit_1.parseTargetString)(buildTarget, graph);
-        const buildProjectConfig = (_a = graph.nodes[parsedBuildTarget.project]) === null || _a === void 0 ? void 0 : _a.data;
+        const buildProjectConfig = graph.nodes[parsedBuildTarget.project]?.data;
         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,
             target: parsedBuildTarget.target,
             configuration: parsedBuildTarget.configuration,
         }, buildExecutorContext);
-        buildAssets !== null && buildAssets !== void 0 ? buildAssets : (buildAssets = buildExecutorOptions.assets);
-        buildFileReplacements !== null && buildFileReplacements !== void 0 ? buildFileReplacements : (buildFileReplacements = buildExecutorOptions.fileReplacements);
-        buildOuputPath !== null && buildOuputPath !== void 0 ? buildOuputPath : (buildOuputPath = buildExecutorOptions.outputPath);
+        buildAssets ??= buildExecutorOptions.assets;
+        buildFileReplacements ??= buildExecutorOptions.fileReplacements;
+        buildOuputPath ??= buildExecutorOptions.outputPath;
     }
-    const ctProjectConfig = (_b = graph.nodes[ctProjectName]) === null || _b === void 0 ? void 0 : _b.data;
+    const ctProjectConfig = graph.nodes[ctProjectName]?.data;
     if (!ctProjectConfig) {
         throw new Error((0, devkit_1.stripIndents) `Unable to load project configs from the project graph.
 Provided build target, ${buildTarget}.
@@ -63,6 +62,13 @@ Able to find CT project, ${!!ctProjectConfig}.`);
         options: webpackOptions,
         context: ctExecutorContext,
     });
-    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(__filename)), { specPattern: '**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign(Object.assign({}, { framework: 'react', bundler: 'webpack' }), { webpackConfig }) });
+    return {
+        ...(0, cypress_preset_1.nxBaseCypressPreset)(__filename),
+        specPattern: '**/*.cy.{js,jsx,ts,tsx}',
+        devServer: {
+            ...{ framework: 'react', bundler: 'webpack' },
+            webpackConfig,
+        },
+    };
 }
 exports.nxComponentTestingPreset = nxComponentTestingPreset;

package/plugins/with-less.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withLess = void 0;
-const tslib_1 = require("tslib");
 // Adapted from https://raw.githubusercontent.com/elado/next-with-less/main/src/index.js
 const webpack_merge_1 = require("webpack-merge");
 const addLessToRegExp = (rx) => new RegExp(rx.source.replace('|sass', '|sass|less'), rx.flags);
 function withLess(configOrFn) {
-    return (phase) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const baseConfig = typeof configOrFn === 'function' ? yield configOrFn(phase) : configOrFn;
-        const { lessLoaderOptions = {} } = baseConfig, nextConfig = tslib_1.__rest(baseConfig, ["lessLoaderOptions"]);
+    return async (phase) => {
+        const baseConfig = typeof configOrFn === 'function' ? await configOrFn(phase) : configOrFn;
+        const { lessLoaderOptions = {}, ...nextConfig } = baseConfig;
         return Object.assign({}, nextConfig, {
             webpack(config, opts) {
                 // there are 2 relevant sass rules in next.js - css modules and global css
                 let sassModuleRule;
                 // global sass rule (does not exist in server builds)
                 let sassGlobalRule;
-                const cssRule = config.module.rules.find((rule) => { var _a; return (_a = rule.oneOf) === null || _a === void 0 ? void 0 : _a.find((r) => r === null || r === void 0 ? void 0 : r[Symbol.for('__next_css_remove')]); });
+                const cssRule = config.module.rules.find((rule) => rule.oneOf?.find((r) => r?.[Symbol.for('__next_css_remove')]));
                 const addLessToRuleTest = (test) => {
                     if (Array.isArray(test)) {
                         return test.map((rx) => addLessToRegExp(rx));
@@ -25,28 +24,34 @@ function withLess(configOrFn) {
                     }
                 };
                 cssRule.oneOf.forEach((rule) => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h;
-                    if ((_a = rule.options) === null || _a === void 0 ? void 0 : _a.__next_css_remove)
+                    if (rule.options?.__next_css_remove)
                         return;
-                    if (((_b = rule.use) === null || _b === void 0 ? void 0 : _b.loader) === 'error-loader') {
+                    if (rule.use?.loader === 'error-loader') {
                         rule.test = addLessToRuleTest(rule.test);
                     }
-                    else if ((_d = (_c = rule.use) === null || _c === void 0 ? void 0 : _c.loader) === null || _d === void 0 ? void 0 : _d.includes('file-loader')) {
+                    else if (rule.use?.loader?.includes('file-loader')) {
                         rule.issuer = addLessToRuleTest(rule.issuer);
                     }
-                    else if ((_f = (_e = rule.use) === null || _e === void 0 ? void 0 : _e.includes) === null || _f === void 0 ? void 0 : _f.call(_e, 'ignore-loader')) {
+                    else if (rule.use?.includes?.('ignore-loader')) {
                         rule.test = addLessToRuleTest(rule.test);
                     }
-                    else if (((_g = rule.test) === null || _g === void 0 ? void 0 : _g.source) === '\\.module\\.(scss|sass)$') {
+                    else if (rule.test?.source === '\\.module\\.(scss|sass)$') {
                         sassModuleRule = rule;
                     }
-                    else if (((_h = rule.test) === null || _h === void 0 ? void 0 : _h.source) === '(?<!\\.module)\\.(scss|sass)$') {
+                    else if (rule.test?.source === '(?<!\\.module)\\.(scss|sass)$') {
                         sassGlobalRule = rule;
                     }
                 });
                 const lessLoader = {
                     loader: 'less-loader',
-                    options: Object.assign(Object.assign({}, lessLoaderOptions), { lessOptions: Object.assign({ javascriptEnabled: true }, lessLoaderOptions.lessOptions) }),
+                    options: {
+                        ...lessLoaderOptions,
+                        lessOptions: {
+                            javascriptEnabled: true,
+                            // @ts-ignore
+                            ...lessLoaderOptions.lessOptions,
+                        },
+                    },
                 };
                 let lessModuleRule = (0, webpack_merge_1.merge)(sassModuleRule);
                 const configureLessRule = (rule) => {
@@ -67,7 +72,7 @@ function withLess(configOrFn) {
                 return config;
             },
         });
-    });
+    };
 }
 exports.withLess = withLess;
 module.exports = withLess;

package/plugins/with-nx.js

@@ -1,7 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNx = exports.forNextVersion = exports.getAliasForProject = exports.getNextConfig = void 0;
-const tslib_1 = require("tslib");
+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_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',
+];
 function regexEqual(x, y) {
     return (x instanceof RegExp &&
         y instanceof RegExp &&
@@ -51,19 +79,22 @@ function getNxContext(graph, target) {
  * Try to read output dir from project, and default to '.next' if executing outside of Nx (e.g. dist is added to a docker image).
  */
 function withNx(_nextConfig = {}, context = getWithNxContext()) {
-    return (phase) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { PHASE_PRODUCTION_SERVER } = yield Promise.resolve().then(() => require('next/constants'));
+    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 { nx } = _nextConfig, validNextConfig = tslib_1.__rest(_nextConfig, ["nx"]);
-            return Object.assign({ distDir: '.next' }, validNextConfig);
+            const { nx, ...validNextConfig } = _nextConfig;
+            return {
+                distDir: '.next',
+                ...validNextConfig,
+            };
         }
         else {
             const { createProjectGraphAsync, joinPathFragments, offsetFromRoot, workspaceRoot, } = require('@nx/devkit');
             // Otherwise, add in webpack and eslint configuration for build or test.
             let dependencies = [];
-            const graph = yield createProjectGraphAsync();
+            const graph = await createProjectGraphAsync();
             const originalTarget = {
                 project: process.env.NX_TASK_TARGET_PROJECT,
                 target: process.env.NX_TASK_TARGET_TARGET,
@@ -80,14 +111,13 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
             const nextConfig = getNextConfig(_nextConfig, context);
             // For Next.js 13.1 and greater, make sure workspace libs are transpiled.
             forNextVersion('>=13.1.0', () => {
-                var _a;
                 if (!graph.dependencies[project])
                     return;
                 const { readTsConfigPaths } = require('@nx/js');
                 const { findAllProjectNodeDependencies, } = require('nx/src/utils/project-graph-utils');
                 const paths = readTsConfigPaths();
                 const deps = findAllProjectNodeDependencies(project);
-                (_a = nextConfig.transpilePackages) !== null && _a !== void 0 ? _a : (nextConfig.transpilePackages = []);
+                nextConfig.transpilePackages ??= [];
                 for (const dep of deps) {
                     const alias = getAliasForProject(graph.nodes[dep], paths);
                     if (alias) {
@@ -112,23 +142,28 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
             nextConfig.webpack = (a, b) => createWebpackConfig(workspaceRoot, projectDirectory, options.fileReplacements, options.assets)(userWebpackConfig ? userWebpackConfig(a, b) : a, b);
             return nextConfig;
         }
-    });
+    };
 }
 exports.withNx = withNx;
 function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
-    var _a;
     // If `next-compose-plugins` is used, the context argument is invalid.
     if (!context.libsDir || !context.workspaceRoot) {
         context = getWithNxContext();
     }
     const userWebpack = nextConfig.webpack || ((x) => x);
-    const { nx } = nextConfig, validNextConfig = tslib_1.__rest(nextConfig, ["nx"]);
-    return Object.assign(Object.assign({ eslint: Object.assign({ ignoreDuringBuilds: true }, ((_a = validNextConfig.eslint) !== null && _a !== void 0 ? _a : {})) }, validNextConfig), { webpack: (config, options) => {
+    const { nx, ...validNextConfig } = nextConfig;
+    return {
+        eslint: {
+            ignoreDuringBuilds: true,
+            ...(validNextConfig.eslint ?? {}),
+        },
+        ...validNextConfig,
+        webpack: (config, options) => {
             /*
              * Update babel to support our monorepo setup.
              * The 'upward' mode allows the root babel.config.json and per-project .babelrc files to be picked up.
              */
-            if (nx === null || nx === void 0 ? void 0 : nx.babelUpwardRootMode) {
+            if (nx?.babelUpwardRootMode) {
                 options.defaultLoaders.babel.options.babelrc = true;
                 options.defaultLoaders.babel.options.rootMode = 'upward';
             }
@@ -185,10 +220,7 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
             /**
              * 4. Modify css loader to allow global css from node_modules to be imported from workspace libs
              */
-            const nextGlobalCssLoader = nextCssLoaders.oneOf.find((rule) => {
-                var _a, _b;
-                return (_b = (_a = rule.include) === null || _a === void 0 ? void 0 : _a.and) === null || _b === void 0 ? void 0 : _b.find((include) => regexEqual(include, /node_modules/));
-            });
+            const nextGlobalCssLoader = nextCssLoaders.oneOf.find((rule) => rule.include?.and?.find((include) => regexEqual(include, /node_modules/)));
             // Might not be found if Next.js webpack config changes in the future
             if (nextGlobalCssLoader && nextGlobalCssLoader.issuer) {
                 nextGlobalCssLoader.issuer.or = nextGlobalCssLoader.issuer.and
@@ -204,7 +236,7 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
              * 6. Add SVGR support if option is on.
              */
             // Default SVGR support to be on for projects.
-            if ((nx === null || nx === void 0 ? void 0 : nx.svgr) !== false) {
+            if (nx?.svgr !== false) {
                 config.module.rules.push({
                     test: /\.svg$/,
                     oneOf: [
@@ -241,9 +273,13 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
                 });
             }
             return userWebpack(config, options);
-        } });
+        },
+    };
 }
 exports.getNextConfig = getNextConfig;
+function getNonBaseVariables(oldEnv) {
+    return Object.keys(oldEnv).filter((env) => !baseNXEnvironmentVariables.includes(env));
+}
 function getNxEnvironmentVariables() {
     return Object.keys(process.env)
         .filter((env) => /^NX_/i.test(env))
@@ -252,11 +288,13 @@ function getNxEnvironmentVariables() {
         return env;
     }, {});
 }
+/**
+ * TODO(v18)
+ * @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) {
-    var _a;
-    const maybeDefinePlugin = (_a = config.plugins) === null || _a === void 0 ? void 0 : _a.find((plugin) => {
-        var _a;
-        return (_a = plugin.definitions) === null || _a === void 0 ? void 0 : _a['process.env.NODE_ENV'];
+    const maybeDefinePlugin = config.plugins?.find((plugin) => {
+        return plugin.definitions?.['process.env.NODE_ENV'];
     });
     if (maybeDefinePlugin) {
         const env = getNxEnvironmentVariables();
@@ -264,16 +302,17 @@ 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) {
+            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)) {
-        const lookupContainsDepNode = lookup.some((lookupPath) => {
-            var _a, _b;
-            return lookupPath.startsWith((_a = node === null || node === void 0 ? void 0 : node.data) === null || _a === void 0 ? void 0 : _a.root) ||
-                lookupPath.startsWith('./' + ((_b = node === null || node === void 0 ? void 0 : node.data) === null || _b === void 0 ? void 0 : _b.root));
-        });
+        const lookupContainsDepNode = lookup.some((lookupPath) => lookupPath.startsWith(node?.data?.root) ||
+            lookupPath.startsWith('./' + node?.data?.root));
         if (lookupContainsDepNode) {
             return alias;
         }

package/plugins/with-stylus.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withStylus = void 0;
-const tslib_1 = require("tslib");
 // Adapted from https://raw.githubusercontent.com/elado/next-with-less/main/src/index.js
 const webpack_merge_1 = require("webpack-merge");
 const addStylusToRegExp = (rx) => new RegExp(rx.source.replace('|sass', '|sass|styl'), rx.flags);
 function withStylus(configOrFn) {
-    return (phase) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const baseConfig = typeof configOrFn === 'function' ? yield configOrFn(phase) : configOrFn;
-        const { stylusLoaderOptions = {} } = baseConfig, nextConfig = tslib_1.__rest(baseConfig, ["stylusLoaderOptions"]);
+    return async (phase) => {
+        const baseConfig = typeof configOrFn === 'function' ? await configOrFn(phase) : configOrFn;
+        const { stylusLoaderOptions = {}, ...nextConfig } = baseConfig;
         return Object.assign({}, nextConfig, {
             webpack(config, opts) {
                 // there are 2 relevant sass rules in next.js - css modules and global css
                 let sassModuleRule;
                 // global sass rule (does not exist in server builds)
                 let sassGlobalRule;
-                const cssRule = config.module.rules.find((rule) => { var _a; return (_a = rule.oneOf) === null || _a === void 0 ? void 0 : _a.find((r) => r === null || r === void 0 ? void 0 : r[Symbol.for('__next_css_remove')]); });
+                const cssRule = config.module.rules.find((rule) => rule.oneOf?.find((r) => r?.[Symbol.for('__next_css_remove')]));
                 const addStylusRuleToTest = (test) => {
                     if (Array.isArray(test)) {
                         return test.map((rx) => addStylusToRegExp(rx));
@@ -25,28 +24,33 @@ function withStylus(configOrFn) {
                     }
                 };
                 cssRule.oneOf.forEach((rule) => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h;
-                    if ((_a = rule.options) === null || _a === void 0 ? void 0 : _a.__next_css_remove)
+                    if (rule.options?.__next_css_remove)
                         return;
-                    if (((_b = rule.use) === null || _b === void 0 ? void 0 : _b.loader) === 'error-loader') {
+                    if (rule.use?.loader === 'error-loader') {
                         rule.test = addStylusRuleToTest(rule.test);
                     }
-                    else if ((_d = (_c = rule.use) === null || _c === void 0 ? void 0 : _c.loader) === null || _d === void 0 ? void 0 : _d.includes('file-loader')) {
+                    else if (rule.use?.loader?.includes('file-loader')) {
                         rule.issuer = addStylusRuleToTest(rule.issuer);
                     }
-                    else if ((_f = (_e = rule.use) === null || _e === void 0 ? void 0 : _e.includes) === null || _f === void 0 ? void 0 : _f.call(_e, 'ignore-loader')) {
+                    else if (rule.use?.includes?.('ignore-loader')) {
                         rule.test = addStylusRuleToTest(rule.test);
                     }
-                    else if (((_g = rule.test) === null || _g === void 0 ? void 0 : _g.source) === '\\.module\\.(scss|sass)$') {
+                    else if (rule.test?.source === '\\.module\\.(scss|sass)$') {
                         sassModuleRule = rule;
                     }
-                    else if (((_h = rule.test) === null || _h === void 0 ? void 0 : _h.source) === '(?<!\\.module)\\.(scss|sass)$') {
+                    else if (rule.test?.source === '(?<!\\.module)\\.(scss|sass)$') {
                         sassGlobalRule = rule;
                     }
                 });
                 const stylusLoader = {
                     loader: 'stylus-loader',
-                    options: Object.assign(Object.assign({}, stylusLoaderOptions), { stylusOptions: Object.assign({ javascriptEnabled: true }, stylusLoaderOptions.stylusOptions) }),
+                    options: {
+                        ...stylusLoaderOptions,
+                        stylusOptions: {
+                            javascriptEnabled: true,
+                            ...stylusLoaderOptions.stylusOptions,
+                        },
+                    },
                 };
                 let stylusModuleRule = (0, webpack_merge_1.merge)({}, sassModuleRule);
                 const configureStylusRule = (rule) => {
@@ -67,7 +71,7 @@ function withStylus(configOrFn) {
                 return config;
             },
         });
-    });
+    };
 }
 exports.withStylus = withStylus;
 module.exports = withStylus;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
@@ -14,78 +13,74 @@ 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");
 let childProcess;
-function buildExecutor(options, context) {
-    var _a, _b, _c;
-    var _d, _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // Cast to any to overwrite NODE_ENV
-        (_d = process.env).NODE_ENV || (_d.NODE_ENV = 'production');
-        const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
-        (0, check_project_1.checkPublicDirectory)(projectRoot);
-        // Set `__NEXT_REACT_ROOT` based on installed ReactDOM version
-        const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
-        const packageJson = (0, fs_extra_1.existsSync)(packageJsonPath)
-            ? (0, devkit_1.readJsonFile)(packageJsonPath)
-            : undefined;
-        const rootPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.root, 'package.json'));
-        const reactDomVersion = (_b = (_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['react-dom']) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.dependencies) === null || _c === void 0 ? void 0 : _c['react-dom'];
-        const hasReact18 = reactDomVersion &&
-            (0, semver_1.gte)((0, semver_2.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
-        if (hasReact18) {
-            (_e = process.env)['__NEXT_REACT_ROOT'] || (_e['__NEXT_REACT_ROOT'] = 'true');
+async function buildExecutor(options, context) {
+    // Cast to any to overwrite NODE_ENV
+    process.env.NODE_ENV ||= 'production';
+    const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
+    (0, check_project_1.checkPublicDirectory)(projectRoot);
+    // Set `__NEXT_REACT_ROOT` based on installed ReactDOM version
+    const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
+    const packageJson = (0, fs_extra_1.existsSync)(packageJsonPath)
+        ? (0, devkit_1.readJsonFile)(packageJsonPath)
+        : undefined;
+    const rootPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.root, 'package.json'));
+    const reactDomVersion = packageJson?.dependencies?.['react-dom'] ??
+        rootPackageJson.dependencies?.['react-dom'];
+    const hasReact18 = reactDomVersion &&
+        (0, semver_1.gte)((0, semver_2.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
+    if (hasReact18) {
+        process.env['__NEXT_REACT_ROOT'] ||= 'true';
+    }
+    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);
+        return { success: false };
+    }
+    finally {
+        if (childProcess) {
+            childProcess.kill();
         }
-        try {
-            yield 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);
-            return { success: false };
-        }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
-        }
-        if (!(0, fileutils_1.directoryExists)(options.outputPath)) {
-            (0, fs_extra_1.mkdir)(options.outputPath);
-        }
-        const builtPackageJson = (0, js_1.createPackageJson)(context.projectName, context.projectGraph, {
-            target: context.targetName,
-            root: context.root,
-            isProduction: !options.includeDevDependenciesInPackageJson, // By default we remove devDependencies since this is a production build.
-        });
-        // Update `package.json` to reflect how users should run the build artifacts
-        builtPackageJson.scripts = {
-            start: 'next start',
-        };
-        (0, update_package_json_1.updatePackageJson)(builtPackageJson, context);
-        (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
-        if (options.generateLockfile) {
-            const lockFile = (0, js_1.createLockFile)(builtPackageJson);
-            (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)()}`, lockFile, {
-                encoding: 'utf-8',
-            });
-        }
-        // If output path is different from source path, then copy over the config and public files.
-        // This is the default behavior when running `nx build <app>`.
-        if (options.outputPath.replace(/\/$/, '') !== projectRoot) {
-            (0, create_next_config_file_1.createNextConfigFile)(options, context);
-            (0, fs_extra_1.copySync)((0, path_1.join)(projectRoot, 'public'), (0, path_1.join)(options.outputPath, 'public'), {
-                dereference: true,
-            });
-        }
-        return { success: true };
+    }
+    if (!(0, fileutils_1.directoryExists)(options.outputPath)) {
+        (0, fs_extra_1.mkdir)(options.outputPath);
+    }
+    const builtPackageJson = (0, js_1.createPackageJson)(context.projectName, context.projectGraph, {
+        target: context.targetName,
+        root: context.root,
+        isProduction: !options.includeDevDependenciesInPackageJson, // By default we remove devDependencies since this is a production build.
     });
+    // Update `package.json` to reflect how users should run the build artifacts
+    builtPackageJson.scripts = {
+        start: 'next start',
+    };
+    (0, update_package_json_1.updatePackageJson)(builtPackageJson, context);
+    (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
+    if (options.generateLockfile) {
+        const packageManager = (0, devkit_1.detectPackageManager)(context.root);
+        const lockFile = (0, js_1.createLockFile)(builtPackageJson, context.projectGraph, packageManager);
+        (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)(packageManager)}`, lockFile, {
+            encoding: 'utf-8',
+        });
+    }
+    // If output path is different from source path, then copy over the config and public files.
+    // This is the default behavior when running `nx build <app>`.
+    if (options.outputPath.replace(/\/$/, '') !== projectRoot) {
+        (0, create_next_config_file_1.createNextConfigFile)(options, context);
+        (0, fs_extra_1.copySync)((0, path_1.join)(projectRoot, 'public'), (0, path_1.join)(options.outputPath, 'public'), {
+            dereference: true,
+        });
+    }
+    return { success: true };
 }
 exports.default = buildExecutor;
 function runCliBuild(workspaceRoot, projectRoot, options) {
-    var _a;
-    var _b;
     const { experimentalAppOnly, profile, debug, outputPath } = options;
     // Set output path here since it can also be set via CLI
     // We can retrieve it inside plugins/with-nx
-    (_a = (_b = process.env).NX_NEXT_OUTPUT_PATH) !== null && _a !== void 0 ? _a : (_b.NX_NEXT_OUTPUT_PATH = outputPath);
+    process.env.NX_NEXT_OUTPUT_PATH ??= outputPath;
     const args = (0, create_cli_options_1.createCliOptions)({ experimentalAppOnly, profile, debug });
     return new Promise((resolve, reject) => {
         childProcess = (0, child_process_1.fork)(require.resolve('next/dist/bin/next'), ['build', ...args], {

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

@@ -53,9 +53,8 @@ function readSource(getFile) {
 }
 // Exported for testing
 function getWithNxContent({ file, content } = readSource(() => (0, path_1.join)(__dirname, '../../../../plugins/with-nx.js'))) {
-    var _a;
     const withNxSource = ts.createSourceFile(file, content, ts.ScriptTarget.Latest, true);
-    const getWithNxContextDeclaration = (_a = (0, typescript_1.findNodes)(withNxSource, ts.SyntaxKind.FunctionDeclaration)) === null || _a === void 0 ? void 0 : _a.find((node) => { var _a; return ((_a = node.name) === null || _a === void 0 ? void 0 : _a.text) === 'getWithNxContext'; });
+    const getWithNxContextDeclaration = (0, typescript_1.findNodes)(withNxSource, ts.SyntaxKind.FunctionDeclaration)?.find((node) => node.name?.text === 'getWithNxContext');
     if (getWithNxContextDeclaration) {
         content = (0, devkit_1.applyChangesToString)(content, [
             {
@@ -139,8 +138,7 @@ function getRelativeImports({ file, content, }) {
 }
 exports.getRelativeImports = getRelativeImports;
 function stripOuterQuotes(str) {
-    var _a, _b;
-    return (_b = (_a = str.match(/^["'](.*)["']/)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : str;
+    return str.match(/^["'](.*)["']/)?.[1] ?? str;
 }
 // Exported for testing
 function ensureFileExtensions(files, absoluteDir) {

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

@@ -2,21 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePackageJson = void 0;
 function updatePackageJson(packageJson, context) {
-    var _a, _b;
-    var _c;
     if (!packageJson.scripts) {
         packageJson.scripts = {};
     }
     if (!packageJson.scripts.start) {
         packageJson.scripts.start = 'next start';
     }
-    (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
+    packageJson.dependencies ??= {};
     // These are always required for a production Next.js app to run.
     const requiredPackages = ['react', 'react-dom', 'next', 'typescript'];
     for (const pkg of requiredPackages) {
         const externalNode = context.projectGraph.externalNodes[`npm:${pkg}`];
         if (externalNode) {
-            (_b = (_c = packageJson.dependencies)[pkg]) !== null && _b !== void 0 ? _b : (_c[pkg] = externalNode.data.version);
+            packageJson.dependencies[pkg] ??= externalNode.data.version;
         }
     }
 }