waku 0.15.1 → 0.17.0

package/dist/cjs/cli.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-var _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
 var _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 var _nodeutil = require("node:util");
 var _nodemodule = require("node:module");
@@ -62,7 +61,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
@@ -180,9 +181,6 @@ var _parseArgs = (0, _nodeutil.parseArgs)({
     args: process.argv.splice(2),
     allowPositionals: true,
     options: {
-        config: {
-            type: "string"
-        },
         "with-ssr": {
             type: "boolean"
         },
@@ -197,13 +195,6 @@ var _parseArgs = (0, _nodeutil.parseArgs)({
     }
 }), values = _parseArgs.values, positionals = _parseArgs.positionals;
 var cmd = positionals[0];
-if (values.config) {
-    if (!_nodefs.default.existsSync(values.config)) {
-        throw new Error("config file does not exist");
-    } else {
-        process.env.CONFIG_FILE = values.config;
-    }
-}
 if (values.version) {
     var version = require1("../package.json").version;
     console.log(version);
@@ -217,7 +208,9 @@ if (values.version) {
             });
             break;
         case "build":
-            runBuild();
+            runBuild({
+                ssr: !!values["with-ssr"]
+            });
             break;
         case "start":
             runStart({
@@ -237,7 +230,7 @@ function runDev(options) {
 }
 function _runDev() {
     _runDev = _async_to_generator(function(options) {
-        var _options, _ref, express, rsc, devServer, app, ssr, port;
+        var _ref, express, rsc, app, port;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -257,40 +250,13 @@ function _runDev() {
                     ];
                 case 2:
                     rsc = _state.sent().rsc;
-                    return [
-                        4,
-                        Promise.resolve().then(function() {
-                            return /*#__PURE__*/ _interop_require_wildcard(require("./lib/middleware/devServer.js"));
-                        })
-                    ];
-                case 3:
-                    devServer = _state.sent().devServer;
                     app = express();
                     app.use(rsc({
-                        command: "dev"
-                    }));
-                    if (!((_options = options) === null || _options === void 0 ? void 0 : _options.ssr)) return [
-                        3,
-                        5
-                    ];
-                    return [
-                        4,
-                        Promise.resolve().then(function() {
-                            return /*#__PURE__*/ _interop_require_wildcard(require("./lib/middleware/ssr.js"));
-                        })
-                    ];
-                case 4:
-                    ssr = _state.sent().ssr;
-                    app.use(ssr({
-                        command: "dev"
+                        command: "dev",
+                        ssr: options.ssr
                     }));
-                    _state.label = 5;
-                case 5:
-                    app.use(devServer());
-                    port = process.env.PORT || 3000;
-                    app.listen(port, function() {
-                        console.info("Listening on", port);
-                    });
+                    port = parseInt(process.env.PORT || "3000", 10);
+                    startServer(app, port);
                     return [
                         2
                     ];
@@ -299,11 +265,11 @@ function _runDev() {
     });
     return _runDev.apply(this, arguments);
 }
-function runBuild() {
+function runBuild(options) {
     return _runBuild.apply(this, arguments);
 }
 function _runBuild() {
-    _runBuild = _async_to_generator(function() {
+    _runBuild = _async_to_generator(function(options) {
         var build;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
@@ -318,7 +284,7 @@ function _runBuild() {
                     build = _state.sent().build;
                     return [
                         4,
-                        build()
+                        build(options)
                     ];
                 case 2:
                     _state.sent();
@@ -335,7 +301,7 @@ function runStart(options) {
 }
 function _runStart() {
     _runStart = _async_to_generator(function(options) {
-        var _options, _ref, express, resolveConfig, config, rsc, app, ssr, port;
+        var _ref, express, resolveConfig, config, rsc, app, port;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -357,7 +323,7 @@ function _runStart() {
                     resolveConfig = _state.sent().resolveConfig;
                     return [
                         4,
-                        resolveConfig("serve")
+                        resolveConfig()
                     ];
                 case 3:
                     config = _state.sent();
@@ -371,31 +337,13 @@ function _runStart() {
                     rsc = _state.sent().rsc;
                     app = express();
                     app.use(rsc({
-                        command: "start"
+                        command: "start",
+                        ssr: options.ssr
                     }));
-                    if (!((_options = options) === null || _options === void 0 ? void 0 : _options.ssr)) return [
-                        3,
-                        6
-                    ];
-                    return [
-                        4,
-                        Promise.resolve().then(function() {
-                            return /*#__PURE__*/ _interop_require_wildcard(require("./lib/middleware/ssr.js"));
-                        })
-                    ];
-                case 5:
-                    ssr = _state.sent().ssr;
-                    app.use(ssr({
-                        command: "start"
-                    }));
-                    _state.label = 6;
-                case 6:
-                    app.use(express.static(_nodepath.default.join(config.root, config.framework.distDir, config.framework.publicDir)));
+                    app.use(express.static(_nodepath.default.join(config.rootDir, config.distDir, config.publicDir)));
                     express.static.mime.default_type = "";
-                    port = process.env.PORT || 8080;
-                    app.listen(port, function() {
-                        console.info("Listening on", port);
-                    });
+                    port = parseInt(process.env.PORT || "8080", 10);
+                    startServer(app, port);
                     return [
                         2
                     ];
@@ -404,6 +352,19 @@ function _runStart() {
     });
     return _runStart.apply(this, arguments);
 }
+function startServer(app, port) {
+    var server = app.listen(port, function() {
+        console.log("ready: Listening on http://localhost:".concat(port, "/"));
+    });
+    server.on("error", function(err) {
+        if (err.code === "EADDRINUSE") {
+            console.log("warn: Port ".concat(port, " is in use, trying ").concat(port + 1, " instead."));
+            startServer(app, port + 1);
+        } else {
+            console.error("Failed to start server");
+        }
+    });
+}
 function displayUsage() {
     console.log("\nUsage: waku [options] <command>\n\nCommands:\n  dev         Start the development server\n  build       Build the application for production\n  start       Start the production server\n\nOptions:\n  -c, --config <path>   Path to the configuration file\n  --with-ssr            Use opt-in SSR\n  -v, --version         Display the version number\n  -h, --help            Display this help message\n");
 }

package/dist/cjs/client.js

@@ -11,24 +11,28 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    fetchRSC: function() {
-        return fetchRSC;
+    Children: function() {
+        return Children;
     },
     Root: function() {
         return Root;
     },
-    useRefetch: function() {
-        return useRefetch;
+    ServerRoot: function() {
+        return ServerRoot;
     },
     Slot: function() {
         return Slot;
     },
-    Children: function() {
-        return Children;
+    fetchRSC: function() {
+        return fetchRSC;
+    },
+    useRefetch: function() {
+        return useRefetch;
     }
 });
 var _react = require("react");
 var _client = /*#__PURE__*/ _interop_require_default(require("react-server-dom-webpack/client"));
+var _utils = require("./lib/middleware/rsc/utils.js");
 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];
@@ -147,13 +151,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([
@@ -275,7 +279,9 @@ var mergeElements = (0, _react.cache)(function() {
                         a
                     ];
                 case 1:
-                    _tmp = _tmp.concat(_state.sent());
+                    _tmp = _tmp.concat([
+                        _state.sent()
+                    ]);
                     return [
                         4,
                         b
@@ -307,7 +313,7 @@ var fetchRSC = (0, _react.cache)(function(input, rerender) {
                     switch(_state.label){
                         case 0:
                             _tmp = [
-                                basePath + encodeURIComponent(actionId)
+                                basePath + (0, _utils.encodeInput)(encodeURIComponent(actionId))
                             ];
                             _tmp1 = {
                                 method: "POST"
@@ -342,19 +348,20 @@ var fetchRSC = (0, _react.cache)(function(input, rerender) {
         }
     };
     var prefetched = (_globalThis = globalThis).__WAKU_PREFETCHED__ || (_globalThis.__WAKU_PREFETCHED__ = {});
-    var response = prefetched[input] || fetch(basePath + (input || "__DEFAULT__"));
+    var response = prefetched[input] || fetch(basePath + (0, _utils.encodeInput)(input));
     delete prefetched[input];
     var data = createFromFetch(checkStatus(response), options);
     return data;
 });
-var RefetchContext = (0, _react.createContext)(null);
+var RefetchContext = (0, _react.createContext)(function() {
+    throw new Error("Missing Root component");
+});
 var ElementsContext = (0, _react.createContext)(null);
 // HACK there should be a better way...
 var createRerender = (0, _react.cache)(function() {
     var rerender;
     var stableRerender = function(fn) {
-        var _rerender;
-        (_rerender = rerender) === null || _rerender === void 0 ? void 0 : _rerender(fn);
+        rerender === null || rerender === void 0 ? void 0 : rerender(fn);
     };
     var getRerender = function() {
         return stableRerender;
@@ -390,11 +397,7 @@ var Root = function(param) {
     }, children));
 };
 var useRefetch = function() {
-    var refetch = (0, _react.use)(RefetchContext);
-    if (!refetch) {
-        throw new Error("Missing Root component");
-    }
-    return refetch;
+    return (0, _react.use)(RefetchContext);
 };
 var ChildrenContext = (0, _react.createContext)(undefined);
 var ChildrenContextProvider = (0, _react.memo)(ChildrenContext.Provider);
@@ -415,3 +418,9 @@ var Slot = function(param) {
 var Children = function() {
     return (0, _react.use)(ChildrenContext);
 };
+var ServerRoot = function(param) {
+    var elements = param.elements, children = param.children;
+    return (0, _react.createElement)(ElementsContext.Provider, {
+        value: elements
+    }, children);
+};

package/dist/cjs/config.js

@@ -2,12 +2,3 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "defineConfig", {
-    enumerable: true,
-    get: function() {
-        return defineConfig;
-    }
-});
-function defineConfig(config) {
-    return config;
-}