@nx/next 23.0.0-beta.23 → 23.0.0-beta.25

package/{src → dist/src}/generators/init/init.js

@@ -1,70 +1,39 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nextInitGenerator = nextInitGenerator;
 exports.nextInitGeneratorInternal = nextInitGeneratorInternal;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const version_utils_1 = require("@nx/react/src/utils/version-utils");
+const internal_2 = require("@nx/react/internal");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
 const versions_1 = require("../../utils/versions");
-const version_utils_2 = require("../../utils/version-utils");
+const version_utils_1 = require("../../utils/version-utils");
+const assert_supported_next_version_1 = require("../../utils/assert-supported-next-version");
 async function updateDependencies(host, schema) {
     const tasks = [];
     tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/next'], []));
-    const versions = await (0, version_utils_2.getNextDependenciesVersionsToInstall)(host, await (0, version_utils_1.isReact18)(host));
-    const reactVersions = await (0, version_utils_1.getReactDependenciesVersionsToInstall)(host);
+    const versions = await (0, version_utils_1.getNextDependenciesVersionsToInstall)(host, await (0, internal_2.isReact18)(host));
+    const reactVersions = await (0, internal_2.getReactDependenciesVersionsToInstall)(host);
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
         next: versions.next,
         react: reactVersions.react,
         'react-dom': reactVersions['react-dom'],
     }, {
         '@nx/next': versions_1.nxVersion,
-    }, undefined, schema.keepExistingVersions));
+    }, undefined, schema.keepExistingVersions ?? true));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function nextInitGenerator(tree, schema) {
     return nextInitGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function nextInitGeneratorInternal(host, schema) {
+    (0, assert_supported_next_version_1.assertSupportedNextVersion)(host);
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        const { createNodesV2 } = await Promise.resolve().then(() => __importStar(require('../../plugins/plugin')));
+        const { createNodesV2, } = require('../../plugins/plugin');
         await (0, internal_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/next/plugin', createNodesV2, {
             startTargetName: ['start', 'next:start', 'next-start'],
             buildTargetName: ['build', 'next:build', 'next-build'],

package/{src → dist/src}/generators/init/schema.json

@@ -21,7 +21,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     },
     "updatePackageScripts": {
       "type": "boolean",

package/{src → dist/src}/generators/library/lib/normalize-options.d.ts

@@ -6,4 +6,3 @@ export interface NormalizedSchema extends Schema {
     isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;
-//# sourceMappingURL=normalize-options.d.ts.map

package/{src → dist/src}/generators/library/lib/update-vite-config.d.ts

@@ -12,4 +12,3 @@ import { Tree } from '@nx/devkit';
  * @returns true if the config was updated, false otherwise
  */
 export declare function updateViteConfigForServerEntry(tree: Tree, viteConfigPath: string): boolean;
-//# sourceMappingURL=update-vite-config.d.ts.map

package/{src → dist/src}/generators/library/library.d.ts

@@ -3,4 +3,3 @@ import { Schema } from './schema';
 export declare function libraryGenerator(host: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
 export declare function libraryGeneratorInternal(host: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;
-//# sourceMappingURL=library.d.ts.map

package/{src → dist/src}/generators/library/library.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
-const library_1 = require("@nx/react/src/generators/library/library");
+const react_1 = require("@nx/react");
 const js_1 = require("@nx/js");
-const versions_1 = require("@nx/react/src/utils/versions");
+const internal_1 = require("@nx/react/internal");
 const init_1 = require("../init/init");
+const assert_supported_next_version_1 = require("../../utils/assert-supported-next-version");
 const normalize_options_1 = require("./lib/normalize-options");
 const update_vite_config_1 = require("./lib/update-vite-config");
-const versions_2 = require("../../utils/versions");
-const internal_1 = require("@nx/js/internal");
+const versions_1 = require("../../utils/versions");
+const internal_2 = require("@nx/js/internal");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -19,8 +20,9 @@ async function libraryGenerator(host, rawOptions) {
     });
 }
 async function libraryGeneratorInternal(host, rawOptions) {
+    (0, assert_supported_next_version_1.assertSupportedNextVersion)(host);
     const tasks = [];
-    const addTsPlugin = (0, internal_1.shouldConfigureTsSolutionSetup)(host, rawOptions.addPlugin);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(host, rawOptions.addPlugin);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         js: rawOptions.js,
         addTsPlugin,
@@ -34,7 +36,7 @@ async function libraryGeneratorInternal(host, rawOptions) {
         skipFormat: true,
     });
     tasks.push(initTask);
-    const libTask = await (0, library_1.libraryGenerator)(host, {
+    const libTask = await (0, react_1.libraryGenerator)(host, {
         ...options,
         skipFormat: true,
     });
@@ -42,14 +44,14 @@ async function libraryGeneratorInternal(host, rawOptions) {
     if (!options.skipPackageJson) {
         const devDependencies = {};
         if (options.linter === 'eslint') {
-            devDependencies['eslint-config-next'] = versions_2.eslintConfigNextVersion;
-            devDependencies['@next/eslint-plugin-next'] = versions_2.eslintConfigNextVersion;
+            devDependencies['eslint-config-next'] = versions_1.eslintConfigNextVersion;
+            devDependencies['@next/eslint-plugin-next'] = versions_1.eslintConfigNextVersion;
         }
         if (options.unitTestRunner && options.unitTestRunner !== 'none') {
-            devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
-            devDependencies['@testing-library/dom'] = versions_1.testingLibraryDomVersion;
+            devDependencies['@testing-library/react'] = internal_1.testingLibraryReactVersion;
+            devDependencies['@testing-library/dom'] = internal_1.testingLibraryDomVersion;
         }
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, devDependencies));
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_1.tsLibVersion }, devDependencies, undefined, true));
     }
     const indexPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', `index.${options.js ? 'js' : 'ts'}`);
     const indexContent = host.read(indexPath, 'utf-8');
@@ -65,7 +67,7 @@ export async function HelloServer() {
   return <h1>Hello Server</h1>;
 }
 `);
-    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)(host);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host);
     if (!options.skipTsConfig && !isTsSolutionSetup) {
         (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
     }
@@ -85,7 +87,7 @@ export async function HelloServer() {
                 const serverExport = {};
                 // For TS Solution setups, include development condition
                 if (isTsSolutionSetup) {
-                    const customConditionName = (0, internal_1.getDefinedCustomConditionName)(host);
+                    const customConditionName = (0, internal_2.getDefinedCustomConditionName)(host);
                     serverExport[customConditionName] = './src/server.ts';
                 }
                 serverExport.types = './dist/server.d.ts';
@@ -112,7 +114,7 @@ export async function HelloServer() {
         ];
         return json;
     });
-    (0, internal_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+    (0, internal_2.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
@@ -120,9 +122,9 @@ export async function HelloServer() {
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
     if (options.isUsingTsSolutionConfig) {
-        await (0, internal_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
-    (0, internal_1.sortPackageJsonFields)(host, options.projectRoot);
+    (0, internal_2.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/{src → dist/src}/generators/page/page.d.ts

@@ -2,4 +2,3 @@ import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function pageGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default pageGenerator;
-//# sourceMappingURL=page.d.ts.map

package/{src → dist/src}/generators/page/page.js

@@ -5,12 +5,14 @@ const internal_1 = require("@nx/devkit/internal");
 const react_1 = require("@nx/react");
 const devkit_1 = require("@nx/devkit");
 const styles_1 = require("../../utils/styles");
+const assert_supported_next_version_1 = require("../../utils/assert-supported-next-version");
 /*
  * This schematic is basically the React component one, but for Next we need
  * extra dependencies for css, sass, less style options, and make sure
  * it is under `pages` folder.
  */
 async function pageGenerator(host, schema) {
+    (0, assert_supported_next_version_1.assertSupportedNextVersion)(host);
     const options = await normalizeOptions(host, schema);
     const componentTask = await (0, react_1.componentGenerator)(host, {
         ...options,

package/{src → dist/src}/migrations/update-22-0-0/add-svgr-to-next-config.d.ts

@@ -1,3 +1,2 @@
 import { type Tree } from '@nx/devkit';
 export default function addSvgrToNextConfig(tree: Tree): Promise<void>;
-//# sourceMappingURL=add-svgr-to-next-config.d.ts.map