@nx/remix 19.7.2 → 19.8.0-beta.0

package/package.json

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

package/src/generators/application/__snapshots__/application.impl.spec.ts.snap

@@ -329,8 +329,7 @@ export default {
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using jest 2`] = `
-"/* eslint-disable */
-export default {
+"export default {
   displayName: 'test',
   preset: '../jest.preset.js',
   transform: {
@@ -846,8 +845,7 @@ export default {
 `;
 
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --unitTestRunner should generate the correct files for testing using jest 2`] = `
-"/* eslint-disable */
-export default {
+"export default {
   displayName: 'test',
   preset: '../../jest.preset.js',
   transform: {
@@ -1146,8 +1144,7 @@ export default {
 `;
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using jest 2`] = `
-"/* eslint-disable */
-export default {
+"export default {
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   displayName: 'test',
   preset: './jest.preset.cjs',
@@ -1403,7 +1400,7 @@ exports[`Remix Application Standalone Project Repo should create the application
 exports[`Remix Application Standalone Project Repo should create the application correctly 6`] = `
 "{
   "root": true,
-  "ignorePatterns": ["!**/*"],
+  "ignorePatterns": ["!**/*", "build", "public/build"],
   "plugins": ["@nx"],
   "overrides": [
     {

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

@@ -3,16 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.remixApplicationGenerator = remixApplicationGenerator;
 exports.remixApplicationGeneratorInternal = remixApplicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
-const create_ts_config_1 = require("@nx/js/src/utils/typescript/create-ts-config");
-const versions_1 = require("../../utils/versions");
-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 target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-const testing_config_utils_1 = require("../../utils/testing-config-utils");
+const js_1 = require("@nx/js");
+const create_ts_config_1 = require("@nx/js/src/utils/typescript/create-ts-config");
+const node_path_1 = require("node:path");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
+const testing_config_utils_1 = require("../../utils/testing-config-utils");
+const versions_1 = require("../../utils/versions");
+const init_1 = require("../init/init");
+const update_dependencies_1 = require("../utils/update-dependencies");
+const lib_1 = require("./lib");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: false,
@@ -150,6 +151,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
     }
     if (options.linter !== 'none') {
         const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', (0, versions_1.getPackageVersion)(tree, 'nx'));
+        const { addIgnoresToLintConfig } = await Promise.resolve().then(() => require('@nx/eslint/src/generators/utils/eslint-file'));
         const eslintTask = await lintProjectGenerator(tree, {
             linter: options.linter,
             project: options.projectName,
@@ -162,8 +164,10 @@ async function remixApplicationGeneratorInternal(tree, _options) {
             addPlugin: options.addPlugin,
         });
         tasks.push(eslintTask);
-        tree.write((0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintignore'), (0, devkit_1.stripIndents) `build
-    public/build`);
+        addIgnoresToLintConfig(tree, options.projectRoot, [
+            'build',
+            'public/build',
+        ]);
     }
     if (options.js) {
         (0, devkit_1.toJS)(tree);
@@ -211,6 +215,36 @@ export default {...nxPreset};
         }
     }
     tasks.push(await (0, lib_1.addE2E)(tree, options));
+    // If the project package.json uses type module, and the project uses flat eslint config, we need to make sure the eslint config uses an explicit .cjs extension
+    // TODO: This could be re-evaluated once we support ESM in eslint configs
+    if (tree.exists((0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json')) &&
+        tree.exists((0, devkit_1.joinPathFragments)(options.projectRoot, 'eslint.config.js'))) {
+        const pkgJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
+        if (pkgJson.type === 'module') {
+            tree.rename((0, devkit_1.joinPathFragments)(options.projectRoot, 'eslint.config.js'), (0, devkit_1.joinPathFragments)(options.projectRoot, 'eslint.config.cjs'));
+            (0, devkit_1.visitNotIgnoredFiles)(tree, options.projectRoot, (file) => {
+                if (file.endsWith('eslint.config.js')) {
+                    // Replace any extends on the eslint config to use the .cjs extension
+                    const content = tree.read(file).toString();
+                    if (content.includes('eslint.config')) {
+                        tree.write(file, content
+                            .replace(/eslint\.config'/g, `eslint.config.cjs'`)
+                            .replace(/eslint\.config"/g, `eslint.config.cjs"`)
+                            .replace(/eslint\.config\.js/g, `eslint.config.cjs`));
+                    }
+                    // If there is no sibling package.json with type commonjs, we need to rename the .js files to .cjs
+                    const siblingPackageJsonPath = (0, devkit_1.joinPathFragments)((0, node_path_1.dirname)(file), 'package.json');
+                    if (tree.exists(siblingPackageJsonPath)) {
+                        const siblingPkgJson = (0, devkit_1.readJson)(tree, siblingPackageJsonPath);
+                        if (siblingPkgJson.type === 'module') {
+                            return;
+                        }
+                    }
+                    tree.rename(file, file.replace('.js', '.cjs'));
+                }
+            });
+        }
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -33,7 +33,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new Error('Could not find any targets to migrate.');
+        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/library/__snapshots__/library.impl.spec.ts.snap

@@ -1,8 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Remix Library Generator -projectNameAndRootFormat=as-provided --unitTestRunner should create the correct config files for testing with jest 1`] = `
-"/* eslint-disable */
-export default {
+"export default {
   setupFilesAfterEnv: ['./src/test-setup.ts'],
   displayName: 'test',
   preset: '../jest.preset.js',
@@ -80,8 +79,7 @@ exports[`Remix Library Generator -projectNameAndRootFormat=as-provided should ge
 `;
 
 exports[`Remix Library Generator -projectNameAndRootFormat=derived --unitTestRunner should create the correct config files for testing with jest 1`] = `
-"/* eslint-disable */
-export default {
+"export default {
   setupFilesAfterEnv: ['./src/test-setup.ts'],
   displayName: 'test',
   preset: '../../jest.preset.js',

package/src/plugins/plugin.js

@@ -24,7 +24,7 @@ const createDependencies = () => {
     return [];
 };
 exports.createDependencies = createDependencies;
-const remixConfigGlob = '**/{remix,vite}.config.{js,cjs,mjs}';
+const remixConfigGlob = '**/{remix,vite}.config.{js,cjs,mjs,ts,cts,mts}';
 exports.createNodesV2 = [
     remixConfigGlob,
     async (configFilePaths, options, context) => {
@@ -206,9 +206,12 @@ function determineIsRemixVite(configFilePath, workspaceRoot) {
     if (configFilePath.includes('remix.config')) {
         return RemixCompiler.IsClassic;
     }
+    const VITE_PLUGIN_REGEX = /vitePlugin\(\s*(.|\n)*?\s*\)/;
+    const REMIX_PLUGIN_REGEX = /remix\(\s*(.|\n)*?\s*\)/;
     const fileContents = (0, fs_1.readFileSync)((0, path_1.join)(workspaceRoot, configFilePath), 'utf8');
     if (fileContents.includes('@remix-run/dev') &&
-        (fileContents.includes('vitePlugin()') || fileContents.includes('remix()'))) {
+        (VITE_PLUGIN_REGEX.test(fileContents) ||
+            REMIX_PLUGIN_REGEX.test(fileContents))) {
         return RemixCompiler.IsVte;
     }
     else {