@nx/remix 23.2.0-beta.6 → 23.2.0-beta.7

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

@@ -6,12 +6,12 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const internal_2 = require("@nx/js/internal");
 const testing_config_utils_1 = require("../../utils/testing-config-utils");
 const versions_1 = require("../../utils/versions");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const update_dependencies_1 = require("../utils/update-dependencies");
 const lib_1 = require("./lib");
-const internal_2 = require("@nx/js/internal");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: true,
@@ -147,7 +147,16 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     else {
         tree.delete((0, devkit_1.joinPathFragments)(options.projectRoot, `tests/routes/_index.spec.tsx`));
     }
-    if (options.linter !== 'none') {
+    if (options.linter !== 'eslint' && options.linter !== 'none') {
+        tasks.push(await (0, internal_2.addLintingToProject)(tree, {
+            oxlintPlugins: ['react', 'react-perf', 'jsx-a11y'],
+            unitTestRunner: options.unitTestRunner,
+            linter: options.linter,
+            project: options.projectName,
+            addPlugin: options.addPlugin,
+        }));
+    }
+    if (options.linter === 'eslint') {
         const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
         const { addIgnoresToLintConfig, } = require('@nx/eslint/internal');
         const eslintTask = await lintProjectGenerator(tree, {

package/dist/src/generators/application/files/nx-welcome/claimed/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
 export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/files/nx-welcome/not-configured/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
 export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/files/nx-welcome/unclaimed/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
  export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/lib/ignore-vite-temp-files.d.ts

@@ -1,3 +1,2 @@
 import { type Tree } from '@nx/devkit';
 export declare function ignoreViteTempFiles(tree: Tree, projectRoot?: string | undefined): Promise<void>;
-export declare function isEslintInstalled(tree: Tree): boolean;

package/dist/src/generators/application/lib/ignore-vite-temp-files.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ignoreViteTempFiles = ignoreViteTempFiles;
-exports.isEslintInstalled = isEslintInstalled;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/js/internal");
 const versions_1 = require("../../../utils/versions");
 async function ignoreViteTempFiles(tree, projectRoot) {
     addViteTempFilesToGitIgnore(tree);
@@ -23,7 +23,9 @@ function addViteTempFilesToGitIgnore(tree) {
     tree.write('.gitignore', gitIgnoreContents);
 }
 async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
-    if (!isEslintInstalled(tree)) {
+    // Checked before `ensurePackage` so an Oxlint workspace does not install
+    // `@nx/eslint` only for `isEslintConfigSupported` to send it straight back.
+    if (!(0, internal_1.detectLinters)(tree).includes('eslint')) {
         return;
     }
     (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
@@ -46,15 +48,3 @@ async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
         '**/vitest.config.*.timestamp*',
     ]);
 }
-function isEslintInstalled(tree) {
-    try {
-        require('eslint');
-        return true;
-    }
-    catch { }
-    // it might not be installed yet, but it might be in the tree pending install
-    const { devDependencies, dependencies } = tree.exists('package.json')
-        ? (0, devkit_1.readJson)(tree, 'package.json')
-        : {};
-    return !!devDependencies?.['eslint'] || !!dependencies?.['eslint'];
-}

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

@@ -26,7 +26,7 @@ async function normalizeOptions(tree, options) {
         : [];
     return {
         ...options,
-        linter: options.linter ?? 'eslint',
+        linter: await (0, internal_2.normalizeLinterOption)(tree, options.linter),
         projectName: appProjectName,
         projectRoot,
         importPath,

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

@@ -1,10 +1,10 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface NxRemixGeneratorSchema {
   directory: string;
   name?: string;
   tags?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: 'vitest' | 'jest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;

package/dist/src/generators/application/schema.json

@@ -21,11 +21,9 @@
       "x-priority": "important"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?",
+      "enum": ["eslint", "oxlint", "none"],
       "x-priority": "important"
     },
     "unitTestRunner": {

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

@@ -18,6 +18,9 @@ async function normalizeOptions(tree, options) {
     const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(tree);
     return {
         ...options,
+        // Resolved after the spread: the framework's ESLint shaping is guarded on
+        // `=== 'eslint'`, and an unresolved `undefined` would skip all of it.
+        linter: await (0, internal_2.normalizeLinterOption)(tree, options.linter),
         unitTestRunner: options.unitTestRunner ?? 'vitest',
         projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,

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

@@ -22,6 +22,9 @@ async function remixLibraryGeneratorInternal(tree, schema) {
     const tasks = [];
     tasks.push((0, assert_and_pin_remix_typescript_1.assertAndPinRemixTypescript)(tree));
     const addTsPlugin = (0, internal_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin);
+    // Detected before `updateDependencies`, which installs eslint unconditionally.
+    // Detecting afterwards would just observe what this generator itself added.
+    const linter = await (0, internal_1.normalizeLinterOption)(tree, schema.linter);
     const installTask = (0, update_dependencies_1.updateDependencies)(tree);
     tasks.push(installTask);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
@@ -30,7 +33,7 @@ async function remixLibraryGeneratorInternal(tree, schema) {
         skipFormat: true,
     });
     tasks.push(jsInitTask);
-    const options = await (0, lib_1.normalizeOptions)(tree, schema);
+    const options = await (0, lib_1.normalizeOptions)(tree, { ...schema, linter });
     if (options.isUsingTsSolutionConfig) {
         await (0, internal_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }

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

@@ -1,3 +1,4 @@
+import type { LinterType } from '@nx/js';
 import { SupportedStyles } from '@nx/react';
 
 export interface NxRemixGeneratorSchema {
@@ -9,7 +10,7 @@ export interface NxRemixGeneratorSchema {
   /** @deprecated Use bundler instead. */
   buildable?: boolean;
   bundler?: 'none' | 'vite' | 'rollup';
-  linter?: 'none' | 'eslint';
+  linter?: LinterType;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   js?: boolean;
   skipFormat?: boolean;

package/dist/src/generators/library/schema.json

@@ -46,11 +46,9 @@
       "x-priority": "important"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?",
+      "enum": ["eslint", "oxlint", "none"],
       "x-priority": "important"
     },
     "unitTestRunner": {

package/dist/src/generators/storybook-configuration/schema.d.ts

@@ -1,4 +1,4 @@
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 
 export interface StorybookConfigurationSchema {
   project: string;
@@ -6,7 +6,7 @@ export interface StorybookConfigurationSchema {
   generateStories?: boolean;
   js?: boolean;
   tsConfiguration?: boolean;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   ignorePaths?: string[];
   configureTestRunner?: boolean;
   configureStaticServe?: boolean;

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

@@ -53,8 +53,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint"]
     },
     "ignorePaths": {
       "type": "array",

package/package.json

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