@nx/next 18.3.0-beta.1 → 18.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "18.3.0-beta.1",
+  "version": "18.3.0-beta.2",
   "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": {
@@ -34,7 +34,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "18.3.0-beta.1",
+    "@nx/devkit": "18.3.0-beta.2",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -45,13 +45,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "18.3.0-beta.1",
-    "@nx/eslint": "18.3.0-beta.1",
-    "@nx/react": "18.3.0-beta.1",
-    "@nx/web": "18.3.0-beta.1",
-    "@nx/webpack": "18.3.0-beta.1",
-    "@nx/workspace": "18.3.0-beta.1",
-    "@nrwl/next": "18.3.0-beta.1"
+    "@nx/js": "18.3.0-beta.2",
+    "@nx/eslint": "18.3.0-beta.2",
+    "@nx/react": "18.3.0-beta.2",
+    "@nx/web": "18.3.0-beta.2",
+    "@nx/webpack": "18.3.0-beta.2",
+    "@nx/workspace": "18.3.0-beta.2",
+    "@nrwl/next": "18.3.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/plugins/component-testing.js

@@ -8,7 +8,7 @@ const react_1 = require("@nx/react");
 const webpack_1 = require("@nx/webpack");
 const path_1 = require("path");
 function nxComponentTestingPreset(pathToConfig, options) {
-    if (global.NX_GRAPH_CREATION || global.NX_CYPRESS_INIT_GENERATOR_RUNNING) {
+    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);

package/src/generators/init/init.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nextInitGeneratorInternal = exports.nextInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const versions_1 = require("@nx/react/src/utils/versions");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
 const versions_2 = require("../../utils/versions");
-const add_plugin_1 = require("./lib/add-plugin");
 function updateDependencies(host, schema) {
     const tasks = [];
     tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/next'], []));
@@ -29,17 +28,23 @@ async function nextInitGeneratorInternal(host, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        (0, add_plugin_1.addPlugin)(host);
+        const { createNodes } = await Promise.resolve().then(() => require('../../plugins/plugin'));
+        await (0, add_plugin_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/next/plugin', createNodes, {
+            startTargetName: ['start', 'next:start', 'next-start'],
+            buildTargetName: ['build', 'next:build', 'next-build'],
+            devTargetName: ['dev', 'next:dev', 'next-dev'],
+            serveStaticTargetName: [
+                'serve-static',
+                'next:serve-static',
+                'next-serve-static',
+            ],
+        }, schema.updatePackageScripts);
     }
     (0, add_gitignore_entry_1.addGitIgnoreEntry)(host);
     let installTask = () => { };
     if (!schema.skipPackageJson) {
         installTask = updateDependencies(host, schema);
     }
-    if (schema.updatePackageScripts) {
-        const { createNodes } = await Promise.resolve().then(() => require('../../plugins/plugin'));
-        await (0, update_package_scripts_1.updatePackageScripts)(host, createNodes);
-    }
     return installTask;
 }
 exports.nextInitGeneratorInternal = nextInitGeneratorInternal;

package/src/generators/init/lib/add-plugin.d.ts

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

package/src/generators/init/lib/add-plugin.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addPlugin = void 0;
-const devkit_1 = require("@nx/devkit");
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/next/plugin'
-            : plugin.plugin === '@nx/next/plugin') {
-            return;
-        }
-    }
-    nxJson.plugins.push({
-        plugin: '@nx/next/plugin',
-        options: {
-            buildTargetName: 'build',
-            devTargetName: 'dev',
-            startTargetName: 'start',
-            serveStaticTargetName: 'serve-static',
-        },
-    });
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
-exports.addPlugin = addPlugin;