@nx/next 22.7.0-pr.35019.f500fd7 → 22.7.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "22.7.0-pr.35019.f500fd7",
+  "version": "22.7.0-rc.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, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -18,7 +18,8 @@
     "Front-end"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -35,7 +36,7 @@
     "next": ">=14.0.0 <17.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-pr.35019.f500fd7",
+    "@nx/devkit": "22.7.0-rc.0",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^14.0.0",
@@ -43,21 +44,19 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "22.7.0-pr.35019.f500fd7",
-    "@nx/eslint": "22.7.0-pr.35019.f500fd7",
-    "@nx/react": "22.7.0-pr.35019.f500fd7",
-    "@nx/web": "22.7.0-pr.35019.f500fd7",
-    "@nx/webpack": "22.7.0-pr.35019.f500fd7",
+    "@nx/js": "22.7.0-rc.0",
+    "@nx/eslint": "22.7.0-rc.0",
+    "@nx/react": "22.7.0-rc.0",
+    "@nx/web": "22.7.0-rc.0",
+    "@nx/webpack": "22.7.0-rc.0",
     "@phenomnomnominal/tsquery": "~6.1.4"
   },
   "devDependencies": {
-    "@nx/cypress": "22.7.0-pr.35019.f500fd7",
-    "@nx/playwright": "22.7.0-pr.35019.f500fd7",
-    "nx": "22.7.0-pr.35019.f500fd7"
+    "@nx/cypress": "22.7.0-rc.0",
+    "@nx/playwright": "22.7.0-rc.0",
+    "nx": "22.7.0-rc.0"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/src/executors/build/lib/update-package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-package-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/update-package-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,eAAe,QA4BzB"}
+{"version":3,"file":"update-package-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/update-package-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,eAAe,QA8BzB"}

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

@@ -12,6 +12,7 @@ function updatePackageJson(packageJson, context) {
     // These are always required for a production Next.js app to run.
     // sharp is for next/image https://nextjs.org/docs/messages/sharp-missing-in-production
     // critters is required for experimental optimizing CSS
+    // semver is required by .nx-helpers/with-nx.js at runtime
     const requiredPackages = [
         'react',
         'react-dom',
@@ -19,6 +20,7 @@ function updatePackageJson(packageJson, context) {
         'typescript',
         'sharp',
         'critters',
+        'semver',
     ];
     for (const pkg of requiredPackages) {
         const externalNode = context.projectGraph.externalNodes[`npm:${pkg}`];

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAOd,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAuBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CA0BxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAOd,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAqBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CA8BxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -12,7 +12,6 @@ const fs_1 = require("fs");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const path_1 = require("path");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 const nextConfigBlob = '**/next.config.{ts,js,cjs,mjs}';
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
@@ -38,8 +37,9 @@ exports.createNodes = [
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `next-${optionsHash}.json`);
         const targetsCache = readTargetsCache(cachePath);
         const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup), configFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc), configFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -47,7 +47,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
@@ -57,7 +57,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     }
     options = normalizeOptions(options);
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await buildNextTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup);
+    targetsCache[hash] ??= await buildNextTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc);
     return {
         projects: {
             [projectRoot]: {
@@ -67,7 +67,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function buildNextTargets(nextConfigPath, projectRoot, options, context, isTsSolutionSetup) {
+async function buildNextTargets(nextConfigPath, projectRoot, options, context, isTsSolutionSetup, pmc) {
     const nextConfig = await getNextConfig(nextConfigPath, context);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
@@ -160,10 +160,14 @@ function normalizeOptions(options) {
 function getInputs(namedInputs) {
     return [
         ...('production' in namedInputs
-            ? ['default', '^production']
+            ? ['default', '^default']
             : ['default', '^default']),
         {
             externalDependencies: ['next'],
         },
+        {
+            dependentTasksOutputFiles: '**/*.d.ts',
+            transitive: true,
+        },
     ];
 }

package/src/utils/jest-config-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-config-util.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/jest-config-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkB,MAAM,YAAY,CAAC;AAelD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,QAwDF"}
+{"version":3,"file":"jest-config-util.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/jest-config-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkB,MAAM,YAAY,CAAC;AAelD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,QAkFF"}

package/src/utils/jest-config-util.js

@@ -22,6 +22,10 @@ function updateJestConfig(host, options) {
     const offset = (0, devkit_1.offsetFromRoot)(options.projectRoot);
     const isCommonJS = configPath.endsWith('.js') || configPath.endsWith('.cts');
     // Easier to override the whole file rather than replace content since the structure has changed with `next/jest.js` being used.
+    // The wrapper around createJestConfig disables SWC path alias resolution.
+    // Without explicit baseUrl, Next.js resolves aliases from the app root instead
+    // of the workspace root, producing wrong paths. The Nx jest resolver handles
+    // alias resolution correctly, so we let it take over.
     const newContent = isCommonJS
         ? `const nextJest = require('next/jest.js');
 
@@ -40,7 +44,18 @@ const config = {
   testEnvironment: 'jsdom',
 };
 
-module.exports = createJestConfig(config);
+const jestConfig = createJestConfig(config);
+
+module.exports = async () => {
+  const resolved = await jestConfig();
+  // Disable SWC path alias resolution — handled by Nx jest resolver.
+  for (const value of Object.values(resolved.transform)) {
+    if (Array.isArray(value) && value[1]?.resolvedBaseUrl) {
+      value[1] = { ...value[1], resolvedBaseUrl: undefined };
+    }
+  }
+  return resolved;
+};
 `
         : `import type { Config } from 'jest';
 import nextJest from 'next/jest.js';
@@ -60,7 +75,18 @@ const config: Config = {
   testEnvironment: 'jsdom',
 };
 
-export default createJestConfig(config);
+const jestConfig = createJestConfig(config);
+
+export default async () => {
+  const resolved = await jestConfig();
+  // Disable SWC path alias resolution — handled by Nx jest resolver.
+  for (const value of Object.values(resolved.transform)) {
+    if (Array.isArray(value) && value[1]?.resolvedBaseUrl) {
+      value[1] = { ...value[1], resolvedBaseUrl: undefined };
+    }
+  }
+  return resolved;
+};
 `;
     host.write(configPath, newContent);
 }

package/project.json

@@ -1,57 +0,0 @@
-{
-    "name": "next",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/next",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/next/README.md"],
-            "command": "node ./scripts/copy-readme.js next"
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/next",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/next",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/next",
-                        "glob": "**/files/**/.babelrc__tmpl__",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/next",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/next",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/next",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    }
-}

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

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