feat(remix): support v2 for remix

nrwl · Dec 5, 2023 · 637de2e · 637de2e
1 parent dd0a90b
commit 637de2e
Show file tree

Hide file tree

Showing 54 changed files with 1,150 additions and 995 deletions.
diff --git a/package.json b/package.json
@@ -37,8 +37,8 @@
     "@nx/workspace": "17.0.1",
     "@nx/storybook": "17.0.1",
     "@phenomnomnominal/tsquery": "^5.0.1",
-    "@remix-run/dev": "1.15.0",
-    "@remix-run/node": "1.15.0",
+    "@remix-run/dev": "2.3.0",
+    "@remix-run/node": "2.3.0",
     "@rspack/core": "^0.1.12",
     "@rspack/dev-server": "^0.1.12",
     "@rspack/less-loader": "^0.0.22",

diff --git a/packages/remix/executors.json b/packages/remix/executors.json
@@ -10,17 +10,5 @@
       "schema": "./src/executors/build/schema.json",
       "description": "Build a Remix application."
     }
-  },
-  "builders": {
-    "serve": {
-      "implementation": "./src/executors/serve/compat",
-      "schema": "./src/executors/serve/schema.json",
-      "description": "Serve a Remix application."
-    },
-    "build": {
-      "implementation": "./src/executors/build/build.impl",
-      "schema": "./src/executors/build/schema.json",
-      "description": "Build a Remix application."
-    }
   }
 }
diff --git a/packages/remix/migrations.json b/packages/remix/migrations.json
@@ -149,6 +149,55 @@
           "alwaysAddToPackageJson": true
         }
       }
+    },
+    "17.1.0": {
+      "version": "17.1.0",
+      "packages": {
+        "@remix-run/node": {
+          "version": "^2.3.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/react": {
+          "version": "^2.3.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/serve": {
+          "version": "^2.3.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/dev": {
+          "version": "^2.3.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/css-bundle": {
+          "version": "^2.3.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@remix-run/eslint-config": {
+          "version": "^2.3.0",
+          "alwaysAddToPackageJson": true
+        },
+        "isbot": {
+          "version": "^3.6.8",
+          "alwaysAddToPackageJson": true
+        },
+        "eslint": {
+          "version": "^8.38.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@testing-library/react": {
+          "version": "^14.1.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/jest-dom": {
+          "version": "^6.1.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/user-event": {
+          "version": "^14.5.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/remix/src/executors/build/compat.ts b/packages/remix/src/executors/build/compat.ts
diff --git a/packages/remix/src/executors/serve/compat.ts b/packages/remix/src/executors/serve/compat.ts
diff --git a/packages/remix/src/generators/action/action.impl.spec.ts b/packages/remix/src/generators/action/action.impl.spec.ts
@@ -46,15 +46,15 @@ describe('action', () => {
         const content = tree.read('apps/demo/app/routes/example.tsx', 'utf-8');
         expect(content).toMatch(`import { json } from '@remix-run/node';`);
         expect(content).toMatch(
-          `import type { ActionArgs } from '@remix-run/node';`
+          `import type { ActionFunctionArgs } from '@remix-run/node';`
         );
         expect(content).toMatch(
           `import { useActionData } from '@remix-run/react';`
         );
       });
 
       it('should add action function', () => {
-        const actionFunction = `export const action = async ({ request }: ActionArgs)`;
+        const actionFunction = `export const action = async ({ request }: ActionFunctionArgs)`;
         const content = tree.read('apps/demo/app/routes/example.tsx', 'utf-8');
         expect(content).toMatch(actionFunction);
       });

diff --git a/packages/remix/src/generators/action/action.impl.ts b/packages/remix/src/generators/action/action.impl.ts
@@ -6,7 +6,7 @@ import { resolveRemixRouteFile } from '../../utils/remix-route-utils';
 import { LoaderSchema } from './schema';
 
 export default async function (tree: Tree, schema: LoaderSchema) {
-  const routeFilePath = resolveRemixRouteFile(
+  const routeFilePath = await resolveRemixRouteFile(
     tree,
     schema.path,
     schema.project
@@ -18,7 +18,7 @@ export default async function (tree: Tree, schema: LoaderSchema) {
     );
   }
 
-  insertImport(tree, routeFilePath, 'ActionArgs', '@remix-run/node', {
+  insertImport(tree, routeFilePath, 'ActionFunctionArgs', '@remix-run/node', {
     typeOnly: true,
   });
   insertImport(tree, routeFilePath, 'json', '@remix-run/node');
@@ -28,7 +28,7 @@ export default async function (tree: Tree, schema: LoaderSchema) {
     tree,
     routeFilePath,
     `
-    export const action = async ({ request }: ActionArgs) => {
+    export const action = async ({ request }: ActionFunctionArgs) => {
       let formData = await request.formData();
 
       return json({message: formData.toString()}, { status: 200 });