@nx/remix 20.5.0 → 20.6.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "20.5.0",
+  "version": "20.6.0-beta.1",
   "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, Playwright, 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",
@@ -29,9 +29,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.5.0",
-    "@nx/js": "20.5.0",
-    "@nx/react": "20.5.0",
+    "@nx/devkit": "20.6.0-beta.1",
+    "@nx/js": "20.6.0-beta.1",
+    "@nx/react": "20.6.0-beta.1",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

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

@@ -17,6 +17,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: true,
+        useProjectJson: true,
         ...options,
     });
 }
@@ -40,9 +41,9 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
-    if (!options.isUsingTsSolutionConfig) {
+    if (options.useProjectJson) {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
             root: options.projectRoot,
             sourceRoot: `${options.projectRoot}`,
@@ -81,6 +82,8 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     }
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/ts-solution'), options.projectRoot, vars);
+    }
+    if (!options.useProjectJson) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
             if (options.projectName !== options.importPath) {
                 json.nx = { name: options.projectName };

package/src/generators/application/lib/add-e2e.js

@@ -6,7 +6,6 @@ const versions_1 = require("../../../utils/versions");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function addE2E(tree, options) {
     const hasRemixPlugin = (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
         ? p === '@nx/remix/plugin'
@@ -14,15 +13,15 @@ async function addE2E(tree, options) {
     let e2eWebsServerInfo = await getRemixE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.projectRoot, 'remix.config.js'), options.addPlugin ?? Boolean(hasRemixPlugin));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', (0, versions_1.getPackageVersion)(tree, 'nx'));
-        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
-            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-                nx: {
-                    implicitDependencies: [options.projectName],
-                },
-            });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
         }
         else {
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -34,6 +33,9 @@ async function addE2E(tree, options) {
                 implicitDependencies: [options.projectName],
             });
         }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             directory: 'src',
@@ -69,15 +71,15 @@ async function addE2E(tree, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', (0, versions_1.getPackageVersion)(tree, 'nx'));
-        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
-            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-                nx: {
-                    implicitDependencies: [options.projectName],
-                },
-            });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
         }
         else {
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -89,6 +91,9 @@ async function addE2E(tree, options) {
                 implicitDependencies: [options.projectName],
             });
         }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(tree, {
             project: options.e2eProjectName,
             skipFormat: true,

package/src/generators/application/lib/normalize-options.js

@@ -36,5 +36,6 @@ async function normalizeOptions(tree, options) {
         parsedTags,
         useTsSolution: isUsingTsSolutionConfig,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }

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

@@ -14,4 +14,5 @@ export interface NxRemixGeneratorSchema {
   nxCloudToken?: string;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
+  useProjectJson?: boolean;
 }

package/src/generators/application/schema.json

@@ -57,6 +57,10 @@
       "type": "boolean",
       "x-priority": "internal",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]

package/src/generators/library/lib/normalize-options.js

@@ -23,5 +23,6 @@ async function normalizeOptions(tree, options) {
         projectRoot,
         importPath,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }

package/src/generators/library/library.impl.js

@@ -9,13 +9,17 @@ const lib_1 = require("./lib");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function remixLibraryGenerator(tree, schema) {
-    return remixLibraryGeneratorInternal(tree, { addPlugin: false, ...schema });
+    return remixLibraryGeneratorInternal(tree, {
+        addPlugin: false,
+        useProjectJson: true,
+        ...schema,
+    });
 }
 async function remixLibraryGeneratorInternal(tree, schema) {
     const tasks = [];
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         js: options.js,
@@ -36,6 +40,7 @@ async function remixLibraryGeneratorInternal(tree, schema) {
         buildable: options.buildable,
         bundler: options.bundler,
         addPlugin: options.addPlugin,
+        useProjectJson: options.useProjectJson,
     });
     tasks.push(libGenTask);
     if (options.unitTestRunner && options.unitTestRunner !== 'none') {

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

@@ -14,4 +14,5 @@ export interface NxRemixGeneratorSchema {
   js?: boolean;
   skipFormat?: boolean;
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }

package/src/generators/library/schema.json

@@ -81,6 +81,10 @@
       "default": false,
       "description": "Generate a buildable library that uses rollup to bundle.",
       "x-deprecated": "Use the `bundler` option for greater control (none, vite, rollup)."
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]