waku 0.15.0 → 0.15.1

package/dist/cjs/client.js

@@ -28,7 +28,7 @@ _export(exports, {
     }
 });
 var _react = require("react");
-var _client = require("react-server-dom-webpack/client");
+var _client = /*#__PURE__*/ _interop_require_default(require("react-server-dom-webpack/client"));
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -79,6 +79,11 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -227,6 +232,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+var createFromFetch = _client.default.createFromFetch, encodeReply = _client.default.encodeReply;
 var checkStatus = function() {
     var _ref = _async_to_generator(function(responsePromise) {
         var response, err;
@@ -293,7 +299,6 @@ var mergeElements = (0, _react.cache)(function() {
 var fetchRSC = (0, _react.cache)(function(input, rerender) {
     var basePath = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "/RSC/";
     var _globalThis;
-    input || (input = "__DEFAULT__");
     var options = {
         callServer: function callServer(actionId, args) {
             return _async_to_generator(function() {
@@ -309,13 +314,13 @@ var fetchRSC = (0, _react.cache)(function(input, rerender) {
                             };
                             return [
                                 4,
-                                (0, _client.encodeReply)(args)
+                                encodeReply(args)
                             ];
                         case 1:
                             response = fetch.apply(void 0, _tmp.concat([
                                 (_tmp1.body = _state.sent(), _tmp1)
                             ]));
-                            data = (0, _client.createFromFetch)(checkStatus(response), options);
+                            data = createFromFetch(checkStatus(response), options);
                             (0, _react.startTransition)(function() {
                                 // FIXME this causes rerenders even if data is empty
                                 rerender(function(prev) {
@@ -337,9 +342,9 @@ var fetchRSC = (0, _react.cache)(function(input, rerender) {
         }
     };
     var prefetched = (_globalThis = globalThis).__WAKU_PREFETCHED__ || (_globalThis.__WAKU_PREFETCHED__ = {});
-    var response = prefetched[input] || fetch(basePath + input);
+    var response = prefetched[input] || fetch(basePath + (input || "__DEFAULT__"));
     delete prefetched[input];
-    var data = (0, _client.createFromFetch)(checkStatus(response), options);
+    var data = createFromFetch(checkStatus(response), options);
     return data;
 });
 var RefetchContext = (0, _react.createContext)(null);

package/dist/cjs/lib/builder.js

@@ -312,6 +312,9 @@ var analyzeEntries = function() {
                                     return serverEntryFileSet.add(id);
                                 })
                             ],
+                            ssr: {
+                                noExternal: /^(?!node:)/
+                            },
                             resolve: {
                                 conditions: [
                                     "react-server"
@@ -396,6 +399,12 @@ var buildServerBundle = function() {
                     return [
                         4,
                         (0, _vite.build)(_object_spread_props(_object_spread({}, (0, _config.configFileConfig)()), {
+                            ssr: {
+                                noExternal: Object.values(clientEntryFiles).map(// FIXME this might not work with pnpm
+                                function(fname) {
+                                    return _nodepath.default.relative(_nodepath.default.join(config.root, "node_modules"), fname).split("/")[0];
+                                })
+                            },
                             resolve: {
                                 conditions: [
                                     "react-server"
@@ -585,7 +594,7 @@ var emitRscFiles = function() {
                                                         case 0:
                                                             _step_value = _sliced_to_array(_step.value, 1), input = _step_value[0];
                                                             destFile = _nodepath.default.join(config.root, config.framework.distDir, config.framework.publicDir, // HACK to support windows filesystem
-                                                            (config.framework.rscPrefix + (input === "" ? "__DEFAULT__" : input)).replaceAll("/", _nodepath.default.sep));
+                                                            (config.framework.rscPrefix + (input || "__DEFAULT__")).replaceAll("/", _nodepath.default.sep));
                                                             if (!!rscFileSet.has(destFile)) return [
                                                                 3,
                                                                 3

package/dist/cjs/lib/middleware/devServer.js

@@ -234,7 +234,7 @@ function devServer() {
     });
     return function() {
         var _ref = _async_to_generator(function(req, res, next) {
-            var _req_url, vite, fname, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item;
+            var vite, fname, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -244,8 +244,8 @@ function devServer() {
                         ];
                     case 1:
                         vite = _state.sent();
-                        if ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith("/node_modules/")) {
-                            fname = _nodepath.default.join(vite.config.root, req.url);
+                        if (req.url) {
+                            fname = req.url.startsWith("/@fs/") ? req.url.slice(4) : _nodepath.default.join(vite.config.root, req.url);
                             _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                             try {
                                 for(_iterator = vite.moduleGraph.idToModuleMap.values()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){

package/dist/cjs/lib/middleware/rsc/utils.js

@@ -37,7 +37,7 @@ var generatePrefetchCode = function(basePrefix, inputs, moduleIds) {
     var code = "";
     if (inputsArray.length) {
         code += "\nglobalThis.__WAKU_PREFETCHED__ = {\n".concat(inputsArray.map(function(input) {
-            return "  '".concat(input, "': fetch('").concat(basePrefix).concat(input, "')");
+            return "  '".concat(input, "': fetch('").concat(basePrefix).concat(input || "__DEFAULT__", "')");
         }).join(",\n"), "\n};");
     }
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/dist/cjs/lib/middleware/rsc/worker-impl.js

@@ -616,6 +616,9 @@ var getEntriesFile = function() {
     };
 }();
 var resolveClientEntry = function(filePath, config, command) {
+    if (filePath.startsWith("file://")) {
+        filePath = filePath.slice(7);
+    }
     var root = _nodepath.default.join(config.root, command === "dev" ? config.framework.srcDir : config.framework.distDir);
     if (_nodepath.default.sep !== "/") {
         // HACK to support windows filesystem

package/dist/client.js

@@ -199,7 +199,8 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { cache, createContext, createElement, memo, use, useCallback, useState, startTransition } from "react";
-import { createFromFetch, encodeReply } from "react-server-dom-webpack/client";
+import RSDWClient from "react-server-dom-webpack/client";
+var createFromFetch = RSDWClient.createFromFetch, encodeReply = RSDWClient.encodeReply;
 var checkStatus = function() {
     var _ref = _async_to_generator(function(responsePromise) {
         var response, err;
@@ -267,7 +268,6 @@ var mergeElements = cache(function() {
 export var fetchRSC = cache(function(input, rerender) {
     var basePath = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "/RSC/";
     var _globalThis;
-    input || (input = "__DEFAULT__");
     var options = {
         callServer: function callServer(actionId, args) {
             return _async_to_generator(function() {
@@ -311,7 +311,7 @@ export var fetchRSC = cache(function(input, rerender) {
         }
     };
     var prefetched = (_globalThis = globalThis).__WAKU_PREFETCHED__ || (_globalThis.__WAKU_PREFETCHED__ = {});
-    var response = prefetched[input] || fetch(basePath + input);
+    var response = prefetched[input] || fetch(basePath + (input || "__DEFAULT__"));
     delete prefetched[input];
     var data = createFromFetch(checkStatus(response), options);
     return data;

package/dist/lib/builder.js

@@ -297,6 +297,9 @@ var analyzeEntries = function() {
                                     return serverEntryFileSet.add(id);
                                 })
                             ],
+                            ssr: {
+                                noExternal: /^(?!node:)/
+                            },
                             resolve: {
                                 conditions: [
                                     "react-server"
@@ -381,6 +384,12 @@ var buildServerBundle = function() {
                     return [
                         4,
                         viteBuild(_object_spread_props(_object_spread({}, configFileConfig()), {
+                            ssr: {
+                                noExternal: Object.values(clientEntryFiles).map(// FIXME this might not work with pnpm
+                                function(fname) {
+                                    return path.relative(path.join(config.root, "node_modules"), fname).split("/")[0];
+                                })
+                            },
                             resolve: {
                                 conditions: [
                                     "react-server"
@@ -570,7 +579,7 @@ var emitRscFiles = function() {
                                                         case 0:
                                                             _step_value = _sliced_to_array(_step.value, 1), input = _step_value[0];
                                                             destFile = path.join(config.root, config.framework.distDir, config.framework.publicDir, // HACK to support windows filesystem
-                                                            (config.framework.rscPrefix + (input === "" ? "__DEFAULT__" : input)).replaceAll("/", path.sep));
+                                                            (config.framework.rscPrefix + (input || "__DEFAULT__")).replaceAll("/", path.sep));
                                                             if (!!rscFileSet.has(destFile)) return [
                                                                 3,
                                                                 3

package/dist/lib/middleware/devServer.js

@@ -219,7 +219,7 @@ export function devServer() {
     });
     return function() {
         var _ref = _async_to_generator(function(req, res, next) {
-            var _req_url, vite, fname, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item;
+            var vite, fname, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -229,8 +229,8 @@ export function devServer() {
                         ];
                     case 1:
                         vite = _state.sent();
-                        if ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith("/node_modules/")) {
-                            fname = path.join(vite.config.root, req.url);
+                        if (req.url) {
+                            fname = req.url.startsWith("/@fs/") ? req.url.slice(4) : path.join(vite.config.root, req.url);
                             _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                             try {
                                 for(_iterator = vite.moduleGraph.idToModuleMap.values()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){

package/dist/lib/middleware/rsc/utils.js

@@ -10,7 +10,7 @@ export var generatePrefetchCode = function(basePrefix, inputs, moduleIds) {
     var code = "";
     if (inputsArray.length) {
         code += "\nglobalThis.__WAKU_PREFETCHED__ = {\n".concat(inputsArray.map(function(input) {
-            return "  '".concat(input, "': fetch('").concat(basePrefix).concat(input, "')");
+            return "  '".concat(input, "': fetch('").concat(basePrefix).concat(input || "__DEFAULT__", "')");
         }).join(",\n"), "\n};");
     }
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/dist/lib/middleware/rsc/worker-impl.js

@@ -607,6 +607,9 @@ var getEntriesFile = function() {
     };
 }();
 var resolveClientEntry = function(filePath, config, command) {
+    if (filePath.startsWith("file://")) {
+        filePath = filePath.slice(7);
+    }
     var root = path.join(config.root, command === "dev" ? config.framework.srcDir : config.framework.distDir);
     if (path.sep !== "/") {
         // HACK to support windows filesystem

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "waku",
   "description": "Minimalistic React Framework",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "type": "module",
   "author": "Daishi Kato",
   "repository": {

package/src/client.ts

@@ -13,7 +13,9 @@ import {
   startTransition,
 } from "react";
 import type { ReactNode } from "react";
-import { createFromFetch, encodeReply } from "react-server-dom-webpack/client";
+import RSDWClient from "react-server-dom-webpack/client";
+
+const { createFromFetch, encodeReply } = RSDWClient;
 
 const checkStatus = async (
   responsePromise: Promise<Response>,
@@ -45,7 +47,6 @@ export const fetchRSC = cache(
     rerender: (fn: (prev: Elements) => Elements) => void,
     basePath = "/RSC/",
   ): Elements => {
-    input ||= "__DEFAULT__";
     const options = {
       async callServer(actionId: string, args: unknown[]) {
         const response = fetch(basePath + encodeURIComponent(actionId), {
@@ -61,7 +62,8 @@ export const fetchRSC = cache(
       },
     };
     const prefetched = ((globalThis as any).__WAKU_PREFETCHED__ ||= {});
-    const response = prefetched[input] || fetch(basePath + input);
+    const response =
+      prefetched[input] || fetch(basePath + (input || "__DEFAULT__"));
     delete prefetched[input];
     const data = createFromFetch(checkStatus(response), options);
     return data;

package/src/lib/builder.ts

@@ -59,6 +59,9 @@ const analyzeEntries = async (entriesFile: string) => {
         (id) => serverEntryFileSet.add(id),
       ),
     ],
+    ssr: {
+      noExternal: /^(?!node:)/,
+    },
     resolve: {
       conditions: ["react-server"],
     },
@@ -98,6 +101,15 @@ const buildServerBundle = async (
 ) => {
   const serverBuildOutput = await viteBuild({
     ...configFileConfig(),
+    ssr: {
+      noExternal: Object.values(clientEntryFiles).map(
+        // FIXME this might not work with pnpm
+        (fname) =>
+          path
+            .relative(path.join(config.root, "node_modules"), fname)
+            .split("/")[0]!,
+      ),
+    },
     resolve: {
       conditions: ["react-server"],
     },
@@ -239,9 +251,10 @@ const emitRscFiles = async (
           config.framework.distDir,
           config.framework.publicDir,
           // HACK to support windows filesystem
-          (
-            config.framework.rscPrefix + (input === "" ? "__DEFAULT__" : input)
-          ).replaceAll("/", path.sep),
+          (config.framework.rscPrefix + (input || "__DEFAULT__")).replaceAll(
+            "/",
+            path.sep,
+          ),
         );
         if (!rscFileSet.has(destFile)) {
           rscFileSet.add(destFile);

package/src/lib/middleware/devServer.ts

@@ -44,9 +44,11 @@ export function devServer(): Middleware {
   });
   return async (req, res, next) => {
     const vite = await vitePromise;
-    if (req.url?.startsWith("/node_modules/")) {
+    if (req.url) {
       // HACK re-export "?v=..." URL to avoid dual module hazard.
-      const fname = path.join(vite.config.root, req.url);
+      const fname = req.url.startsWith("/@fs/")
+        ? req.url.slice(4)
+        : path.join(vite.config.root, req.url);
       for (const item of vite.moduleGraph.idToModuleMap.values()) {
         if (item.file === fname && item.url !== req.url) {
           res.setHeader("Content-Type", "application/javascript");

package/src/lib/middleware/rsc/utils.ts

@@ -20,7 +20,9 @@ export const generatePrefetchCode = (
     code += `
 globalThis.__WAKU_PREFETCHED__ = {
 ${inputsArray
-  .map((input) => `  '${input}': fetch('${basePrefix}${input}')`)
+  .map(
+    (input) => `  '${input}': fetch('${basePrefix}${input || "__DEFAULT__"}')`,
+  )
   .join(",\n")}
 };`;
   }

package/src/lib/middleware/rsc/worker-impl.ts

@@ -180,6 +180,9 @@ const resolveClientEntry = (
   config: Awaited<ReturnType<typeof resolveConfig>>,
   command: "dev" | "build" | "start",
 ) => {
+  if (filePath.startsWith("file://")) {
+    filePath = filePath.slice(7);
+  }
   let root = path.join(
     config.root,
     command === "dev" ? config.framework.srcDir : config.framework.distDir,