lazarv · lazarv · Sep 11, 2024 · Sep 11, 2024
diff --git a/examples/chakra-ui/app/Chakra.jsx b/examples/chakra-ui/app/Chakra.jsx
@@ -0,0 +1,4 @@
+"use client";
+
+import { Button, Spinner } from "@chakra-ui/react";
+export { Button, Spinner };
diff --git a/examples/chakra-ui/app/Providers.jsx b/examples/chakra-ui/app/Providers.jsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { ChakraProvider } from "@chakra-ui/react";
+
+export default function Providers({ children }) {
+  return <ChakraProvider>{children}</ChakraProvider>;
+}
diff --git a/examples/chakra-ui/app/layout.jsx b/examples/chakra-ui/app/layout.jsx
@@ -0,0 +1,11 @@
+import Providers from "./Providers";
+
+export default function Layout({ children }) {
+  return (
+    <html lang="en">
+      <body>
+        <Providers>{children}</Providers>
+      </body>
+    </html>
+  );
+}
diff --git a/examples/chakra-ui/app/page.jsx b/examples/chakra-ui/app/page.jsx
@@ -0,0 +1,17 @@
+import { Suspense } from "react";
+
+import { Button, Spinner } from "./Chakra";
+
+async function AsyncComponent() {
+  await new Promise((resolve) => setTimeout(resolve, 1000));
+  return null;
+}
+
+export default function Page() {
+  return (
+    <Suspense fallback={<Spinner />}>
+      <AsyncComponent />
+      <Button>Hello Chakra UI!</Button>
+    </Suspense>
+  );
+}
diff --git a/examples/chakra-ui/package.json b/examples/chakra-ui/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@lazarv/react-server-example-chakra-ui",
+  "private": true,
+  "description": "@lazarv/react-server Chakra UI example application",
+  "scripts": {
+    "dev": "react-server",
+    "build": "react-server build",
+    "start": "react-server start"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@lazarv/react-server": "workspace:^",
+    "@lazarv/react-server-router": "workspace:^",
+    "@chakra-ui/react": "^2.8.2",
+    "@emotion/react": "^11.13.3",
+    "@emotion/styled": "^11.13.0",
+    "framer-motion": "^11.5.4"
+  }
+}
diff --git a/examples/chakra-ui/react-server.config.mjs b/examples/chakra-ui/react-server.config.mjs
@@ -0,0 +1,22 @@
+export default {
+  root: "app",
+  public: "public",
+  page: {
+    include: ["**/page.jsx"],
+  },
+  layout: {
+    include: ["**/layout.jsx"],
+  },
+  build: {
+    chunkSizeWarningLimit: 1000,
+    rollupOptions: {
+      output: {
+        manualChunks(id) {
+          if (id.includes("@chakra-ui/react")) {
+            return "@chakra-ui/react";
+          }
+        },
+      },
+    },
+  },
+};
diff --git a/examples/mui/react-server.config.mjs b/examples/mui/react-server.config.mjs
@@ -11,9 +11,6 @@ export default {
     rollupOptions: {
       output: {
         manualChunks(id) {
-          if (id.includes("@emotion/react")) {
-            return "@emotion/react";
-          }
           if (id.includes("@mui/")) {
             return "@mui/material";
           }

diff --git a/packages/react-server/lib/build/client.mjs b/packages/react-server/lib/build/client.mjs
@@ -2,7 +2,6 @@ import { mkdir, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
-import { createHash } from "node:crypto";
 
 import replace from "@rollup/plugin-replace";
 import colors from "picocolors";

diff --git a/packages/react-server/lib/build/server.mjs b/packages/react-server/lib/build/server.mjs
@@ -13,6 +13,7 @@ import resolveWorkspace from "../plugins/resolve-workspace.mjs";
 import rollupUseClient from "../plugins/use-client.mjs";
 import rollupUseServerInline from "../plugins/use-server-inline.mjs";
 import rollupUseServer from "../plugins/use-server.mjs";
+import rootModule from "../plugins/root-module.mjs";
 import * as sys from "../sys.mjs";
 import {
   filterOutVitePluginReact,
@@ -180,57 +181,7 @@ export default async function serverBuild(root, options) {
           rollupUseClient("server", clientManifest),
           rollupUseServer("rsc", serverManifest),
           rollupUseServerInline(serverManifest),
-          {
-            name: "react-server:root-module",
-            transform(code, id) {
-              if (!root || root?.startsWith("virtual:")) return null;
-              const [module, name] = root.split("#");
-              const rootModule = __require.resolve(module, { paths: [cwd] });
-
-              if (id === rootModule) {
-                const ast = this.parse(code, { sourceType: "module" });
-
-                const defaultExport = ast.body.find(
-                  (node) => node.type === "ExportDefaultDeclaration"
-                );
-                const namedExports = ast.body
-                  .filter(
-                    (node) =>
-                      node.type === "ExportNamedDeclaration" && node.declaration
-                  )
-                  .map((node) => node.declaration.id.name);
-                const allExports = ast.body
-                  .filter(
-                    (node) =>
-                      node.type === "ExportNamedDeclaration" &&
-                      node.specifiers.length > 0
-                  )
-                  .flatMap((node) => node.specifiers)
-                  .map((node) => node.exported.name);
-
-                const rootName = name ?? "default";
-                if (
-                  (rootName === "default" &&
-                    !defaultExport &&
-                    !allExports?.find((name) => name === "default")) ||
-                  (rootName !== "default" &&
-                    !namedExports.find((name) => name === rootName) &&
-                    !allExports?.find((name) => name === rootName))
-                ) {
-                  throw new Error(
-                    `Module "${rootModule}" does not export "${rootName}"`
-                  );
-                }
-
-                if (name && name !== "default") {
-                  return {
-                    code: `${code}\nexport { ${name} as default };`,
-                    map: null,
-                  };
-                }
-              }
-            },
-          },
+          rootModule(root),
           ...(config.build?.rollupOptions?.plugins ?? []),
         ],
       },

diff --git a/packages/react-server/lib/dev/create-logger.mjs b/packages/react-server/lib/dev/create-logger.mjs
@@ -30,19 +30,16 @@ export default function createLogger(level = "info", options) {
     ...["info", "warn", "warnOnce"].reduce((newLogger, command) => {
       newLogger[command] = (...args) => {
         const [msg, ...rest] = args;
-        const lowerCaseMsg = msg.toLowerCase();
-        // omit vite warnings on prop-types and react-is
+        const options = rest?.[rest?.length - 1];
+        // omit vite warnings on possible dep optimizer incompatibility
         if (
-          lowerCaseMsg.includes("warning: rewrote prop-types") ||
-          lowerCaseMsg.includes("warning: rewrote react-is") ||
-          (lowerCaseMsg.includes("cannot optimize dependency:") &&
-            lowerCaseMsg.includes("prop-types")) ||
-          (lowerCaseMsg.includes("cannot optimize dependency:") &&
-            lowerCaseMsg.includes("react-is"))
+          command === "warn" &&
+          msg.includes(
+            "dependency might be incompatible with the dep optimizer"
+          )
         ) {
           return;
         }
-        const options = rest?.[rest?.length - 1];
         logger[command](
           repeatMessage(
             typeof msg !== "string"

diff --git a/packages/react-server/lib/dev/create-server.mjs b/packages/react-server/lib/dev/create-server.mjs
@@ -1,3 +1,4 @@
+import { rm } from "node:fs/promises";
 import { createRequire, register } from "node:module";
 import { join, relative } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -38,6 +39,8 @@ import staticWatchHandler from "../handlers/static-watch.mjs";
 import trailingSlashHandler from "../handlers/trailing-slash.mjs";
 import { alias, moduleAliases } from "../loader/module-alias.mjs";
 import { applyAlias } from "../loader/utils.mjs";
+import asset from "../plugins/asset.mjs";
+import optimizeDeps from "../plugins/optimize-deps.mjs";
 import reactServerEval from "../plugins/react-server-eval.mjs";
 import reactServerRuntime from "../plugins/react-server-runtime.mjs";
 import resolveWorkspace from "../plugins/resolve-workspace.mjs";
@@ -47,12 +50,7 @@ import useServerInline from "../plugins/use-server-inline.mjs";
 import * as sys from "../sys.mjs";
 import { replaceError } from "../utils/error.mjs";
 import merge from "../utils/merge.mjs";
-import {
-  bareImportRE,
-  findPackageRoot,
-  isModule,
-  tryStat,
-} from "../utils/module.mjs";
+import { bareImportRE, findPackageRoot, tryStat } from "../utils/module.mjs";
 import {
   filterOutVitePluginReact,
   userOrBuiltInVitePluginReact,
@@ -156,18 +154,8 @@ export default async function createServer(root, options) {
       useServer(),
       useServerInline(),
       ...filterOutVitePluginReact(config.plugins),
-      {
-        name: "react-server:asset",
-        transform(code) {
-          if (code.startsWith(`export default "/@fs${cwd}`)) {
-            return code.replace(
-              `export default "/@fs${cwd}`,
-              `export default "`
-            );
-          }
-          return null;
-        },
-      },
+      asset(),
+      optimizeDeps(),
     ],
     cacheDir: join(cwd, options.outDir, ".cache/client"),
     resolve: {
@@ -179,26 +167,6 @@ export default async function createServer(root, options) {
           find: /^@lazarv\/react-server\/client$/,
           replacement: join(sys.rootDir, "client"),
         },
-        // compatibility entries
-        {
-          find: "use-sync-external-store/shim/with-selector.js",
-          replacement: join(
-            sys.rootDir,
-            "use-sync-external-store/shim/with-selector.mjs"
-          ),
-        },
-        {
-          find: "hoist-non-react-statics",
-          replacement: "hoist-non-react-statics/src/index.js",
-        },
-        {
-          find: "prop-types",
-          replacement: "prop-types",
-        },
-        {
-          find: "react-is",
-          replacement: "react-is",
-        },
         ...(config.resolve?.alias ?? []),
       ],
       noExternal: [bareImportRE],
@@ -329,24 +297,13 @@ export default async function createServer(root, options) {
       ? config.vite(devServerConfig) ?? devServerConfig
       : merge(devServerConfig, config.vite);
 
-  const tryToOptimize = (dep) => {
+  if (options.force) {
     try {
-      __require.resolve(dep, { paths: [cwd] });
-      viteConfig.optimizeDeps.include = [
-        ...(viteConfig.optimizeDeps.include ?? []),
-        dep,
-      ];
-      viteConfig.resolve.external = [
-        ...(viteConfig.resolve.external ?? []),
-        dep,
-      ];
-    } catch (e) {
-      // no prop-types
+      await rm(viteConfig.cacheDir, { recursive: true });
+    } catch {
+      // ignore
     }
-  };
-
-  tryToOptimize("prop-types");
-  tryToOptimize("react-is");
+  }
 
   const viteDevServer = await createViteDevServer(viteConfig);
   viteDevServer.environments.client.hot = viteDevServer.ws;
@@ -391,63 +348,27 @@ export default async function createServer(root, options) {
   );
 
   const reactServerAlias = moduleAliases("react-server");
-
-  const originalDirectRequest = moduleRunner.directRequest;
-  moduleRunner.directRequest = async (id, mod, callstack) => {
-    try {
-      return await originalDirectRequest.call(moduleRunner, id, mod, callstack);
-    } catch (e) {
-      return {
-        externalize: id,
-      };
-    }
-  };
-
   const originalFetchModule = moduleRunner.transport.fetchModule;
   moduleRunner.transport.fetchModule = async (specifier, parentId, meta) => {
     const alias = applyAlias(reactServerAlias, specifier);
-    const id = tryStat(alias) ? alias : specifier;
+    if (alias !== specifier && tryStat(alias)) {
+      return {
+        externalize: specifier,
+        type: "commonjs",
+      };
+    }
     try {
-      const resolved = await originalFetchModule.call(
+      return await originalFetchModule.call(
         moduleRunner.transport,
-        id,
+        specifier,
         parentId,
         meta
       );
-      if (!resolved.file || !/\.[mc]?js$/.test(resolved.file)) {
-        return resolved;
-      }
-      if (
-        resolved.file &&
-        /node_modules/.test(resolved.file) &&
-        !isModule(resolved.file)
-      ) {
-        const externalized = {
-          externalize: resolved.file,
-          type: "commonjs",
-        };
-        return externalized;
-      }
-      return resolved;
-    } catch (e) {
-      try {
-        const resolved = import.meta.resolve(id);
-        const resolvedIsModule = isModule(resolved);
-        if (resolvedIsModule) {
-          return {
-            externalize: resolved,
-            type: "module",
-          };
-        }
-        return {
-          externalize: id,
-          type: "commonjs",
-        };
-      } catch (e) {
-        return {
-          externalize: id,
-        };
-      }
+    } catch {
+      return {
+        externalize: specifier,
+        type: "module",
+      };
     }
   };
 

diff --git a/packages/react-server/lib/plugins/asset.mjs b/packages/react-server/lib/plugins/asset.mjs
@@ -0,0 +1,15 @@
+import * as sys from "../sys.mjs";
+
+const cwd = sys.cwd();
+
+export default function asset() {
+  return {
+    name: "react-server:asset",
+    transform(code) {
+      if (code.startsWith(`export default "/@fs${cwd}`)) {
+        return code.replace(`export default "/@fs${cwd}`, `export default "`);
+      }
+      return null;
+    },
+  };
+}