@nx/remix 20.5.0-beta.2 → 20.5.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/remix",
-  "version": "20.5.0-beta.2",
+  "version": "20.5.0-beta.3",
   "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-beta.2",
-    "@nx/js": "20.5.0-beta.2",
-    "@nx/react": "20.5.0-beta.2",
+    "@nx/devkit": "20.5.0-beta.3",
+    "@nx/js": "20.5.0-beta.3",
+    "@nx/react": "20.5.0-beta.3",
     "tslib": "^2.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },

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

@@ -252,7 +252,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -269,10 +269,10 @@ export default defineConfig({
     reporters: ['default'],
     coverage: {
       reportsDirectory: '../coverage/test',
-      provider: 'v8',
+      provider: 'v8' as const,
     },
   },
-});
+}));
 "
 `;
 
@@ -429,7 +429,8 @@ installGlobals();
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using jest 3`] = `
 "import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -442,7 +443,7 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });
 "
 `;
@@ -454,7 +455,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: './node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -471,16 +472,17 @@ export default defineConfig({
     reporters: ['default'],
     coverage: {
       reportsDirectory: './coverage/test',
-      provider: 'v8',
+      provider: 'v8' as const,
     },
   },
-});
+}));
 "
 `;
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using vitest 2`] = `
 "import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -493,7 +495,7 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });
 "
 `;
@@ -606,7 +608,8 @@ export default function Index() {
 
 exports[`Remix Application Standalone Project Repo should create the application correctly 3`] = `
 "import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -619,7 +622,7 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });
 "
 `;
@@ -656,7 +659,13 @@ export default defineConfig({
 exports[`Remix Application Standalone Project Repo should create the application correctly 5`] = `
 "{
   "root": true,
-  "ignorePatterns": ["!**/*", "build", "public/build"],
+  "ignorePatterns": [
+    "!**/*",
+    "build",
+    "public/build",
+    "**/vite.config.*.timestamp*",
+    "**/vitest.config.*.timestamp*"
+  ],
   "plugins": ["@nx"],
   "overrides": [
     {

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

@@ -193,7 +193,7 @@ export default {...nxPreset};
         }
     }
     tasks.push(await (0, lib_1.addE2E)(tree, options));
-    (0, lib_1.addViteTempFilesToGitIgnore)(tree);
+    await (0, lib_1.ignoreViteTempFiles)(tree, options.projectRoot);
     (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',

package/src/generators/application/files/common/tests/routes/_index.spec.tsx__tmpl__

@@ -1,5 +1,6 @@
 import { createRemixStub } from '@remix-run/testing';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
 import Index from '../../app/routes/_index';
 
 test('renders loader data', async () => {
@@ -12,5 +13,5 @@ test('renders loader data', async () => {
 
   render(<RemixStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  await screen.findByText('Hello there,');
 });

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

@@ -0,0 +1,3 @@
+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/src/generators/application/lib/ignore-vite-temp-files.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ignoreViteTempFiles = ignoreViteTempFiles;
+exports.isEslintInstalled = isEslintInstalled;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
+async function ignoreViteTempFiles(tree, projectRoot) {
+    addViteTempFilesToGitIgnore(tree);
+    await ignoreViteTempFilesInEslintConfig(tree, projectRoot);
+}
+function addViteTempFilesToGitIgnore(tree) {
+    let gitIgnoreContents = tree.exists('.gitignore')
+        ? tree.read('.gitignore', 'utf-8')
+        : '';
+    if (!/^vite\.config\.\*\.timestamp\*$/m.test(gitIgnoreContents)) {
+        gitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
+      vite.config.*.timestamp*`;
+    }
+    if (!/^vitest\.config\.\*\.timestamp\*$/m.test(gitIgnoreContents)) {
+        gitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
+      vitest.config.*.timestamp*`;
+    }
+    tree.write('.gitignore', gitIgnoreContents);
+}
+async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
+    if (!isEslintInstalled(tree)) {
+        return;
+    }
+    (0, devkit_1.ensurePackage)('@nx/eslint', (0, versions_1.getPackageVersion)(tree, 'nx'));
+    const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => require('@nx/eslint/src/generators/utils/eslint-file'));
+    if (!isEslintConfigSupported(tree)) {
+        return;
+    }
+    const { useFlatConfig } = await Promise.resolve().then(() => require('@nx/eslint/src/utils/flat-config'));
+    const isUsingFlatConfig = useFlatConfig(tree);
+    if (!projectRoot && !isUsingFlatConfig) {
+        // root eslintrc files ignore all files and the root eslintrc files add
+        // back all the project files, so we only add the ignores to the project
+        // eslintrc files
+        return;
+    }
+    // for flat config, we update the root config file
+    const directory = isUsingFlatConfig ? '' : projectRoot ?? '';
+    addIgnoresToLintConfig(tree, directory, [
+        '**/vite.config.*.timestamp*',
+        '**/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/src/generators/application/lib/index.d.ts

@@ -1,4 +1,4 @@
 export * from './normalize-options';
 export * from './update-unit-test-config';
 export * from './add-e2e';
-export * from './add-vite-temp-files-to-gitignore';
+export * from './ignore-vite-temp-files';

package/src/generators/application/lib/index.js

@@ -4,4 +4,4 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-unit-test-config"), exports);
 tslib_1.__exportStar(require("./add-e2e"), exports);
-tslib_1.__exportStar(require("./add-vite-temp-files-to-gitignore"), exports);
+tslib_1.__exportStar(require("./ignore-vite-temp-files"), exports);

package/src/generators/application/lib/update-unit-test-config.js

@@ -46,6 +46,7 @@ function updateUnitTestConfig(tree, pathToRoot, unitTestRunner, rootProject) {
     });
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@testing-library/jest-dom': versions_1.testingLibraryJestDomVersion,
+        '@testing-library/dom': versions_1.testingLibraryDomVersion,
         '@testing-library/react': versions_1.testingLibraryReactVersion,
         '@testing-library/user-event': versions_1.testingLibraryUserEventsVersion,
         '@remix-run/node': (0, versions_1.getRemixVersion)(tree),

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

@@ -28,7 +28,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../node_modules/.vite/test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -43,9 +43,12 @@ export default defineConfig({
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
-    coverage: { reportsDirectory: '../coverage/test', provider: 'v8' },
+    coverage: {
+      reportsDirectory: '../coverage/test',
+      provider: 'v8' as const,
+    },
   },
-});
+}));
 "
 `;
 

package/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap

@@ -92,7 +92,7 @@ import react from '@vitejs/plugin-react';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
-export default defineConfig({
+export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../../node_modules/.vite/libs/storybook-test',
   plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
@@ -109,10 +109,10 @@ export default defineConfig({
     reporters: ['default'],
     coverage: {
       reportsDirectory: '../../coverage/libs/storybook-test',
-      provider: 'v8',
+      provider: 'v8' as const,
     },
   },
-});
+}));
 "
 `;
 

package/src/utils/versions.d.ts

@@ -13,6 +13,7 @@ export declare const postcssVersion = "^8.4.38";
 export declare const autoprefixerVersion = "^10.4.19";
 export declare const testingLibraryReactVersion = "^14.1.2";
 export declare const testingLibraryJestDomVersion = "6.4.2";
+export declare const testingLibraryDomVersion = "^10.4.0";
 export declare const testingLibraryUserEventsVersion = "^14.5.2";
 export declare const viteVersion = "^5.0.0";
 export declare function getRemixVersion(tree: Tree): string;

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.viteVersion = exports.testingLibraryUserEventsVersion = exports.testingLibraryJestDomVersion = exports.testingLibraryReactVersion = exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptVersion = exports.eslintVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.isbotVersion = exports.remixVersion = exports.nxVersion = void 0;
+exports.viteVersion = exports.testingLibraryUserEventsVersion = exports.testingLibraryDomVersion = exports.testingLibraryJestDomVersion = exports.testingLibraryReactVersion = exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptVersion = exports.eslintVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.isbotVersion = exports.remixVersion = exports.nxVersion = void 0;
 exports.getRemixVersion = getRemixVersion;
 exports.getPackageVersion = getPackageVersion;
 const devkit_1 = require("@nx/devkit");
@@ -19,6 +19,7 @@ exports.autoprefixerVersion = '^10.4.19';
 exports.testingLibraryReactVersion = '^14.1.2';
 // TODO(colum): Unpin this when @testing-library/jest-dom pushes a fix
 exports.testingLibraryJestDomVersion = '6.4.2';
+exports.testingLibraryDomVersion = '^10.4.0';
 exports.testingLibraryUserEventsVersion = '^14.5.2';
 exports.viteVersion = '^5.0.0';
 function getRemixVersion(tree) {

package/src/generators/application/lib/add-vite-temp-files-to-gitignore.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function addViteTempFilesToGitIgnore(tree: Tree): void;

package/src/generators/application/lib/add-vite-temp-files-to-gitignore.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addViteTempFilesToGitIgnore = addViteTempFilesToGitIgnore;
-const devkit_1 = require("@nx/devkit");
-function addViteTempFilesToGitIgnore(tree) {
-    let newGitIgnoreContents = `vite.config.*.timestamp*`;
-    if (tree.exists('.gitignore')) {
-        const gitIgnoreContents = tree.read('.gitignore', 'utf-8');
-        if (!gitIgnoreContents.includes(newGitIgnoreContents)) {
-            newGitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
-        ${newGitIgnoreContents}`;
-            tree.write('.gitignore', newGitIgnoreContents);
-        }
-    }
-    else {
-        tree.write('.gitignore', newGitIgnoreContents);
-    }
-}