@nx/remix 20.3.2 → 20.4.0-beta.1

package/package.json

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

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

@@ -156,7 +156,6 @@ export default defineConfig({
 exports[`Remix Application Integrated Repo --e2eTestRunner should generate a playwright e2e application for the app 1`] = `
 "import { defineConfig, devices } from '@playwright/test';
 import { nxE2EPreset } from '@nx/playwright/preset';
-
 import { workspaceRoot } from '@nx/devkit';
 
 // For CI, you may want to set BASE_URL to the deployed application.
@@ -678,7 +677,6 @@ exports[`Remix Application Standalone Project Repo should create the application
 exports[`Remix Application Standalone Project Repo should generate a playwright e2e application for the app 1`] = `
 "import { defineConfig, devices } from '@playwright/test';
 import { nxE2EPreset } from '@nx/playwright/preset';
-
 import { workspaceRoot } from '@nx/devkit';
 
 // For CI, you may want to set BASE_URL to the deployed application.

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

@@ -13,6 +13,7 @@ const init_1 = require("../init/init");
 const update_dependencies_1 = require("../utils/update-dependencies");
 const lib_1 = require("./lib");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 function remixApplicationGenerator(tree, options) {
     return remixApplicationGeneratorInternal(tree, {
         addPlugin: true,
@@ -29,6 +30,7 @@ async function remixApplicationGeneratorInternal(tree, _options) {
             skipFormat: true,
             addTsPlugin: _options.useTsSolution,
             formatter: _options.formatter,
+            platform: 'web',
         }),
     ];
     const options = await (0, lib_1.normalizeOptions)(tree, _options);
@@ -200,6 +202,7 @@ export default {...nxPreset};
     if (options.useTsSolution) {
         (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
+    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/init/init.js

@@ -36,8 +36,18 @@ async function remixInitGeneratorInternal(tree, options) {
             ],
             serveStaticTargetName: [
                 'serve-static',
-                'vite:serve-static',
-                'vite-serve-static',
+                'remix:serve-static',
+                'remix-serve-static',
+            ],
+            buildDepsTargetName: [
+                'build-deps',
+                'remix:build-deps',
+                'remix-build-deps',
+            ],
+            watchDepsTargetName: [
+                'watch-deps',
+                'remix:watch-deps',
+                'remix-watch-deps',
             ],
         }, options.updatePackageScripts);
     }

package/src/generators/library/library.impl.js

@@ -7,6 +7,7 @@ const js_1 = require("@nx/js");
 const react_1 = require("@nx/react");
 const lib_1 = require("./lib");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function remixLibraryGenerator(tree, schema) {
     return remixLibraryGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
@@ -52,6 +53,7 @@ async function remixLibraryGeneratorInternal(tree, schema) {
     if (options.isUsingTsSolutionConfig) {
         (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
+    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -33,6 +33,112 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
                 "{workspaceRoot}/my-app/public/build",
               ],
             },
+            "build-deps": {
+              "dependsOn": [
+                "^build",
+              ],
+            },
+            "dev": {
+              "command": "remix dev --manual",
+              "options": {
+                "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": [
+                "build",
+              ],
+              "options": {
+                "cwd": "my-app",
+              },
+            },
+            "static-serve": {
+              "command": "remix-serve build/index.js",
+              "dependsOn": [
+                "build",
+              ],
+              "options": {
+                "cwd": "my-app",
+              },
+            },
+            "tsc": {
+              "cache": true,
+              "command": "tsc",
+              "inputs": [
+                "production",
+                "^production",
+                {
+                  "externalDependencies": [
+                    "typescript",
+                  ],
+                },
+              ],
+              "options": {
+                "cwd": "my-app",
+              },
+            },
+            "watch-deps": {
+              "command": "npx nx watch --projects my-app --includeDependentProjects -- npx nx build-deps my-app",
+              "dependsOn": [
+                "build-deps",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+]
+`;
+
+exports[`@nx/remix/plugin Remix Classic Compiler non-root project should infer watch-deps target 1`] = `
+[
+  [
+    "my-app/remix.config.cjs",
+    {
+      "projects": {
+        "my-app": {
+          "metadata": {},
+          "root": "my-app",
+          "targets": {
+            "build": {
+              "cache": true,
+              "command": "remix build",
+              "dependsOn": [
+                "^build",
+              ],
+              "inputs": [
+                "production",
+                "^production",
+                {
+                  "externalDependencies": [
+                    "@remix-run/dev",
+                  ],
+                },
+              ],
+              "options": {
+                "cwd": "my-app",
+              },
+              "outputs": [
+                "{workspaceRoot}/my-app/build",
+                "{workspaceRoot}/my-app/public/build",
+              ],
+            },
+            "build-deps": {
+              "dependsOn": [
+                "^build",
+              ],
+            },
             "dev": {
               "command": "remix dev --manual",
               "options": {
@@ -82,6 +188,12 @@ exports[`@nx/remix/plugin Remix Classic Compiler non-root project should create
                 "cwd": "my-app",
               },
             },
+            "watch-deps": {
+              "command": "npx nx watch --projects my-app --includeDependentProjects -- npx nx build-deps my-app",
+              "dependsOn": [
+                "build-deps",
+              ],
+            },
           },
         },
       },
@@ -212,6 +324,11 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
                 "{workspaceRoot}/my-app/build",
               ],
             },
+            "build-deps": {
+              "dependsOn": [
+                "^build",
+              ],
+            },
             "dev": {
               "command": "remix vite:dev",
               "options": {
@@ -261,6 +378,12 @@ exports[`@nx/remix/plugin Remix Vite Compiler non-root project should create nod
                 "cwd": "my-app",
               },
             },
+            "watch-deps": {
+              "command": "npx nx watch --projects my-app --includeDependentProjects -- npx nx build-deps my-app",
+              "dependsOn": [
+                "build-deps",
+              ],
+            },
           },
         },
       },

package/src/plugins/plugin.d.ts

@@ -4,6 +4,8 @@ export interface RemixPluginOptions {
     devTargetName?: string;
     startTargetName?: string;
     typecheckTargetName?: string;
+    buildDepsTargetName?: string;
+    watchDepsTargetName?: string;
     /**
      * @deprecated Use serveStaticTargetName instead. This option will be removed in Nx 21.
      */

package/src/plugins/plugin.js

@@ -11,6 +11,8 @@ const js_1 = require("@nx/js");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const executor_utils_1 = require("../utils/executor-utils");
+const util_1 = require("@nx/js/src/plugins/typescript/util");
+const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -87,6 +89,7 @@ async function buildRemixTargets(configFilePath, projectRoot, options, context,
     targets[options.staticServeTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler);
     targets[options.serveStaticTargetName] = startTarget(projectRoot, serverBuildPath, options.buildTargetName, remixCompiler);
     targets[options.typecheckTargetName] = typecheckTarget(projectRoot, namedInputs, siblingFiles);
+    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return { targets, metadata: {} };
 }
 function buildTarget(buildTargetName, projectRoot, buildDirectory, assetsBuildDirectory, namedInputs, remixCompiler) {

package/src/utils/versions.d.ts

@@ -7,7 +7,7 @@ export declare const reactDomVersion = "^18.2.0";
 export declare const typesReactVersion = "^18.2.0";
 export declare const typesReactDomVersion = "^18.2.0";
 export declare const eslintVersion = "^8.56.0";
-export declare const typescriptVersion = "~5.6.2";
+export declare const typescriptVersion = "~5.7.2";
 export declare const tailwindVersion = "^3.3.0";
 export declare const postcssVersion = "^8.4.38";
 export declare const autoprefixerVersion = "^10.4.19";

package/src/utils/versions.js

@@ -12,7 +12,7 @@ exports.reactDomVersion = '^18.2.0';
 exports.typesReactVersion = '^18.2.0';
 exports.typesReactDomVersion = '^18.2.0';
 exports.eslintVersion = '^8.56.0';
-exports.typescriptVersion = '~5.6.2';
+exports.typescriptVersion = '~5.7.2';
 exports.tailwindVersion = '^3.3.0';
 exports.postcssVersion = '^8.4.38';
 exports.autoprefixerVersion = '^10.4.19';