@nx/remix 19.4.0-beta.0 → 19.4.0-beta.2

package/generators.json

@@ -85,6 +85,11 @@
       "implementation": "./src/generators/error-boundary/error-boundary.impl",
       "schema": "./src/generators/error-boundary/schema.json",
       "description": "Add an ErrorBoundary to an existing route"
+    },
+    "convert-to-inferred": {
+      "factory": "./src/generators/convert-to-inferred/convert-to-inferred",
+      "schema": "./src/generators/convert-to-inferred/schema.json",
+      "description": "Convert existing Remix project(s) using `@nx/remix:*` executors to use `@nx/remix/plugin`. Defaults to migrating all projects. Pass '--project' to migrate only one target."
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "19.4.0-beta.0",
+  "version": "19.4.0-beta.2",
   "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,12 +29,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.4.0-beta.0",
-    "@nx/js": "19.4.0-beta.0",
-    "@nx/react": "19.4.0-beta.0",
+    "@nx/devkit": "19.4.0-beta.2",
+    "@nx/js": "19.4.0-beta.2",
+    "@nx/react": "19.4.0-beta.2",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/remix": "19.4.0-beta.0"
+    "@nrwl/remix": "19.4.0-beta.2"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/generators/application/files/integrated/package.json__tmpl__

@@ -15,7 +15,6 @@
   },
   "devDependencies": {
     "@remix-run/dev": "<%= remixVersion %>",
-    "@remix-run/eslint-config": "<%= remixVersion %>",
     "@types/react": "<%= typesReactVersion %>",
     "@types/react-dom": "<%= typesReactDomVersion %>",
     "eslint": "<%= eslintVersion %>",

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -0,0 +1,7 @@
+import { type Tree } from '@nx/devkit';
+interface Schema {
+    project?: string;
+    skipFormat?: boolean;
+}
+export declare function convertToInferred(tree: Tree, options: Schema): Promise<() => void>;
+export default convertToInferred;

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToInferred = void 0;
+const devkit_1 = require("@nx/devkit");
+const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
+const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
+const plugin_1 = require("../../plugins/plugin");
+const build_post_target_transformer_1 = require("./lib/build-post-target-transformer");
+const serve_post_target_transformer_1 = require("./lib/serve-post-target-transformer");
+async function convertToInferred(tree, options) {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    const migrationLogs = new aggregate_log_util_1.AggregatedLog();
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPluginV1)(tree, projectGraph, '@nx/remix/plugin', plugin_1.createNodes, {
+        buildTargetName: 'build',
+        devTargetName: 'dev',
+        startTargetName: 'start',
+        staticServeTargetName: 'static-serve',
+        typecheckTargetName: 'typecheck',
+    }, [
+        {
+            executors: ['@nx/remix:build'],
+            postTargetTransformer: (0, build_post_target_transformer_1.buildPostTargetTransformer)(migrationLogs),
+            targetPluginOptionMapper: (targetName) => ({
+                buildTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/remix:serve'],
+            postTargetTransformer: (0, serve_post_target_transformer_1.servePostTargetTransformer)(migrationLogs),
+            targetPluginOptionMapper: (targetName) => ({
+                devTargetName: targetName,
+            }),
+        },
+    ], options.project);
+    if (migratedProjects.size === 0) {
+        throw new Error('Could not find any targets to migrate.');
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        migrationLogs.flushLogs();
+    };
+}
+exports.convertToInferred = convertToInferred;
+exports.default = convertToInferred;

package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts

@@ -0,0 +1,6 @@
+import { type Tree, type TargetConfiguration } from '@nx/devkit';
+import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+export declare function buildPostTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration, tree: Tree, projectDetails: {
+    projectName: string;
+    root: string;
+}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration<any>;

package/src/generators/convert-to-inferred/lib/build-post-target-transformer.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildPostTargetTransformer = void 0;
+const utils_1 = require("./utils");
+const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+function buildPostTargetTransformer(migrationLogs) {
+    return (target, tree, projectDetails, inferredTargetConfiguration) => {
+        const remixConfigPath = (0, utils_1.getConfigFilePath)(tree, projectDetails.root);
+        if (target.options) {
+            handlePropertiesFromTargetOptions(tree, target.options, projectDetails.projectName, projectDetails.root, migrationLogs);
+        }
+        if (target.configurations) {
+            for (const configurationName in target.configurations) {
+                const configuration = target.configurations[configurationName];
+                handlePropertiesFromTargetOptions(tree, configuration, projectDetails.projectName, projectDetails.root, migrationLogs);
+            }
+            if (Object.keys(target.configurations).length === 0) {
+                if ('defaultConfiguration' in target) {
+                    delete target.defaultConfiguration;
+                }
+                delete target.configurations;
+            }
+            if ('defaultConfiguration' in target &&
+                !target.configurations[target.defaultConfiguration]) {
+                delete target.defaultConfiguration;
+            }
+        }
+        if (target.outputs) {
+            target.outputs = target.outputs.filter((out) => !out.includes('options.outputPath'));
+            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+                projectName: projectDetails.projectName,
+                projectRoot: projectDetails.root,
+            });
+        }
+        return target;
+    };
+}
+exports.buildPostTargetTransformer = buildPostTargetTransformer;
+function handlePropertiesFromTargetOptions(tree, options, projectName, projectRoot, migrationLogs) {
+    if ('outputPath' in options) {
+        migrationLogs.addLog({
+            project: projectName,
+            executorName: '@nx/remix:build',
+            log: "Unable to migrate 'outputPath'. The Remix Config will contain the locations the build artifact will be output to.",
+        });
+        delete options.outputPath;
+    }
+    if ('includeDevDependenciesInPackageJson' in options) {
+        migrationLogs.addLog({
+            project: projectName,
+            executorName: '@nx/remix:build',
+            log: "Unable to migrate `includeDevDependenciesInPackageJson` to Remix Config. Use the `@nx/dependency-checks` ESLint rule to update your project's package.json.",
+        });
+        delete options.includeDevDependenciesInPackageJson;
+    }
+    if ('generatePackageJson' in options) {
+        migrationLogs.addLog({
+            project: projectName,
+            executorName: '@nx/remix:build',
+            log: "Unable to migrate `generatePackageJson` to Remix Config. Use the `@nx/dependency-checks` ESLint rule to update your project's package.json.",
+        });
+        delete options.generatePackageJson;
+    }
+    if ('generateLockfile' in options) {
+        migrationLogs.addLog({
+            project: projectName,
+            executorName: '@nx/remix:build',
+            log: 'Unable to migrate `generateLockfile` to Remix Config. This option is not supported.',
+        });
+        delete options.generateLockfile;
+    }
+}

package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts

@@ -0,0 +1,6 @@
+import { type Tree, type TargetConfiguration } from '@nx/devkit';
+import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+export declare function servePostTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration, tree: Tree, projectDetails: {
+    projectName: string;
+    root: string;
+}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration<any>;

package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.servePostTargetTransformer = void 0;
+const utils_1 = require("./utils");
+function servePostTargetTransformer(migrationLogs) {
+    return (target, tree, projectDetails, inferredTargetConfiguration) => {
+        if (target.options) {
+            handlePropertiesFromTargetOptions(tree, target.options, projectDetails.projectName, projectDetails.root);
+        }
+        if (target.configurations) {
+            for (const configurationName in target.configurations) {
+                const configuration = target.configurations[configurationName];
+                handlePropertiesFromTargetOptions(tree, configuration, projectDetails.projectName, projectDetails.root);
+            }
+            if (Object.keys(target.configurations).length === 0) {
+                if ('defaultConfiguration' in target) {
+                    delete target.defaultConfiguration;
+                }
+                delete target.configurations;
+            }
+            if ('defaultConfiguration' in target &&
+                !target.configurations[target.defaultConfiguration]) {
+                delete target.defaultConfiguration;
+            }
+        }
+        return target;
+    };
+}
+exports.servePostTargetTransformer = servePostTargetTransformer;
+function handlePropertiesFromTargetOptions(tree, options, projectName, projectRoot) {
+    if ('debug' in options) {
+        delete options.debug;
+    }
+    if ('port' in options) {
+        options.env ??= {};
+        options.env.PORT = `${options.port}`;
+        delete options.port;
+    }
+    for (const [prevKey, newKey] of Object.entries(utils_1.REMIX_PROPERTY_MAPPINGS)) {
+        if (prevKey in options) {
+            let prevValue = options[prevKey];
+            delete options[prevKey];
+            options[newKey] = prevValue;
+        }
+    }
+}

package/src/generators/convert-to-inferred/lib/utils.d.ts

@@ -0,0 +1,10 @@
+import { type Tree } from '@nx/devkit';
+export declare const REMIX_PROPERTY_MAPPINGS: {
+    sourcemap: string;
+    devServerPort: string;
+    command: string;
+    manual: string;
+    tlsKey: string;
+    tlsCert: string;
+};
+export declare function getConfigFilePath(tree: Tree, root: string): string;

package/src/generators/convert-to-inferred/lib/utils.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigFilePath = exports.REMIX_PROPERTY_MAPPINGS = void 0;
+const devkit_1 = require("@nx/devkit");
+exports.REMIX_PROPERTY_MAPPINGS = {
+    sourcemap: 'sourcemap',
+    devServerPort: 'port',
+    command: 'command',
+    manual: 'manual',
+    tlsKey: 'tls-key',
+    tlsCert: 'tls-cert',
+};
+function getConfigFilePath(tree, root) {
+    return [
+        (0, devkit_1.joinPathFragments)(root, `remix.config.js`),
+        (0, devkit_1.joinPathFragments)(root, `remix.config.cjs`),
+        (0, devkit_1.joinPathFragments)(root, `remix.config.mjs`),
+    ].find((f) => tree.exists(f));
+}
+exports.getConfigFilePath = getConfigFilePath;

package/src/generators/convert-to-inferred/schema.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxRemixConvertToInferred",
+  "description": "Convert existing Remix project(s) using `@nx/remix:*` executors to use `@nx/remix/plugin`. Defaults to migrating all projects. Pass '--project' to migrate only one target.",
+  "title": "Convert Remix project from executor to plugin",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The project to convert from using the `@nx/remix:*` executors to use `@nx/remix/plugin`.",
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "description": "Whether to format files at the end of the migration.",
+      "default": false
+    }
+  }
+}

package/src/generators/utils/update-dependencies.js

@@ -11,7 +11,6 @@ function updateDependencies(tree) {
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
     }, {
-        '@remix-run/eslint-config': versions_1.remixVersion,
         '@types/react': versions_1.typesReactVersion,
         '@types/react-dom': versions_1.typesReactDomVersion,
         eslint: versions_1.eslintVersion,