refactor(msw): Switch to V2 + Vite (remix-run#494)

twilsonn · May 30, 2024 · 2816fdb · 2816fdb
1 parent 84d33c0
commit 2816fdb
Show file tree

Hide file tree

Showing 13 changed files with 162 additions and 67 deletions.
diff --git a/msw/.eslintrc.cjs b/msw/.eslintrc.cjs
@@ -0,0 +1,84 @@
+/**
+ * This is intended to be a basic starting point for linting in your app.
+ * It relies on recommended configs out of the box for simplicity, but you can
+ * and should modify this configuration to best suit your team's needs.
+ */
+
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+  },
+  ignorePatterns: ["!**/.server", "!**/.client"],
+
+  // Base config
+  extends: ["eslint:recommended"],
+
+  overrides: [
+    // React
+    {
+      files: ["**/*.{js,jsx,ts,tsx}"],
+      plugins: ["react", "jsx-a11y"],
+      extends: [
+        "plugin:react/recommended",
+        "plugin:react/jsx-runtime",
+        "plugin:react-hooks/recommended",
+        "plugin:jsx-a11y/recommended",
+      ],
+      settings: {
+        react: {
+          version: "detect",
+        },
+        formComponents: ["Form"],
+        linkComponents: [
+          { name: "Link", linkAttribute: "to" },
+          { name: "NavLink", linkAttribute: "to" },
+        ],
+        "import/resolver": {
+          typescript: {},
+        },
+      },
+    },
+
+    // Typescript
+    {
+      files: ["**/*.{ts,tsx}"],
+      plugins: ["@typescript-eslint", "import"],
+      parser: "@typescript-eslint/parser",
+      settings: {
+        "import/internal-regex": "^~/",
+        "import/resolver": {
+          node: {
+            extensions: [".ts", ".tsx"],
+          },
+          typescript: {
+            alwaysTryTypes: true,
+          },
+        },
+      },
+      extends: [
+        "plugin:@typescript-eslint/recommended",
+        "plugin:import/recommended",
+        "plugin:import/typescript",
+      ],
+    },
+
+    // Node
+    {
+      files: [".eslintrc.cjs"],
+      env: {
+        node: true,
+      },
+    },
+  ],
+};
diff --git a/msw/.eslintrc.js b/msw/.eslintrc.js
diff --git a/msw/.gitignore b/msw/.gitignore
@@ -2,5 +2,4 @@ node_modules
 
 /.cache
 /build
-/public/build
 .env
diff --git a/msw/README.md b/msw/README.md
@@ -19,15 +19,10 @@ We can mock the HTTP calls using MSW, which intercepts the API calls from the se
 
 You can read more about the use cases of MSW [here](https://mswjs.io/docs/#when-to-mock-api)
 
-## Gotchas
-
-MSW currently does not support intercepting requests made by [undici](https://undici.nodejs.org/#/). For local development, Cloudflare Workers and Pages simulates the production environment using [wrangler](https://developers.cloudflare.com/workers/cli-wrangler), which runs [miniflare](https://github.com/cloudflare/miniflare) internally. `Miniflare` implements `fetch` using `undici` instead of `node-fetch`. You can follow this issue [#159](https://github.com/mswjs/interceptors/issues/159) to track the progress.
-
 ## Relevant files
 
-- [mocks](./mocks/index.js) - registers the Node HTTP mock server
-- [handlers](./mocks/handlers.js) - describes the HTTP mocks
-- [root](./app/root.tsx)
+- [mocks](./mocks/index.cjs) - registers the Node HTTP mock server
+- [handlers](./mocks/handlers.cjs) - describes the HTTP mocks
 - [package.json](./package.json)
 
 ## Related Links

diff --git a/msw/app/root.tsx b/msw/app/root.tsx
@@ -1,32 +1,29 @@
-import type { MetaFunction } from "@remix-run/node";
 import {
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
 
-export const meta: MetaFunction = () => ({
-  charset: "utf-8",
-  title: "New Remix App",
-  viewport: "width=device-width,initial-scale=1",
-});
-
-export default function App() {
+export function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
       <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <Meta />
         <Links />
       </head>
       <body>
-        <Outlet />
+        {children}
         <ScrollRestoration />
         <Scripts />
-        <LiveReload />
       </body>
     </html>
   );
 }
+
+export default function App() {
+  return <Outlet />;
+}
diff --git a/msw/mocks/handlers.cjs b/msw/mocks/handlers.cjs
@@ -0,0 +1,9 @@
+const { http, HttpResponse } = require("msw");
+
+const handlers = [
+  http.get("https://my-mock-api.com", () => {
+    return HttpResponse.json({ message: "from msw" });
+  }),
+];
+
+module.exports = handlers;
diff --git a/msw/mocks/handlers.js b/msw/mocks/handlers.js
diff --git a/msw/mocks/index.js → msw/mocks/index.cjs b/msw/mocks/index.js → msw/mocks/index.cjs
@@ -1,7 +1,7 @@
 const { setupServer } = require("msw/node");
 
-const handlers = require("./handlers");
+const handlers = require("./handlers.cjs");
 
 const server = setupServer(...handlers);
 server.listen({ onUnhandledRequest: "warn" });
-console.info("MSW initialised");
+console.info("MSW initialized");
diff --git a/msw/package.json b/msw/package.json
@@ -1,31 +1,42 @@
 {
+  "name": "msw",
   "private": true,
   "sideEffects": false,
+  "type": "module",
   "scripts": {
-    "build": "remix build",
-    "dev": "binode --require ./mocks -- @remix-run/dev:remix dev",
-    "start": "remix-serve build",
+    "build": "remix vite:build",
+    "dev": "binode --require ./mocks/index.cjs -- @remix-run/dev:remix vite:dev",
+    "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
+    "start": "remix-serve ./build/server/index.js",
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "^1.19.3",
-    "@remix-run/react": "^1.19.3",
-    "@remix-run/serve": "^1.19.3",
-    "isbot": "^3.6.5",
+    "@remix-run/node": "^2.9.2",
+    "@remix-run/react": "^2.9.2",
+    "@remix-run/serve": "^2.9.2",
+    "isbot": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.19.3",
-    "@remix-run/eslint-config": "^1.19.3",
-    "@types/react": "^18.0.25",
-    "@types/react-dom": "^18.0.8",
+    "@remix-run/dev": "^2.9.2",
+    "@types/react": "^18.2.20",
+    "@types/react-dom": "^18.2.7",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
     "binode": "^1.0.5",
-    "eslint": "^8.27.0",
-    "msw": "^0.47.3",
-    "typescript": "^4.8.4"
+    "eslint": "^8.38.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "msw": "^2.3",
+    "typescript": "^5.1.6",
+    "vite": "^5.1.0",
+    "vite-tsconfig-paths": "^4.2.1"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.0.0"
   }
 }
diff --git a/msw/remix.config.js b/msw/remix.config.js
diff --git a/msw/remix.env.d.ts b/msw/remix.env.d.ts
diff --git a/msw/tsconfig.json b/msw/tsconfig.json
@@ -1,22 +1,32 @@
 {
-  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "**/.server/**/*.ts",
+    "**/.server/**/*.tsx",
+    "**/.client/**/*.ts",
+    "**/.client/**/*.tsx"
+  ],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2019"],
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "types": ["@remix-run/node", "vite/client"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "moduleResolution": "node",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
-    "target": "ES2019",
+    "target": "ES2022",
     "strict": true,
     "allowJs": true,
+    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"]
     },
 
-    // Remix takes care of building everything in `remix build`.
+    // Vite takes care of building everything, not tsc.
     "noEmit": true
   }
 }
diff --git a/msw/vite.config.ts b/msw/vite.config.ts
@@ -0,0 +1,16 @@
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+export default defineConfig({
+  plugins: [
+    remix({
+      future: {
+        v3_fetcherPersist: true,
+        v3_relativeSplatPath: true,
+        v3_throwAbortReason: true,
+      },
+    }),
+    tsconfigPaths(),
+  ],
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,4 @@ node_modules @@
     /.cache
     /build
-    /public/build
     .env