@nx/remix 17.3.0-beta.5 → 17.3.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "17.3.0-beta.5",
+  "version": "17.3.0-beta.8",
   "description": "The Remix plugin for Nx contains executors and generators for managing Remix applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, routes, loaders, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-beta.5",
-    "@nx/js": "17.3.0-beta.5",
-    "@nx/react": "17.3.0-beta.5",
+    "@nx/devkit": "17.3.0-beta.8",
+    "@nx/js": "17.3.0-beta.8",
+    "@nx/react": "17.3.0-beta.8",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "17.3.0-beta.5"
+    "@nrwl/remix": "17.3.0-beta.8"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/generators/application/application.impl.js

@@ -7,12 +7,14 @@ const lib_1 = require("./lib");
 const update_dependencies_1 = require("../utils/update-dependencies");
 const init_1 = require("../init/init");
 const js_1 = require("@nx/js");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 async function default_1(tree, _options) {
     const options = await (0, lib_1.normalizeOptions)(tree, _options);
     const tasks = [
         await (0, init_1.default)(tree, { skipFormat: true }),
         await (0, js_1.initGenerator)(tree, { skipFormat: true }),
     ];
+    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/remix:build');
     (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
         root: options.projectRoot,
         sourceRoot: `${options.projectRoot}`,
@@ -188,7 +190,6 @@ async function default_1(tree, _options) {
 }
 exports.default = default_1;
 function addFileServerTarget(tree, options, targetName) {
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': (0, versions_1.getPackageVersion)(tree, 'nx') });
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
     projectConfig.targets[targetName] = {
         executor: '@nx/web:file-server',

package/src/generators/init/init.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remixInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function addPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -30,13 +32,17 @@ async function remixInitGenerator(tree, options) {
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
             '@remix-run/serve': versions_1.remixVersion,
         }, {
+            '@nx/web': versions_1.nxVersion,
             '@remix-run/dev': versions_1.remixVersion,
-        });
+        }, undefined, options.keepExistingVersions);
         tasks.push(installTask);
     }
     if (process.env.NX_PCV3 === 'true') {
         addPlugin(tree);
     }
+    if (options.updatePackageScripts) {
+        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/init/schema.d.ts

@@ -1,4 +1,6 @@
 export interface Schema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
+  updatePackageScripts?: boolean;
 }

package/src/generators/init/schema.json

@@ -15,6 +15,18 @@
       "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",
       "default": false
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
+    },
+    "updatePackageScripts": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Update `package.json` scripts with inferred targets",
+      "default": false
     }
   },
   "required": []

package/src/generators/storybook-configuration/schema.json

@@ -85,5 +85,5 @@
       "description": "Add a Storybook Test-Runner target."
     }
   },
-  "required": ["name"]
+  "required": ["project"]
 }