@nx/remix 18.1.0 → 18.1.2

package/migrations.json

@@ -102,6 +102,35 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.1.1": {
+      "version": "18.1.1-beta.0",
+      "packages": {
+        "@remix-run/node": {
+          "version": "^2.8.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/react": {
+          "version": "^2.8.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/serve": {
+          "version": "^2.8.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/dev": {
+          "version": "^2.8.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/css-bundle": {
+          "version": "^2.8.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/eslint-config": {
+          "version": "^2.8.0",
+          "alwaysAddToPackageJson": true
+        }
+      }
     }
   }
 }

package/package.json

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

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

@@ -1147,8 +1147,7 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: './coverage/test',
   testMatch: [
-    '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
-    '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
+    '<rootDir>/tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
   ],
 };
 "

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

@@ -10,6 +10,7 @@ const init_1 = require("../init/init");
 const js_1 = require("@nx/js");
 const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 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");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: false,
@@ -185,6 +186,18 @@ async function remixApplicationGeneratorInternal(tree, _options) {
         // Otherwise, extract the tsconfig.base.json from tsconfig.json so we can share settings.
         (0, create_ts_config_1.extractTsConfigBase)(tree);
     }
+    if (options.rootProject) {
+        (0, devkit_1.updateJson)(tree, `package.json`, (json) => {
+            json.type = 'module';
+            return json;
+        });
+        if (options.unitTestRunner === 'jest') {
+            tree.write('jest.preset.js', `import { nxPreset } from '@nx/jest/preset/jest-preset.js';
+export default {...nxPreset};
+`);
+            (0, testing_config_utils_1.updateJestTestMatch)(tree, 'jest.config.ts', '<rootDir>/tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}');
+        }
+    }
     tasks.push(await (0, lib_1.addE2E)(tree, options));
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/init/init.js

@@ -19,7 +19,7 @@ function addPlugin(tree) {
         plugin: '@nx/remix/plugin',
         options: {
             buildTargetName: 'build',
-            serveTargetName: 'serve',
+            devTargetName: 'dev',
             startTargetName: 'start',
             typecheckTargetName: 'typecheck',
         },

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

@@ -8,30 +8,30 @@ exports[`@nx/remix/plugin non-root project should create nodes 1`] = `
       "targets": {
         "build": {
           "cache": true,
+          "command": "remix build",
           "dependsOn": [
             "^build",
           ],
-          "executor": "@nx/remix:build",
           "inputs": [
             "production",
             "^production",
           ],
           "options": {
-            "outputPath": "my-app",
+            "cwd": "my-app",
           },
           "outputs": [
             "{workspaceRoot}/my-app/build",
             "{workspaceRoot}/my-app/public/build",
           ],
         },
-        "serve": {
-          "executor": "@nx/remix:serve",
+        "dev": {
+          "command": "remix dev --manual",
           "options": {
-            "command": "npx remix-serve build/index.js",
+            "cwd": "my-app",
           },
         },
         "start": {
-          "command": "npx remix-serve build/index.js",
+          "command": "remix-serve build/index.js",
           "dependsOn": [
             "build",
           ],
@@ -64,30 +64,30 @@ exports[`@nx/remix/plugin root project should create nodes 1`] = `
       "targets": {
         "build": {
           "cache": true,
+          "command": "remix build",
           "dependsOn": [
             "^build",
           ],
-          "executor": "@nx/remix:build",
           "inputs": [
             "production",
             "^production",
           ],
           "options": {
-            "outputPath": ".",
+            "cwd": ".",
           },
           "outputs": [
             "{workspaceRoot}/build",
             "{workspaceRoot}/public/build",
           ],
         },
-        "serve": {
-          "executor": "@nx/remix:serve",
+        "dev": {
+          "command": "remix dev --manual",
           "options": {
-            "command": "npx remix-serve build/index.js",
+            "cwd": ".",
           },
         },
         "start": {
-          "command": "npx remix-serve build/index.js",
+          "command": "remix-serve build/index.js",
           "dependsOn": [
             "build",
           ],

package/src/plugins/plugin.d.ts

@@ -2,7 +2,7 @@ import { type CreateDependencies, type CreateNodes } from '@nx/devkit';
 export declare const createDependencies: CreateDependencies;
 export interface RemixPluginOptions {
     buildTargetName?: string;
-    serveTargetName?: string;
+    devTargetName?: string;
     startTargetName?: string;
     typecheckTargetName?: string;
 }

package/src/plugins/plugin.js

@@ -31,7 +31,9 @@ exports.createNodes = [
         // Do not create a project if package.json and project.json isn't there
         const siblingFiles = (0, fs_1.readdirSync)(fullyQualifiedProjectRoot);
         if (!siblingFiles.includes('package.json') &&
-            !siblingFiles.includes('project.json')) {
+            !siblingFiles.includes('project.json') &&
+            !siblingFiles.includes('vite.config.ts') &&
+            !siblingFiles.includes('vite.config.js')) {
             return {};
         }
         options = normalizeOptions(options);
@@ -57,7 +59,7 @@ async function buildRemixTargets(configFilePath, projectRoot, options, context,
     const { buildDirectory, assetsBuildDirectory, serverBuildPath } = await getBuildPaths(configFilePath, context.workspaceRoot);
     const targets = {};
     targets[options.buildTargetName] = buildTarget(options.buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs);
-    targets[options.serveTargetName] = serveTarget(serverBuildPath);
+    targets[options.devTargetName] = devTarget(serverBuildPath, projectRoot);
     targets[options.startTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName);
     targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs, siblingFiles);
     return targets;
@@ -78,24 +80,20 @@ function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDi
                 : ['default', '^default']),
         ],
         outputs: [serverBuildOutputPath, assetsBuildOutputPath],
-        executor: '@nx/remix:build',
-        options: {
-            outputPath: projectRoot,
-        },
+        command: 'remix build',
+        options: { cwd: projectRoot },
     };
 }
-function serveTarget(serverBuildPath) {
+function devTarget(serverBuildPath, projectRoot) {
     return {
-        executor: '@nx/remix:serve',
-        options: {
-            command: `npx remix-serve ${serverBuildPath}`,
-        },
+        command: 'remix dev --manual',
+        options: { cwd: projectRoot },
     };
 }
 function startTarget(projectRoot, serverBuildPath, buildTargetName) {
     return {
         dependsOn: [buildTargetName],
-        command: `npx remix-serve ${serverBuildPath}`,
+        command: `remix-serve ${serverBuildPath}`,
         options: {
             cwd: projectRoot,
         },
@@ -129,7 +127,7 @@ async function getBuildPaths(configFilePath, workspaceRoot) {
 function normalizeOptions(options) {
     options ??= {};
     options.buildTargetName ??= 'build';
-    options.serveTargetName ??= 'serve';
+    options.devTargetName ??= 'dev';
     options.startTargetName ??= 'start';
     options.typecheckTargetName ??= 'typecheck';
     return options;

package/src/utils/testing-config-utils.d.ts

@@ -1,4 +1,5 @@
 import { type Tree } from '@nx/devkit';
 export declare function updateVitestTestSetup(tree: Tree, pathToVitestConfig: string, pathToTestSetup: string): void;
 export declare function updateJestTestSetup(tree: Tree, pathToJestConfig: string, pathToTestSetup: string): void;
+export declare function updateJestTestMatch(tree: Tree, pathToJestConfig: string, includesString: string): void;
 export declare function updateVitestTestIncludes(tree: Tree, pathToVitestConfig: string, includesString: string): void;

package/src/utils/testing-config-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateVitestTestIncludes = exports.updateJestTestSetup = exports.updateVitestTestSetup = void 0;
+exports.updateVitestTestIncludes = exports.updateJestTestMatch = exports.updateJestTestSetup = exports.updateVitestTestSetup = void 0;
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
@@ -62,6 +62,21 @@ function updateJestTestSetup(tree, pathToJestConfig, pathToTestSetup) {
     }
 }
 exports.updateJestTestSetup = updateJestTestSetup;
+function updateJestTestMatch(tree, pathToJestConfig, includesString) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const fileContents = tree.read(pathToJestConfig, 'utf-8');
+    const ast = tsquery.ast(fileContents);
+    const TEST_MATCH_SELECTOR = 'PropertyAssignment:has(Identifier[name=testMatch])';
+    const nodes = tsquery(ast, TEST_MATCH_SELECTOR, { visitAllChildren: true });
+    if (nodes.length !== 0) {
+        const updatedFileContents = (0, devkit_1.stripIndents) `${fileContents.slice(0, nodes[0].getStart())}testMatch: ["${includesString}"]${fileContents.slice(nodes[0].getEnd())}`;
+        tree.write(pathToJestConfig, updatedFileContents);
+    }
+}
+exports.updateJestTestMatch = updateJestTestMatch;
 function updateVitestTestIncludes(tree, pathToVitestConfig, includesString) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 import { Tree } from '@nx/devkit';
 export declare const nxVersion: any;
-export declare const remixVersion = "^2.6.0";
+export declare const remixVersion = "^2.8.1";
 export declare const isbotVersion = "^4.4.0";
 export declare const reactVersion = "^18.2.0";
 export declare const reactDomVersion = "^18.2.0";

package/src/utils/versions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageVersion = exports.getRemixVersion = exports.testingLibraryUserEventsVersion = exports.testingLibraryJestDomVersion = exports.testingLibraryReactVersion = exports.tailwindVersion = exports.typescriptVersion = exports.eslintVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.isbotVersion = exports.remixVersion = exports.nxVersion = void 0;
 const devkit_1 = require("@nx/devkit");
 exports.nxVersion = require('../../package.json').version;
-exports.remixVersion = '^2.6.0';
+exports.remixVersion = '^2.8.1';
 exports.isbotVersion = '^4.4.0';
 exports.reactVersion = '^18.2.0';
 exports.reactDomVersion = '^18.2.0';