@nx/remix 19.6.2 → 19.6.4

package/package.json

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

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

@@ -153,7 +153,12 @@ export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {
       cypressDir: 'src',
-      webServerCommands: { default: 'nx run test:dev:development' },
+      webServerCommands: {
+        default: 'npx nx run test:dev',
+        production: 'npx nx run test:serve-static',
+      },
+      ciWebServerCommand: 'npx nx run test:serve-static',
+      ciBaseUrl: 'http://localhost:3000',
     }),
     baseUrl: 'http://localhost:3000',
   },
@@ -189,7 +194,7 @@ export default defineConfig({
   },
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'npx nx dev test',
+    command: 'npx nx run test:serve-static',
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     cwd: workspaceRoot,
@@ -664,7 +669,12 @@ export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {
       cypressDir: 'src',
-      webServerCommands: { default: 'nx run test:dev:development' },
+      webServerCommands: {
+        default: 'npx nx run test:dev',
+        production: 'npx nx run test:serve-static',
+      },
+      ciWebServerCommand: 'npx nx run test:serve-static',
+      ciBaseUrl: 'http://localhost:3000',
     }),
     baseUrl: 'http://localhost:3000',
   },
@@ -700,7 +710,7 @@ export default defineConfig({
   },
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'npx nx dev test',
+    command: 'npx nx run test:serve-static',
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     cwd: workspaceRoot,
@@ -1031,7 +1041,12 @@ export default defineConfig({
   e2e: {
     ...nxE2EPreset(__filename, {
       cypressDir: 'src',
-      webServerCommands: { default: 'nx run test:dev:development' },
+      webServerCommands: {
+        default: 'npx nx run test:dev',
+        production: 'npx nx run test:serve-static',
+      },
+      ciWebServerCommand: 'npx nx run test:serve-static',
+      ciBaseUrl: 'http://localhost:3000',
     }),
     baseUrl: 'http://localhost:3000',
   },
@@ -1431,7 +1446,7 @@ export default defineConfig({
   },
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'npx nx dev test',
+    command: 'npx nx run test:serve-static',
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     cwd: workspaceRoot,

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

@@ -58,7 +58,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
                         cwd: options.projectRoot,
                     },
                 },
-                ['static-serve']: {
+                ['serve-static']: {
                     dependsOn: ['build'],
                     command: `remix-serve build/index.js`,
                     options: {

package/src/generators/application/lib/add-e2e.js

@@ -5,10 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 async function addE2E(tree, options) {
     const hasRemixPlugin = (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
         ? p === '@nx/remix/plugin'
         : p.plugin === '@nx/remix/plugin');
+    let e2eWebsServerInfo = await getRemixE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.projectRoot, 'remix.config.js'), options.addPlugin ?? Boolean(hasRemixPlugin));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', (0, versions_1.getPackageVersion)(tree, 'nx'));
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -23,8 +25,18 @@ async function addE2E(tree, options) {
             project: options.e2eProjectName,
             directory: 'src',
             skipFormat: true,
-            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}:development`,
-            baseUrl: options.e2eWebServerAddress,
+            devServerTarget: e2eWebsServerInfo.e2eDevServerTarget,
+            baseUrl: e2eWebsServerInfo.e2eWebServerAddress,
+            webServerCommands: hasRemixPlugin
+                ? {
+                    default: e2eWebsServerInfo.e2eWebServerCommand,
+                    production: e2eWebsServerInfo.e2eCiWebServerCommand,
+                }
+                : undefined,
+            ciWebServerCommand: hasRemixPlugin
+                ? e2eWebsServerInfo.e2eCiWebServerCommand
+                : undefined,
+            ciBaseUrl: e2eWebsServerInfo.e2eCiBaseUrl,
             addPlugin: options.addPlugin,
         });
         if (options.addPlugin ||
@@ -60,8 +72,8 @@ async function addE2E(tree, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: false,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
-            webServerAddress: options.e2eWebServerAddress,
+            webServerCommand: e2eWebsServerInfo.e2eCiWebServerCommand,
+            webServerAddress: e2eWebsServerInfo.e2eCiBaseUrl,
             rootProject: options.rootProject,
             addPlugin: options.addPlugin,
         });
@@ -84,3 +96,24 @@ async function addE2E(tree, options) {
         return () => { };
     }
 }
+async function getRemixE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = isPluginBeingAdded ? 3000 : 4200;
+    const defaultServeTarget = isPluginBeingAdded ? 'dev' : 'serve';
+    if (nxJson.targetDefaults?.[defaultServeTarget] &&
+        nxJson.targetDefaults?.[defaultServeTarget].options?.port) {
+        e2ePort = nxJson.targetDefaults?.[defaultServeTarget].options?.port;
+    }
+    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+        plugin: '@nx/remix/plugin',
+        serveTargetName: 'serveTargetName',
+        serveStaticTargetName: 'serveStaticTargetName',
+        configFilePath,
+    }, {
+        defaultServeTargetName: defaultServeTarget,
+        defaultServeStaticTargetName: 'serve-static',
+        defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
+        defaultE2ECiBaseUrl: 'http://localhost:3000',
+        defaultE2EPort: e2ePort,
+    }, isPluginBeingAdded);
+}

package/src/generators/application/lib/normalize-options.d.ts

@@ -5,9 +5,6 @@ export interface NormalizedSchema extends NxRemixGeneratorSchema {
     projectRoot: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
-    e2eWebServerAddress: string;
-    e2eWebServerTarget: string;
-    e2ePort: number;
     parsedTags: string[];
 }
 export declare function normalizeOptions(tree: Tree, options: NxRemixGeneratorSchema): Promise<NormalizedSchema>;

package/src/generators/application/lib/normalize-options.js

@@ -19,30 +19,8 @@ async function normalizeOptions(tree, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    let e2eWebServerTarget = options.addPlugin ? 'dev' : 'serve';
-    if (options.addPlugin) {
-        if (nxJson.plugins) {
-            for (const plugin of nxJson.plugins) {
-                if (typeof plugin === 'object' &&
-                    plugin.plugin === '@nx/remix/plugin' &&
-                    plugin.options.devTargetName) {
-                    e2eWebServerTarget = plugin.options
-                        .devTargetName;
-                }
-            }
-        }
-    }
-    let e2ePort = options.addPlugin ? 3000 : 4200;
-    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
-        (nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-                nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT;
-    }
     const e2eProjectName = options.rootProject ? 'e2e' : `${projectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${projectRoot}-e2e`;
-    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -53,9 +31,6 @@ async function normalizeOptions(tree, options) {
         projectRoot,
         e2eProjectName,
         e2eProjectRoot,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2ePort,
         parsedTags,
     };
 }

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

@@ -35,6 +35,15 @@ exports[`@nx/remix/plugin non-root project should create nodes 1`] = `
             "cwd": "my-app",
           },
         },
+        "serve-static": {
+          "command": "remix-serve build/index.js",
+          "dependsOn": [
+            "build",
+          ],
+          "options": {
+            "cwd": "my-app",
+          },
+        },
         "start": {
           "command": "remix-serve build/index.js",
           "dependsOn": [
@@ -110,6 +119,15 @@ exports[`@nx/remix/plugin root project should create nodes 1`] = `
             "cwd": ".",
           },
         },
+        "serve-static": {
+          "command": "remix-serve build/index.js",
+          "dependsOn": [
+            "build",
+          ],
+          "options": {
+            "cwd": ".",
+          },
+        },
         "start": {
           "command": "remix-serve build/index.js",
           "dependsOn": [

package/src/plugins/plugin.d.ts

@@ -5,6 +5,10 @@ export interface RemixPluginOptions {
     devTargetName?: string;
     startTargetName?: string;
     typecheckTargetName?: string;
+    /**
+     * @deprecated Use serveStaticTargetName instead. This option will be removed in Nx 21.
+     */
     staticServeTargetName?: string;
+    serveStaticTargetName?: string;
 }
 export declare const createNodes: CreateNodes<RemixPluginOptions>;

package/src/plugins/plugin.js

@@ -59,7 +59,9 @@ async function buildRemixTargets(configFilePath, projectRoot, options, context,
     targets[options.buildTargetName] = buildTarget(options.buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs);
     targets[options.devTargetName] = devTarget(serverBuildPath, projectRoot);
     targets[options.startTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName);
+    // TODO(colum): Remove for Nx 21
     targets[options.staticServeTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName);
+    targets[options.serveStaticTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName);
     targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs, siblingFiles);
     return targets;
 }
@@ -131,6 +133,8 @@ function normalizeOptions(options) {
     options.devTargetName ??= 'dev';
     options.startTargetName ??= 'start';
     options.typecheckTargetName ??= 'typecheck';
+    // TODO(colum): remove for Nx 21
     options.staticServeTargetName ??= 'static-serve';
+    options.serveStaticTargetName ??= 'serve-static';
     return options;
 }