@nx/remix 18.0.3 → 18.0.5

package/package.json

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

package/src/executors/build/build.impl.js

@@ -53,7 +53,7 @@ async function buildExecutor(options, context) {
         packageJson.scripts ??= {};
         // Don't override existing custom script since project may have its own server.
         if (!packageJson.scripts.start) {
-            packageJson.scripts['start'] = 'remix-serve ./build';
+            packageJson.scripts['start'] = 'remix-serve ./build/index.js';
         }
         updatePackageJson(packageJson, context);
         (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);

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' }],
   },
@@ -406,6 +405,39 @@ installGlobals();
 "
 `;
 
+exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided --unitTestRunner should generate the correct files for testing using vitest 4`] = `
+"{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../dist/out-tsc",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ]
+  },
+  "include": [
+    "vite.config.ts",
+    "vitest.config.ts",
+    "app/**/*.ts",
+    "app/**/*.tsx",
+    "app/**/*.js",
+    "app/**/*.jsx",
+    "tests/**/*.spec.ts",
+    "tests/**/*.test.ts",
+    "tests/**/*.spec.tsx",
+    "tests/**/*.test.tsx",
+    "tests/**/*.spec.js",
+    "tests/**/*.test.js",
+    "tests/**/*.spec.jsx",
+    "tests/**/*.test.jsx"
+  ]
+}
+"
+`;
+
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=as-provided should create the application correctly 1`] = `
 "import { createWatchPaths } from '@nx/remix';
 import { dirname } from 'path';
@@ -801,9 +833,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' }],
   },
@@ -884,6 +915,39 @@ installGlobals();
 "
 `;
 
+exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived --unitTestRunner should generate the correct files for testing using vitest 4`] = `
+"{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ]
+  },
+  "include": [
+    "vite.config.ts",
+    "vitest.config.ts",
+    "app/**/*.ts",
+    "app/**/*.tsx",
+    "app/**/*.js",
+    "app/**/*.jsx",
+    "tests/**/*.spec.ts",
+    "tests/**/*.test.ts",
+    "tests/**/*.spec.tsx",
+    "tests/**/*.test.tsx",
+    "tests/**/*.spec.js",
+    "tests/**/*.test.js",
+    "tests/**/*.spec.jsx",
+    "tests/**/*.test.jsx"
+  ]
+}
+"
+`;
+
 exports[`Remix Application Integrated Repo --projectNameAndRootFormat=derived should create the application correctly 1`] = `
 "import { createWatchPaths } from '@nx/remix';
 import { dirname } from 'path';
@@ -1183,6 +1247,39 @@ test('renders loader data', async () => {
 `;
 
 exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using vitest 4`] = `
+"{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ]
+  },
+  "include": [
+    "vite.config.ts",
+    "vitest.config.ts",
+    "app/**/*.ts",
+    "app/**/*.tsx",
+    "app/**/*.js",
+    "app/**/*.jsx",
+    "tests/**/*.spec.ts",
+    "tests/**/*.test.ts",
+    "tests/**/*.spec.tsx",
+    "tests/**/*.test.tsx",
+    "tests/**/*.spec.js",
+    "tests/**/*.test.js",
+    "tests/**/*.spec.jsx",
+    "tests/**/*.test.jsx"
+  ]
+}
+"
+`;
+
+exports[`Remix Application Standalone Project Repo --unitTestRunner should generate the correct files for testing using vitest 5`] = `
 "import { installGlobals } from '@remix-run/node';
 import '@testing-library/jest-dom/matchers';
 installGlobals();

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/files/common/app/nx-welcome.tsx__tmpl__

@@ -735,7 +735,7 @@ export function NxWelcome({ title }: { title: string }) {
                   You can activate distributed tasks executions and caching by
                   running:
                 </p>
-                <pre>nx connect-to-nx-cloud</pre>
+                <pre>nx connect</pre>
                 <a
                   href="https://nx.app/?utm_source=nx-project"
                   target="_blank"

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')
@@ -26,7 +26,7 @@ function updateUnitTestConfig(tree, pathToRoot, unitTestRunner) {
     }
     const pathToTsConfigSpec = (0, devkit_1.joinPathFragments)(pathToRoot, `tsconfig.spec.json`);
     (0, devkit_1.updateJson)(tree, pathToTsConfigSpec, (json) => {
-        json.includes = [
+        json.include = [
             'vite.config.ts',
             'vitest.config.ts',
             'app/**/*.ts',

package/src/generators/init/init.js

@@ -41,6 +41,7 @@ async function remixInitGeneratorInternal(tree, options) {
         }, undefined, options.keepExistingVersions);
         tasks.push(installTask);
     }
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     if (options.addPlugin) {
         addPlugin(tree);
     }

package/src/plugins/__snapshots__/plugin.spec.ts.snap

@@ -17,10 +17,11 @@ exports[`@nx/remix/plugin non-root project should create nodes 1`] = `
             "^production",
           ],
           "options": {
-            "outputPath": "{workspaceRoot}/dist/my-app",
+            "outputPath": "my-app",
           },
           "outputs": [
-            "{options.outputPath}",
+            "{workspaceRoot}/my-app/build",
+            "{workspaceRoot}/my-app/public/build",
           ],
         },
         "serve": {
@@ -72,10 +73,11 @@ exports[`@nx/remix/plugin root project should create nodes 1`] = `
             "^production",
           ],
           "options": {
-            "outputPath": "{workspaceRoot}/dist",
+            "outputPath": ".",
           },
           "outputs": [
-            "{options.outputPath}",
+            "{workspaceRoot}/build",
+            "{workspaceRoot}/public/build",
           ],
         },
         "serve": {

package/src/plugins/plugin.js

@@ -54,16 +54,21 @@ exports.createNodes = [
 ];
 async function buildRemixTargets(configFilePath, projectRoot, options, context, siblingFiles) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const serverBuildPath = await getServerBuildPath(configFilePath, context.workspaceRoot);
+    const { buildDirectory, assetsBuildDirectory, serverBuildPath } = await getBuildPaths(configFilePath, context.workspaceRoot);
     const targets = {};
-    targets[options.buildTargetName] = buildTarget(options.buildTargetName, projectRoot, namedInputs);
+    targets[options.buildTargetName] = buildTarget(options.buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs);
     targets[options.serveTargetName] = serveTarget(serverBuildPath);
     targets[options.startTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName);
     targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs, siblingFiles);
     return targets;
 }
-function buildTarget(buildTargetName, projectRoot, namedInputs) {
-    const pathToOutput = projectRoot === '.' ? '' : `/${projectRoot}`;
+function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs) {
+    const serverBuildOutputPath = projectRoot === '.'
+        ? (0, devkit_1.joinPathFragments)(`{workspaceRoot}`, buildDirectory)
+        : (0, devkit_1.joinPathFragments)(`{workspaceRoot}`, projectRoot, buildDirectory);
+    const assetsBuildOutputPath = projectRoot === '.'
+        ? (0, devkit_1.joinPathFragments)(`{workspaceRoot}`, assetsBuildDirectory)
+        : (0, devkit_1.joinPathFragments)(`{workspaceRoot}`, projectRoot, assetsBuildDirectory);
     return {
         cache: true,
         dependsOn: [`^${buildTargetName}`],
@@ -72,10 +77,10 @@ function buildTarget(buildTargetName, projectRoot, namedInputs) {
                 ? ['production', '^production']
                 : ['default', '^default']),
         ],
-        outputs: ['{options.outputPath}'],
+        outputs: [serverBuildOutputPath, assetsBuildOutputPath],
         executor: '@nx/remix:build',
         options: {
-            outputPath: `{workspaceRoot}/dist${pathToOutput}`,
+            outputPath: projectRoot,
         },
     };
 }
@@ -112,10 +117,14 @@ function typecheckTarget(projectRoot, namedInputs, siblingFiles) {
         },
     };
 }
-async function getServerBuildPath(configFilePath, workspaceRoot) {
+async function getBuildPaths(configFilePath, workspaceRoot) {
     const configPath = (0, path_1.join)(workspaceRoot, configFilePath);
     let appConfig = await (0, config_utils_1.loadConfigFile)(configPath);
-    return appConfig.serverBuildPath ?? 'build/index.js';
+    return {
+        buildDirectory: 'build',
+        serverBuildPath: appConfig.serverBuildPath ?? 'build/index.js',
+        assetsBuildDirectory: appConfig.assetsBuildDirectory ?? 'public/build',
+    };
 }
 function normalizeOptions(options) {
     options ??= {};