@nx/remix 23.0.0-rc.4 → 23.1.0-beta.0

package/README.md

@@ -7,13 +7,12 @@
 
 <div style="text-align: center;">
 
-[![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
 [![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
-[![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
+[![Nx Sandboxing](https://staging.nx.app/workspaces/62d013ea0852fe0a2df74438/sandbox-badge.svg)](https://nx.dev/docs/features/ci-features/sandboxing)
 
 </div>
 

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

@@ -23,6 +23,7 @@ function remixApplicationGenerator(tree, options) {
 async function remixApplicationGeneratorInternal(tree, _options) {
     (0, versions_1.assertSupportedRemixVersion)(tree);
     const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(tree, _options.addPlugin, _options.useTsSolution);
+    // initGenerator enforces the TS pin and hard-errors on TS6.
     const tasks = [
         await (0, init_1.default)(tree, {
             skipFormat: true,
@@ -68,7 +69,6 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         reactDomVersion: versions_1.reactDomVersion,
         typesReactVersion: versions_1.typesReactVersion,
         typesReactDomVersion: versions_1.typesReactDomVersion,
-        eslintVersion: versions_1.eslintVersion,
         typescriptVersion: versions_1.typescriptVersion,
         viteVersion: versions_1.viteVersion,
     };

package/dist/src/generators/init/init.js

@@ -5,6 +5,7 @@ exports.remixInitGeneratorInternal = remixInitGeneratorInternal;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const plugin_1 = require("../../plugins/plugin");
+const assert_and_pin_remix_typescript_1 = require("../../utils/assert-and-pin-remix-typescript");
 const versions_1 = require("../../utils/versions");
 function remixInitGenerator(tree, options) {
     return remixInitGeneratorInternal(tree, { addPlugin: false, ...options });
@@ -12,6 +13,7 @@ function remixInitGenerator(tree, options) {
 async function remixInitGeneratorInternal(tree, options) {
     (0, versions_1.assertSupportedRemixVersion)(tree);
     const tasks = [];
+    tasks.push((0, assert_and_pin_remix_typescript_1.assertAndPinRemixTypescript)(tree));
     if (!options.skipPackageJson) {
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
             '@remix-run/serve': versions_1.remixVersion,

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

@@ -7,6 +7,7 @@ const js_1 = require("@nx/js");
 const react_1 = require("@nx/react");
 const lib_1 = require("./lib");
 const internal_1 = require("@nx/js/internal");
+const assert_and_pin_remix_typescript_1 = require("../../utils/assert-and-pin-remix-typescript");
 const update_dependencies_1 = require("../utils/update-dependencies");
 const versions_1 = require("../../utils/versions");
 async function remixLibraryGenerator(tree, schema) {
@@ -19,6 +20,7 @@ async function remixLibraryGenerator(tree, schema) {
 async function remixLibraryGeneratorInternal(tree, schema) {
     (0, versions_1.assertSupportedRemixVersion)(tree);
     const tasks = [];
+    tasks.push((0, assert_and_pin_remix_typescript_1.assertAndPinRemixTypescript)(tree));
     const addTsPlugin = (0, internal_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin);
     const installTask = (0, update_dependencies_1.updateDependencies)(tree);
     tasks.push(installTask);

package/dist/src/generators/setup/setup.impl.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const assert_and_pin_remix_typescript_1 = require("../../utils/assert-and-pin-remix-typescript");
 const versions_1 = require("../../utils/versions");
 async function default_1(tree) {
     (0, versions_1.assertSupportedRemixVersion)(tree);
     const tasks = [];
+    tasks.push((0, assert_and_pin_remix_typescript_1.assertAndPinRemixTypescript)(tree));
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         skipFormat: true,
     });

package/dist/src/migrations/update-23-1-0/remove-remix-eslint-config.d.ts

@@ -0,0 +1,11 @@
+import { type Tree } from '@nx/devkit';
+/**
+ * Removes the `@remix-run/eslint-config` dependency when no ESLint config
+ * references it. Earlier Nx versions force-added this Remix-native preset to
+ * generated workspaces (a behavior dropped in #26568), yet the generated lint
+ * setup uses `@nx/eslint` flat config and never extends it. The preset peers
+ * ESLint v8 only and has no v9-compatible release, so once ESLint v9 is the floor
+ * the leftover dependency breaks installs. Workspaces that genuinely extend the
+ * preset keep it.
+ */
+export default function update(tree: Tree): Promise<void>;

package/dist/src/migrations/update-23-1-0/remove-remix-eslint-config.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const PACKAGE = '@remix-run/eslint-config';
+// Basenames of ESLint config files, eslintrc and flat including the Nx base
+// variants, mirroring @nx/eslint's canonical lists. A reference to
+// @remix-run/eslint-config in any of these means the workspace uses the preset,
+// so the dependency must be kept.
+const ESLINT_CONFIG_FILES = new Set([
+    '.eslintrc',
+    '.eslintrc.js',
+    '.eslintrc.cjs',
+    '.eslintrc.yaml',
+    '.eslintrc.yml',
+    '.eslintrc.json',
+    '.eslintrc.base.json',
+    'eslint.config.js',
+    'eslint.config.cjs',
+    'eslint.config.mjs',
+    'eslint.config.ts',
+    'eslint.config.cts',
+    'eslint.config.mts',
+    'eslint.base.js',
+    'eslint.base.ts',
+    'eslint.base.config.js',
+    'eslint.base.config.cjs',
+    'eslint.base.config.mjs',
+    'eslint.base.config.ts',
+    'eslint.base.config.cts',
+    'eslint.base.config.mts',
+]);
+/**
+ * Removes the `@remix-run/eslint-config` dependency when no ESLint config
+ * references it. Earlier Nx versions force-added this Remix-native preset to
+ * generated workspaces (a behavior dropped in #26568), yet the generated lint
+ * setup uses `@nx/eslint` flat config and never extends it. The preset peers
+ * ESLint v8 only and has no v9-compatible release, so once ESLint v9 is the floor
+ * the leftover dependency breaks installs. Workspaces that genuinely extend the
+ * preset keep it.
+ */
+async function update(tree) {
+    if (!isDeclared(tree) || isReferencedByEslintConfig(tree)) {
+        return;
+    }
+    (0, devkit_1.removeDependenciesFromPackageJson)(tree, [PACKAGE], [PACKAGE]);
+    devkit_1.logger.info(`Removed the unused "${PACKAGE}" dependency, which only supports ESLint v8.`);
+    await (0, devkit_1.formatFiles)(tree);
+}
+function isDeclared(tree) {
+    if (!tree.exists('package.json')) {
+        return false;
+    }
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    return !!dependencies?.[PACKAGE] || !!devDependencies?.[PACKAGE];
+}
+function isReferencedByEslintConfig(tree) {
+    let referenced = false;
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
+        if (referenced) {
+            return;
+        }
+        const basename = filePath.split('/').pop() ?? '';
+        if (!ESLINT_CONFIG_FILES.has(basename)) {
+            return;
+        }
+        if (tree.read(filePath, 'utf-8')?.includes(PACKAGE)) {
+            referenced = true;
+        }
+    });
+    return referenced;
+}

package/dist/src/utils/assert-and-pin-remix-typescript.d.ts

@@ -0,0 +1,21 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+/**
+ * Remix has no TypeScript 6-capable release, so Remix generators must keep the
+ * workspace on TS 5.x. It keys off the DECLARED `typescript` version, consulting
+ * the installed version only when it satisfies that declared range, and:
+ * - throws a hard, actionable error when the workspace resolves to TS >= 6 (the
+ *   declared floor is >= 6, or an open range like `>=5.9.0` is satisfied by an
+ *   installed >= 6);
+ * - pins TS to Remix's own `~5.9.2` only when `typescript` is absent, never
+ *   overwriting an existing (5.x) pin. A typescript present only transitively
+ *   (hoisted, no direct declaration) is treated as absent and gets the pin.
+ *
+ * Dist-tags (`latest`/`next`) and unparseable ranges have no resolvable floor,
+ * so the throw is skipped for them, consistent with devkit's
+ * `assertSupportedPackageVersion`.
+ *
+ * Call before any dependency install in Remix generators that install deps;
+ * generators that delegate to the init generator (e.g. application) inherit
+ * the guard from it.
+ */
+export declare function assertAndPinRemixTypescript(tree: Tree): GeneratorCallback;

package/dist/src/utils/assert-and-pin-remix-typescript.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertAndPinRemixTypescript = assertAndPinRemixTypescript;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/js/internal");
+const versions_1 = require("./versions");
+/**
+ * Remix has no TypeScript 6-capable release, so Remix generators must keep the
+ * workspace on TS 5.x. It keys off the DECLARED `typescript` version, consulting
+ * the installed version only when it satisfies that declared range, and:
+ * - throws a hard, actionable error when the workspace resolves to TS >= 6 (the
+ *   declared floor is >= 6, or an open range like `>=5.9.0` is satisfied by an
+ *   installed >= 6);
+ * - pins TS to Remix's own `~5.9.2` only when `typescript` is absent, never
+ *   overwriting an existing (5.x) pin. A typescript present only transitively
+ *   (hoisted, no direct declaration) is treated as absent and gets the pin.
+ *
+ * Dist-tags (`latest`/`next`) and unparseable ranges have no resolvable floor,
+ * so the throw is skipped for them, consistent with devkit's
+ * `assertSupportedPackageVersion`.
+ *
+ * Call before any dependency install in Remix generators that install deps;
+ * generators that delegate to the init generator (e.g. application) inherit
+ * the guard from it.
+ */
+function assertAndPinRemixTypescript(tree) {
+    const declared = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'typescript');
+    const minimum = declared ? (0, internal_1.getRangeMinimum)(declared) : undefined;
+    if (minimum && (0, internal_1.isTypescriptVersionAtLeast)(tree, '6.0.0')) {
+        throw new Error(`Remix does not support TypeScript 6 (detected \`typescript@${declared}\`).\n\n` +
+            `Keep \`typescript\` on a 5.x version to continue using Remix, or migrate to ` +
+            `React Router v7 by generating an application with the @nx/react generator: ` +
+            `\`nx g @nx/react:application <name> --routing --useReactRouter\`.`);
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { typescript: versions_1.typescriptVersion }, undefined, true);
+}

package/dist/src/utils/versions.d.ts

@@ -8,7 +8,7 @@ export declare const reactVersion = "^18.2.0";
 export declare const reactDomVersion = "^18.2.0";
 export declare const typesReactVersion = "^18.2.0";
 export declare const typesReactDomVersion = "^18.2.0";
-export declare const eslintVersion = "^8.56.0";
+export declare const eslintVersion = "^9.8.0";
 export declare const typescriptVersion = "~5.9.2";
 export declare const postcssVersion = "^8.4.38";
 export declare const autoprefixerVersion = "^10.4.19";

package/dist/src/utils/versions.js

@@ -19,7 +19,7 @@ exports.reactVersion = '^18.2.0';
 exports.reactDomVersion = '^18.2.0';
 exports.typesReactVersion = '^18.2.0';
 exports.typesReactDomVersion = '^18.2.0';
-exports.eslintVersion = '^8.56.0';
+exports.eslintVersion = '^9.8.0';
 exports.typescriptVersion = '~5.9.2';
 exports.postcssVersion = '^8.4.38';
 exports.autoprefixerVersion = '^10.4.19';

package/migrations.json

@@ -5,6 +5,11 @@
       "description": "Rename imports of `createNodesV2` from `@nx/remix/plugin` to the canonical `createNodes` export.",
       "implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
       "documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md"
+    },
+    "update-23-1-0-remove-remix-eslint-config": {
+      "version": "23.1.0-beta.0",
+      "description": "Remove the unused @remix-run/eslint-config dependency (ESLint v8 only) that earlier Nx versions added but never wired into the generated lint setup.",
+      "implementation": "./dist/src/migrations/update-23-1-0/remove-remix-eslint-config"
     }
   },
   "packageJsonUpdates": {
@@ -33,7 +38,7 @@
         },
         "@remix-run/eslint-config": {
           "version": "2.17.3",
-          "alwaysAddToPackageJson": true
+          "alwaysAddToPackageJson": false
         },
         "@remix-run/server-runtime": {
           "version": "2.17.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "23.0.0-rc.4",
+  "version": "23.1.0-beta.0",
   "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",
@@ -56,15 +56,15 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/js": "23.0.0-rc.4",
-    "@nx/devkit": "23.0.0-rc.4",
-    "@nx/react": "23.0.0-rc.4",
-    "@nx/web": "23.0.0-rc.4"
+    "@nx/devkit": "23.1.0-beta.0",
+    "@nx/js": "23.1.0-beta.0",
+    "@nx/react": "23.1.0-beta.0",
+    "@nx/web": "23.1.0-beta.0"
   },
   "devDependencies": {
-    "@nx/eslint": "23.0.0-rc.4",
-    "nx": "23.0.0-rc.4",
-    "@nx/vitest": "23.0.0-rc.4"
+    "@nx/eslint": "23.1.0-beta.0",
+    "nx": "23.1.0-beta.0",
+    "@nx/vitest": "23.1.0-beta.0"
   },
   "peerDependencies": {
     "@remix-run/dev": "^2.0.0"