@nx/next 0.0.0-pr-3-5e7ccde → 0.0.0-pr-29464-c4b160c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "0.0.0-pr-3-5e7ccde",
+  "version": "0.0.0-pr-29464-c4b160c",
   "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, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-3-5e7ccde",
+    "@nx/devkit": "0.0.0-pr-29464-c4b160c",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -44,11 +44,11 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "0.0.0-pr-3-5e7ccde",
-    "@nx/eslint": "0.0.0-pr-3-5e7ccde",
-    "@nx/react": "0.0.0-pr-3-5e7ccde",
-    "@nx/web": "0.0.0-pr-3-5e7ccde",
-    "@nx/webpack": "0.0.0-pr-3-5e7ccde",
+    "@nx/js": "0.0.0-pr-29464-c4b160c",
+    "@nx/eslint": "0.0.0-pr-29464-c4b160c",
+    "@nx/react": "0.0.0-pr-29464-c4b160c",
+    "@nx/web": "0.0.0-pr-29464-c4b160c",
+    "@nx/webpack": "0.0.0-pr-29464-c4b160c",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -24,6 +24,7 @@ const versions_2 = require("../../utils/versions");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server");
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
@@ -70,6 +71,10 @@ async function applicationGeneratorInternal(host, schema) {
     (0, update_jest_config_1.updateJestConfig)(host, options);
     (0, update_cypress_tsconfig_1.updateCypressTsConfig)(host, options);
     (0, set_defaults_1.setDefaults)(host, options);
+    if (options.swc) {
+        const swcTask = (0, add_swc_to_custom_server_1.configureForSwc)(host, options.appProjectRoot);
+        tasks.push(swcTask);
+    }
     if (options.customServer) {
         await (0, custom_server_1.customServerGenerator)(host, {
             project: options.projectName,

package/src/generators/custom-server/custom-server.js

@@ -8,20 +8,17 @@ const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function customServerGenerator(host, options) {
     const project = (0, devkit_2.readProjectConfiguration)(host, options.project);
+    const swcServerName = '.server.swcrc';
     const nxJson = (0, devkit_2.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/next/plugin'
         : p.plugin === '@nx/next/plugin');
-    if (project.targets?.build?.executor !== '@nx/next:build' &&
-        project.targets?.build?.executor !== '@nrwl/next:build' &&
-        !hasPlugin) {
+    if (project.targets?.build?.executor !== '@nx/next:build' && !hasPlugin) {
         devkit_2.logger.error(`Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nx/next:app"?`);
         return;
     }
     // In Nx 18 next artifacts are inside the project root .next/ & dist/ (for custom server)
-    const outputPath = hasPlugin
-        ? `dist/${project.root}`
-        : project.targets?.build?.options?.outputPath;
+    const outputPath = `dist/${project.root}-server`;
     const root = project.root;
     if ((!root ||
         !outputPath ||
@@ -38,7 +35,9 @@ async function customServerGenerator(host, options) {
     }
     // In Nx 18 next artifacts are inside the project root .next/ & dist/ (for custom server)
     // So we need ensure the mapping is correct from dist to the project root
-    const projectPathFromDist = `../../${(0, devkit_2.offsetFromRoot)(project.root)}${project.root}`;
+    const projectPathFromDist = hasPlugin
+        ? `../../${(0, devkit_2.offsetFromRoot)(project.root)}${project.root}`
+        : `${(0, devkit_2.offsetFromRoot)(`dist/${project.root}`)}${project.root}`;
     const offset = (0, devkit_2.offsetFromRoot)(project.root);
     const isTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     (0, devkit_2.generateFiles)(host, (0, path_1.join)(__dirname, 'files'), project.root, {
@@ -72,6 +71,9 @@ async function customServerGenerator(host, options) {
             tsConfig: `${root}/tsconfig.server.json`,
             clean: false,
             assets: [],
+            ...(options.compiler === 'tsc'
+                ? {}
+                : { swcrc: `${root}/${swcServerName}` }),
         },
         configurations: {
             development: {},
@@ -105,6 +107,11 @@ async function customServerGenerator(host, options) {
         return json;
     });
     if (options.compiler === 'swc') {
-        return (0, add_swc_to_custom_server_1.configureForSwc)(host, project.root);
+        // Update app swc to exlude server files
+        (0, devkit_2.updateJson)(host, (0, path_1.join)(project.root, '.swcrc'), (json) => {
+            json.exclude = [...(json.exclude ?? []), 'server/**'];
+            return json;
+        });
+        return (0, add_swc_to_custom_server_1.configureForSwc)(host, project.root, swcServerName, ['src/**/*']);
     }
 }

package/src/generators/custom-server/files/server/main.ts__tmpl__

@@ -15,8 +15,8 @@ import next from 'next';
 // - The fallback `__dirname` is for production builds.
 // - Feel free to change this to suit your needs.
 
-const dir = process.env.NX_NEXT_DIR || <%- hasPlugin ? `path.join(__dirname, '${projectPathFromDist}')` : `path.join(__dirname, '..')`; %> 
 const dev = process.env.NODE_ENV === 'development';
+const dir = process.env.NX_NEXT_DIR || <%- hasPlugin ? `path.join(__dirname, '${projectPathFromDist}')` : `path.join(__dirname, dev ? '..' : '', '${projectPathFromDist}')`; %> 
 
 // HTTP Server options:
 // - Feel free to change this to suit your needs.

package/src/utils/add-swc-to-custom-server.d.ts

@@ -1,2 +1,2 @@
 import { Tree } from '@nx/devkit';
-export declare function configureForSwc(tree: Tree, projectRoot: string): () => void;
+export declare function configureForSwc(tree: Tree, projectRoot: string, swcConfigName?: string, additonalExludes?: string[]): () => void;

package/src/utils/add-swc-to-custom-server.js

@@ -4,28 +4,24 @@ exports.configureForSwc = configureForSwc;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/js/src/utils/versions");
 const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
-function configureForSwc(tree, projectRoot) {
-    const swcConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, '.swcrc');
+function configureForSwc(tree, projectRoot, swcConfigName = '.swcrc', additonalExludes = []) {
+    const swcConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, swcConfigName);
     const rootPackageJson = (0, devkit_1.readJson)(tree, 'package.json');
     const hasSwcDepedency = rootPackageJson.dependencies?.['@swc/core'] ||
         rootPackageJson.devDependencies?.['@swc/core'];
     const hasSwcCliDependency = rootPackageJson.dependencies?.['@swc/cli'] ||
         rootPackageJson.devDependencies?.['@swc/cli'];
     if (!tree.exists(swcConfigPath)) {
-        (0, add_swc_config_1.addSwcConfig)(tree, projectRoot);
-    }
-    if (tree.exists(swcConfigPath)) {
-        (0, devkit_1.updateJson)(tree, swcConfigPath, (json) => {
-            return {
-                ...json,
-                exclude: [...json.exclude, '.*.d.ts$'],
-            };
-        });
+        // We need to create a swc config file specific for custom server
+        (0, add_swc_config_1.addSwcConfig)(tree, projectRoot, 'commonjs', false, swcConfigName, [
+            ...additonalExludes,
+            '.*.d.ts$',
+        ]);
     }
     if (!hasSwcDepedency || !hasSwcCliDependency) {
         addSwcDependencies(tree);
-        return () => (0, devkit_1.installPackagesTask)(tree);
     }
+    return () => (0, devkit_1.installPackagesTask)(tree);
 }
 function addSwcDependencies(tree) {
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {

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

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

package/src/executors/build/schema.json

@@ -1,89 +0,0 @@
-{
-  "version": 2,
-  "outputCapture": "pipe",
-  "$schema": "https://json-schema.org/schema",
-  "cli": "nx",
-  "title": "Next Build",
-  "description": "Build a Next.js app.",
-  "type": "object",
-  "properties": {
-    "outputPath": {
-      "type": "string",
-      "description": "The output path of the generated files.",
-      "x-completion-type": "directory",
-      "x-priority": "important"
-    },
-    "fileReplacements": {
-      "description": "Replace files with other files in the build.",
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "replace": {
-            "type": "string",
-            "description": "The file to be replaced.",
-            "x-completion-type": "file"
-          },
-          "with": {
-            "type": "string",
-            "description": "The file to replace with.",
-            "x-completion-type": "file"
-          }
-        },
-        "additionalProperties": false,
-        "required": ["replace", "with"]
-      },
-      "default": []
-    },
-    "nextConfig": {
-      "description": "Path (relative to workspace root) to a function which takes phase, config, and builder options, and returns the resulting config. This is an advanced option and should not be used with a normal Next.js config file (i.e. `next.config.js`).",
-      "type": "string",
-      "x-completion-type": "file",
-      "x-completion-glob": "next?(*).js",
-      "x-priority": "important"
-    },
-    "buildLibsFromSource": {
-      "type": "boolean",
-      "description": "Read buildable libraries from source instead of building them separately.",
-      "default": true
-    },
-    "includeDevDependenciesInPackageJson": {
-      "type": "boolean",
-      "description": "Include `devDependencies` in the generated package.json file. By default only production `dependencies` are included.",
-      "default": false
-    },
-    "generateLockfile": {
-      "type": "boolean",
-      "description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
-      "default": false,
-      "x-priority": "internal"
-    },
-    "skipOverrides": {
-      "type": "boolean",
-      "description": "Do not add a `overrides` and `resolutions` entries to the generated package.json file. Only works in conjunction with `generatePackageJson` option."
-    },
-    "skipPackageManager": {
-      "type": "boolean",
-      "description": "Do not add a `packageManager` entry to the generated package.json file."
-    },
-    "debug": {
-      "type": "boolean",
-      "description": "Enable Next.js debug build logging"
-    },
-    "profile": {
-      "type": "boolean",
-      "description": "Used to enable React Production Profiling"
-    },
-    "experimentalAppOnly": {
-      "type": "boolean",
-      "description": "Only build 'app' routes"
-    },
-    "experimentalBuildMode": {
-      "type": "string",
-      "description": "Change the build mode.",
-      "enum": ["compile", "generate"]
-    }
-  },
-  "required": ["outputPath"],
-  "examplesFile": "../../../docs/build-next-executor-examples.md"
-}