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

package/dist/plugins/component-testing.js

@@ -7,16 +7,17 @@ const devkit_1 = require("@nx/devkit");
 const internal_2 = require("@nx/js/internal");
 const react_1 = require("@nx/react");
 const internal_3 = require("@nx/react/internal");
-const webpack_1 = require("@nx/webpack");
-const internal_4 = require("@nx/webpack/internal");
-const configuration_1 = require("nx/src/config/configuration");
 const path_1 = require("path");
+const internal_4 = require("@nx/devkit/internal");
 function nxComponentTestingPreset(pathToConfig, options) {
     if (global.NX_GRAPH_CREATION) {
         // 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);
     }
+    (0, internal_3.assertPackageIsInstalled)('@nx/webpack', '@nx/next/plugins/component-testing');
+    const { composePluginsSync, withNx, } = require('@nx/webpack');
+    const { suppressWebpackComposeHelperWarnings, } = require('@nx/webpack/internal');
     const graph = (0, devkit_1.readCachedProjectGraph)();
     const { targets: ctTargets, name: ctProjectName } = (0, internal_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctTargetName = options?.ctTargetName || 'component-test';
@@ -39,7 +40,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
             cwd: process.cwd(),
             root: devkit_1.workspaceRoot,
             projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph),
-            nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
+            nxJsonConfiguration: (0, internal_4.readNxJsonFromDisk)(devkit_1.workspaceRoot),
             isVerbose: false,
             projectName: ctProjectName,
             projectGraph: graph,
@@ -83,8 +84,8 @@ Able to find CT project, ${!!ctProjectConfig}.`);
     };
     // Nx composes these helpers internally for the Cypress CT preset; suppress
     // their deprecation warning so it fires only for user-authored configs.
-    const webpackConfig = (0, internal_4.suppressWebpackComposeHelperWarnings)(() => (0, internal_3.suppressReactComposeHelperWarnings)(() => {
-        const configure = (0, webpack_1.composePluginsSync)((0, webpack_1.withNx)({
+    const webpackConfig = suppressWebpackComposeHelperWarnings(() => (0, internal_3.suppressReactComposeHelperWarnings)(() => {
+        const configure = composePluginsSync(withNx({
             target: 'web',
             styles: [],
             scripts: [],

package/dist/plugins/with-nx.js

@@ -103,7 +103,7 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
                 if (!graph.dependencies[project])
                     return;
                 const { readTsConfigPaths } = require('@nx/js');
-                const { findAllProjectNodeDependencies, } = require('nx/src/utils/project-graph-utils');
+                const { findAllProjectNodeDependencies, } = require('@nx/devkit/internal');
                 const paths = readTsConfigPaths();
                 const deps = findAllProjectNodeDependencies(project);
                 nextConfig.transpilePackages ??= [];

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

@@ -1,3 +1,3 @@
 import type { ExecutorContext } from '@nx/devkit';
-import type { PackageJson } from 'nx/src/utils/package-json';
+import { type PackageJson } from '@nx/devkit/internal';
 export declare function updatePackageJson(packageJson: PackageJson, context: ExecutorContext): void;

package/dist/src/migrations/update-23-2-0/add-svgr-webpack-if-used.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function addSvgrWebpackIfUsed(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;

package/dist/src/migrations/update-23-2-0/add-svgr-webpack-if-used.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = addSvgrWebpackIfUsed;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+// The Nx 22 `add-svgr-to-next-config` migration inlined a `withSvgr` helper
+// that resolves `@svgr/webpack` into user next configs, but never added the
+// package to the workspace - it only resolved transitively through `@nx/next`.
+// Now that `@nx/next` no longer depends on it, backfill it where a next config
+// actually references it.
+const nextConfigFileNames = [
+    'next.config.js',
+    'next.config.cjs',
+    'next.config.mjs',
+    'next.config.ts',
+];
+async function addSvgrWebpackIfUsed(tree) {
+    let needsSvgr = false;
+    for (const [, project] of (0, devkit_1.getProjects)(tree)) {
+        for (const fileName of nextConfigFileNames) {
+            const path = (0, devkit_1.joinPathFragments)(project.root, fileName);
+            needsSvgr ||=
+                tree.exists(path) && tree.read(path, 'utf-8').includes('@svgr/webpack');
+        }
+        if (needsSvgr) {
+            break;
+        }
+    }
+    if (!needsSvgr) {
+        return;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@svgr/webpack': versions_1.svgrWebpackVersion }, undefined, true);
+}

package/dist/src/migrations/update-23-2-0/add-svgr-webpack-if-used.md

@@ -0,0 +1,28 @@
+#### Add `@svgr/webpack` If Used
+
+Adds `@svgr/webpack` to the workspace when a next config references it.
+
+`@svgr/webpack` is no longer a dependency of `@nx/next`, so workspaces whose next configs resolve it - which is what the Nx 22 `add-svgr-to-next-config` migration inlined - must declare it themselves. This migration backfills it for those workspaces. Workspaces that already have `@svgr/webpack` are left untouched.
+
+#### Examples
+
+##### Before
+
+```jsonc title="package.json"
+{
+  "devDependencies": {
+    "@nx/next": "23.1.0",
+  },
+}
+```
+
+##### After
+
+```jsonc title="package.json"
+{
+  "devDependencies": {
+    "@nx/next": "23.1.0",
+    "@svgr/webpack": "^8.0.1",
+  },
+}
+```

package/dist/src/plugins/plugin.js

@@ -6,8 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const internal_2 = require("@nx/js/internal");
 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 nextConfigBlob = '**/next.config.{ts,js,cjs,mjs}';
 /**
@@ -20,8 +18,8 @@ exports.createDependencies = createDependencies;
 exports.createNodes = [
     nextConfigBlob,
     async (configFiles, options, context) => {
-        const optionsHash = (0, devkit_internals_1.hashObject)(options);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `next-${optionsHash}.json`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(internal_1.workspaceDataDirectory, `next-${optionsHash}.json`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);

package/dist/src/utils/add-gitignore-entry.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from 'nx/src/generators/tree';
+import { Tree } from '@nx/devkit';
 export declare function addGitIgnoreEntry(host: Tree): void;

package/dist/src/utils/create-copy-plugin.js

@@ -2,24 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCopyPlugin = createCopyPlugin;
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const path_1 = require("nx/src/utils/path");
-const path_2 = require("path");
+const path_1 = require("path");
 const fs_1 = require("fs");
+const devkit_1 = require("@nx/devkit");
 function normalizeAssets(assets, root, sourceRoot) {
     return assets.map((asset) => {
         if (typeof asset === 'string') {
-            const assetPath = (0, path_1.normalizePath)(asset);
-            const resolvedAssetPath = (0, path_2.resolve)(root, assetPath);
-            const resolvedSourceRoot = (0, path_2.resolve)(root, sourceRoot);
+            const assetPath = (0, devkit_1.normalizePath)(asset);
+            const resolvedAssetPath = (0, path_1.resolve)(root, assetPath);
+            const resolvedSourceRoot = (0, path_1.resolve)(root, sourceRoot);
             if (!resolvedAssetPath.startsWith(resolvedSourceRoot)) {
                 throw new Error(`The ${resolvedAssetPath} asset path must start with the project source root: ${sourceRoot}`);
             }
             const isDirectory = (0, fs_1.statSync)(resolvedAssetPath).isDirectory();
             const input = isDirectory
                 ? resolvedAssetPath
-                : (0, path_2.dirname)(resolvedAssetPath);
-            const output = (0, path_2.relative)(resolvedSourceRoot, (0, path_2.resolve)(root, input));
-            const glob = isDirectory ? '**/*' : (0, path_2.basename)(resolvedAssetPath);
+                : (0, path_1.dirname)(resolvedAssetPath);
+            const output = (0, path_1.relative)(resolvedSourceRoot, (0, path_1.resolve)(root, input));
+            const glob = isDirectory ? '**/*' : (0, path_1.basename)(resolvedAssetPath);
             return {
                 input,
                 output,
@@ -30,8 +30,8 @@ function normalizeAssets(assets, root, sourceRoot) {
             if (asset.output.startsWith('..')) {
                 throw new Error('An asset cannot be written to a location outside of the output path.');
             }
-            const assetPath = (0, path_1.normalizePath)(asset.input);
-            const resolvedAssetPath = (0, path_2.resolve)(root, assetPath);
+            const assetPath = (0, devkit_1.normalizePath)(asset.input);
+            const resolvedAssetPath = (0, path_1.resolve)(root, assetPath);
             return {
                 ...asset,
                 input: resolvedAssetPath,
@@ -46,7 +46,7 @@ function createCopyPlugin(assets, root, sourceRoot) {
         patterns: normalizeAssets(assets, root, sourceRoot).map((asset) => {
             return {
                 context: asset.input,
-                to: (0, path_2.join)('../public', asset.output),
+                to: (0, path_1.join)('../public', asset.output),
                 from: asset.glob,
                 globOptions: {
                     ignore: [

package/dist/src/utils/versions.d.ts

@@ -10,3 +10,4 @@ export declare const eslintConfigNext14Version = "^15.5.18";
 export declare const eslintConfigNextVersion = "^16.1.6";
 export declare const sassVersion = "1.97.2";
 export declare const tsLibVersion = "^2.3.0";
+export declare const svgrWebpackVersion = "^8.0.1";

package/dist/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsLibVersion = exports.sassVersion = exports.eslintConfigNextVersion = exports.eslintConfigNext14Version = exports.eslintConfigNext15Version = exports.eslintConfigNext16Version = exports.nextVersion = exports.next14Version = exports.next15Version = exports.next16Version = exports.minSupportedNextVersion = exports.nxVersion = void 0;
+exports.svgrWebpackVersion = exports.tsLibVersion = exports.sassVersion = exports.eslintConfigNextVersion = exports.eslintConfigNext14Version = exports.eslintConfigNext15Version = exports.eslintConfigNext16Version = exports.nextVersion = exports.next14Version = exports.next15Version = exports.next16Version = exports.minSupportedNextVersion = exports.nxVersion = void 0;
 const path_1 = require("path");
 exports.nxVersion = require((0, path_1.join)('@nx/next', 'package.json')).version;
 exports.minSupportedNextVersion = '14.0.0';
@@ -15,3 +15,4 @@ exports.eslintConfigNext14Version = '^15.5.18';
 exports.eslintConfigNextVersion = exports.eslintConfigNext16Version;
 exports.sassVersion = '1.97.2';
 exports.tsLibVersion = '^2.3.0';
+exports.svgrWebpackVersion = '^8.0.1';

package/migrations.json

@@ -29,6 +29,12 @@
       "description": "Create AI instructions to help migrate workspaces from Next.js 14 to 15.",
       "prompt": "./dist/src/migrations/update-23-1-0/ai-instructions-for-next-15.md",
       "documentation": "./dist/src/migrations/update-23-1-0/upgrade-to-next-15.md"
+    },
+    "update-23-2-0-add-svgr-webpack-if-used": {
+      "version": "23.2.0-beta.4",
+      "description": "Add `@svgr/webpack` when a next config references it.",
+      "implementation": "./dist/src/migrations/update-23-2-0/add-svgr-webpack-if-used",
+      "documentation": "./dist/src/migrations/update-23-2-0/add-svgr-webpack-if-used.md"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "23.2.0-beta.3",
+  "version": "23.2.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, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -67,28 +67,33 @@
     "supportsOptionalMigrations": true
   },
   "peerDependencies": {
-    "next": ">=14.0.0 <17.0.0"
+    "next": ">=14.0.0 <17.0.0",
+    "@nx/webpack": "23.2.0-beta.5"
+  },
+  "peerDependenciesMeta": {
+    "@nx/webpack": {
+      "optional": true
+    }
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.22.7",
-    "@svgr/webpack": "^8.0.1",
     "copy-webpack-plugin": "^14.0.0",
     "ignore": "^7.0.5",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/devkit": "23.2.0-beta.3",
-    "@nx/js": "23.2.0-beta.3",
-    "@nx/eslint": "23.2.0-beta.3",
-    "@nx/react": "23.2.0-beta.3",
-    "@nx/web": "23.2.0-beta.3",
-    "@nx/webpack": "23.2.0-beta.3"
+    "@nx/devkit": "23.2.0-beta.5",
+    "@nx/js": "23.2.0-beta.5",
+    "@nx/eslint": "23.2.0-beta.5",
+    "@nx/react": "23.2.0-beta.5",
+    "@nx/web": "23.2.0-beta.5"
   },
   "devDependencies": {
-    "@nx/cypress": "23.2.0-beta.3",
-    "@nx/playwright": "23.2.0-beta.3",
-    "nx": "23.2.0-beta.3"
+    "@nx/cypress": "23.2.0-beta.5",
+    "@nx/playwright": "23.2.0-beta.5",
+    "@nx/webpack": "23.2.0-beta.5",
+    "nx": "23.2.0-beta.5"
   },
   "publishConfig": {
     "access": "public"