@nx/remix 18.0.3 → 18.0.4

package/package.json

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

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

@@ -323,9 +323,8 @@ 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 {
-  setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   displayName: 'test',
-  preset: '../jest.preset.cjs',
+  preset: '../jest.preset.js',
   transform: {
     '^.+\\\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
@@ -801,9 +800,8 @@ export default {
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --unitTestRunner should generate the correct files for testing using jest 2`] = `
 "/* eslint-disable */
 export default {
-  setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   displayName: 'test',
-  preset: '../../jest.preset.cjs',
+  preset: '../../jest.preset.js',
   transform: {
     '^.+\\\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },

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

@@ -129,7 +129,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
             }
             tasks.push(jestTask);
         }
-        const pkgInstallTask = (0, lib_1.updateUnitTestConfig)(tree, options.projectRoot, options.unitTestRunner);
+        const pkgInstallTask = (0, lib_1.updateUnitTestConfig)(tree, options.projectRoot, options.unitTestRunner, options.rootProject);
         tasks.push(pkgInstallTask);
     }
     else {

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

@@ -1,2 +1,2 @@
 import { type Tree } from '@nx/devkit';
-export declare function updateUnitTestConfig(tree: Tree, pathToRoot: string, unitTestRunner: 'vitest' | 'jest'): import("@nx/devkit").GeneratorCallback;
+export declare function updateUnitTestConfig(tree: Tree, pathToRoot: string, unitTestRunner: 'vitest' | 'jest', rootProject: boolean): import("@nx/devkit").GeneratorCallback;

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

@@ -4,7 +4,7 @@ exports.updateUnitTestConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const testing_config_utils_1 = require("../../../utils/testing-config-utils");
 const versions_1 = require("../../../utils/versions");
-function updateUnitTestConfig(tree, pathToRoot, unitTestRunner) {
+function updateUnitTestConfig(tree, pathToRoot, unitTestRunner, rootProject) {
     const pathToTestSetup = (0, devkit_1.joinPathFragments)(pathToRoot, `test-setup.ts`);
     tree.write(pathToTestSetup, (0, devkit_1.stripIndents) `
   import { installGlobals } from '@remix-run/node';
@@ -16,9 +16,9 @@ function updateUnitTestConfig(tree, pathToRoot, unitTestRunner) {
         (0, testing_config_utils_1.updateVitestTestIncludes)(tree, pathToViteConfig, './tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
         (0, testing_config_utils_1.updateVitestTestSetup)(tree, pathToViteConfig, 'test-setup.ts');
     }
-    else if (unitTestRunner === 'jest') {
+    else if (unitTestRunner === 'jest' && rootProject) {
         const pathToJestConfig = (0, devkit_1.joinPathFragments)(pathToRoot, 'jest.config.ts');
-        tree.rename('jest.preset.js', 'jest.preset.cjs');
+        tree.write('jest.preset.cjs', tree.read('jest.preset.js', 'utf-8'));
         (0, testing_config_utils_1.updateJestTestSetup)(tree, pathToJestConfig, `<rootDir>/test-setup.ts`);
         tree.write(pathToJestConfig, tree
             .read(pathToJestConfig, 'utf-8')