@nx/next 16.4.0 → 16.5.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.4.0",
+  "version": "16.5.0-beta.0",
   "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.14.5",
-    "@nrwl/next": "16.4.0",
-    "@nx/devkit": "16.4.0",
-    "@nx/js": "16.4.0",
-    "@nx/linter": "16.4.0",
-    "@nx/react": "16.4.0",
-    "@nx/web": "16.4.0",
-    "@nx/workspace": "16.4.0",
+    "@nrwl/next": "16.5.0-beta.0",
+    "@nx/devkit": "16.5.0-beta.0",
+    "@nx/js": "16.5.0-beta.0",
+    "@nx/linter": "16.5.0-beta.0",
+    "@nx/react": "16.5.0-beta.0",
+    "@nx/web": "16.5.0-beta.0",
+    "@nx/workspace": "16.5.0-beta.0",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -53,7 +53,6 @@
     "semver": "7.5.3",
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
-    "tsconfig-paths-webpack-plugin": "4.0.0",
     "url-loader": "^4.1.1",
     "webpack-merge": "^5.8.0"
   },
@@ -61,5 +60,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "ae698a72748d9f33aa5395aeeaa7b7af436a1dc5"
+  "gitHead": "376d656cfc7f6390ff1cd6d9de348baf7bccbf33"
 }

package/plugins/with-nx.d.ts

@@ -1,3 +1,7 @@
+/**
+ * WARNING: Do not add development dependencies to top-level imports.
+ * Instead, `require` them inline during the build phase.
+ */
 import type { NextConfig } from 'next';
 import type { NextConfigFn } from '../src/utils/config';
 import type { ProjectGraphProjectNode } from '@nx/devkit';

package/plugins/with-nx.js

@@ -2,11 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNx = exports.forNextVersion = exports.getAliasForProject = exports.getNextConfig = void 0;
 const tslib_1 = require("tslib");
-/**
- * WARNING: Do not add development dependencies to top-level imports.
- * Instead, `require` them inline during the build phase.
- */
-const path = require("path");
 function regexEqual(x, y) {
     return (x instanceof RegExp &&
         y instanceof RegExp &&
@@ -26,49 +21,31 @@ function getWithNxContext() {
         libsDir: workspaceLayout().libsDir,
     };
 }
-function getTargetConfig(graph, target) {
-    const projectNode = graph.nodes[target.project];
-    return projectNode.data.targets[target.target];
-}
-function getOptions(graph, target) {
-    const targetConfig = getTargetConfig(graph, target);
-    const options = targetConfig.options;
-    if (target.configuration) {
-        Object.assign(options, targetConfig.configurations[target.configuration]);
-    }
-    return options;
-}
 function getNxContext(graph, target) {
     const { parseTargetString } = require('@nx/devkit');
-    const targetConfig = getTargetConfig(graph, target);
-    if ('@nx/next:build' === targetConfig.executor ||
-        '@nrwl/next:build' === targetConfig.executor) {
-        return {
-            node: graph.nodes[target.project],
-            options: getOptions(graph, target),
-            projectName: target.project,
-            targetName: target.target,
-            configurationName: target.configuration,
-        };
+    const projectNode = graph.nodes[target.project];
+    const targetConfig = projectNode.data.targets[target.target];
+    const targetOptions = targetConfig.options;
+    if (target.configuration) {
+        Object.assign(targetOptions, targetConfig.configurations[target.configuration]);
     }
-    const targetOptions = getOptions(graph, target);
-    // If we are running serve or export pull the options from the dependent target first (ex. build)
     if (targetOptions.devServerTarget) {
-        const devServerTarget = parseTargetString(targetOptions.devServerTarget, graph);
-        return getNxContext(graph, devServerTarget);
-    }
-    else if ([
-        '@nx/next:server',
-        '@nx/next:export',
-        '@nrwl/next:server',
-        '@nrwl/next:export',
-    ].includes(targetConfig.executor)) {
-        const buildTarget = parseTargetString(targetOptions.buildTarget, graph);
-        return getNxContext(graph, buildTarget);
+        // Executors such as @nx/cypress:cypress define the devServerTarget option.
+        return getNxContext(graph, parseTargetString(targetOptions.devServerTarget, graph));
     }
-    else {
-        throw new Error('Could not determine the config for this Next application.');
+    else if (targetOptions.buildTarget) {
+        // Executors such as @nx/next:server or @nx/next:export define the buildTarget option.
+        return getNxContext(graph, parseTargetString(targetOptions.buildTarget, graph));
     }
+    // Default case, return info for current target.
+    // This could be a build using @nx/next:build or run-commands without using our executors.
+    return {
+        node: graph.nodes[target.project],
+        options: targetOptions,
+        projectName: target.project,
+        targetName: target.target,
+        configurationName: target.configuration,
+    };
 }
 /**
  * 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).
@@ -118,14 +95,18 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
                     }
                 }
             });
-            const outputDir = `${offsetFromRoot(projectDirectory)}${options.outputPath}`;
-            nextConfig.distDir =
-                nextConfig.distDir && nextConfig.distDir !== '.next'
-                    ? joinPathFragments(outputDir, nextConfig.distDir)
-                    : joinPathFragments(outputDir, '.next');
+            // 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) {
+                const outputDir = `${offsetFromRoot(projectDirectory)}${options.outputPath}`;
+                nextConfig.distDir =
+                    nextConfig.distDir && nextConfig.distDir !== '.next'
+                        ? joinPathFragments(outputDir, nextConfig.distDir)
+                        : joinPathFragments(outputDir, '.next');
+            }
             const userWebpackConfig = nextConfig.webpack;
             const { createWebpackConfig } = require('../src/utils/config');
-            nextConfig.webpack = (a, b) => createWebpackConfig(workspaceRoot, projectDirectory, options.fileReplacements, options.assets, dependencies, path.join(workspaceRoot, context.libsDir))(userWebpackConfig ? userWebpackConfig(a, b) : a, b);
+            nextConfig.webpack = (a, b) => createWebpackConfig(workspaceRoot, projectDirectory, options.fileReplacements, options.assets)(userWebpackConfig ? userWebpackConfig(a, b) : a, b);
             return nextConfig;
         }
     });

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

@@ -27,7 +27,10 @@ function serveExecutor(options, context) {
                 : 'production';
         // Setting port that the custom server should use.
         process.env.PORT = `${options.port}`;
-        const args = (0, create_cli_options_1.createCliOptions)({ port, keepAliveTimeout, hostname });
+        const args = (0, create_cli_options_1.createCliOptions)({ port, hostname });
+        if (keepAliveTimeout && !options.dev) {
+            args.push(`--keepAliveTimeout=${keepAliveTimeout}`);
+        }
         const nextDir = (0, path_1.resolve)(context.root, buildOptions.outputPath);
         const mode = options.dev ? 'dev' : 'start';
         const turbo = options.turbo && options.dev ? '--turbo' : '';

package/src/utils/config.d.ts

@@ -1,7 +1,6 @@
 import type { NextConfig } from 'next';
 import { Configuration } from 'webpack';
 import { FileReplacement } from './types';
-import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
 export interface NextConfigFn {
     (phase: string, context?: any): Promise<NextConfig> | NextConfig;
 }
@@ -11,4 +10,4 @@ export interface NextPlugin {
 export interface NextPluginThatReturnsConfigFn {
     (config: NextConfig): NextConfigFn;
 }
-export declare function createWebpackConfig(workspaceRoot: string, projectRoot: string, fileReplacements?: FileReplacement[], assets?: any, dependencies?: DependentBuildableProjectNode[], libsDir?: string): (a: any, b: any) => Configuration;
+export declare function createWebpackConfig(workspaceRoot: string, projectRoot: string, fileReplacements?: FileReplacement[], assets?: any): (a: any, b: any) => Configuration;

package/src/utils/config.js

@@ -2,24 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWebpackConfig = void 0;
 const path_1 = require("path");
-const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const create_copy_plugin_1 = require("./create-copy-plugin");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
-function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [], assets = null, dependencies = [], libsDir = '') {
+function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [], assets = null) {
     return function webpackConfig(config, { isServer, }) {
-        const mainFields = ['es2015', 'module', 'main'];
-        const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
-        let tsConfigPath = (0, path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
-        if (dependencies.length > 0) {
-            tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(tsConfigPath, workspaceRoot, projectRoot, dependencies);
-        }
-        config.resolve.plugins = [
-            new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
-                configFile: tsConfigPath,
-                extensions,
-                mainFields,
-            }),
-        ];
         fileReplacements
             .map((fileReplacement) => ({
             replace: (0, path_1.resolve)(workspaceRoot, fileReplacement.replace),
@@ -29,22 +14,6 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
             alias[replacement.replace] = replacement.with;
             return alias;
         }, config.resolve.alias);
-        // Apply any rules that work on ts files to the libsDir as well
-        const rulesToAdd = [];
-        for (const r of config.module.rules) {
-            if (typeof r === 'string') {
-                continue;
-            }
-            if (isTsRule(r)) {
-                rulesToAdd.push(Object.assign(Object.assign({}, r), { include: [libsDir] }));
-            }
-            else if (r.oneOf && r.oneOf.find(isTsRule)) {
-                rulesToAdd.push(Object.assign(Object.assign({}, r), { oneOf: r.oneOf
-                        .filter(isTsRule)
-                        .map((subRule) => (Object.assign(Object.assign({}, subRule), { include: [libsDir] }))) }));
-            }
-        }
-        config.module.rules.push(...rulesToAdd);
         // Copy (shared) assets to `public` folder during client-side compilation
         if (!isServer && Array.isArray(assets) && assets.length > 0) {
             config.plugins.push((0, create_copy_plugin_1.createCopyPlugin)(assets, workspaceRoot, projectRoot));
@@ -53,12 +22,3 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
     };
 }
 exports.createWebpackConfig = createWebpackConfig;
-function isTsRule(r) {
-    if (typeof r === 'string') {
-        return false;
-    }
-    if (!(r.test instanceof RegExp)) {
-        return false;
-    }
-    return r.test.test('a.ts');
-}

package/src/utils/config.fixture.js

@@ -1,3 +0,0 @@
-module.exports = (phase, config, context) => {
-    return Object.assign(Object.assign({}, config), { myPhase: phase, myCustomValue: context.options.customValue });
-};