@valbuild/next 0.64.0 → 0.65.1

package/package.json

@@ -8,7 +8,7 @@
     "next",
     "react"
   ],
-  "version": "0.64.0",
+  "version": "0.65.1",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest"
@@ -45,11 +45,11 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.64.0",
-    "@valbuild/react": "~0.64.0",
-    "@valbuild/server": "~0.64.0",
-    "@valbuild/shared": "~0.64.0",
-    "@valbuild/ui": "~0.64.0",
+    "@valbuild/core": "~0.65.0",
+    "@valbuild/react": "~0.65.0",
+    "@valbuild/server": "~0.65.0",
+    "@valbuild/shared": "~0.65.0",
+    "@valbuild/ui": "~0.65.0",
     "client-only": "^0.0.1",
     "server-only": "^0.0.1"
   },

package/rsc/dist/valbuild-next-rsc.cjs.d.ts

@@ -1,2 +1,2 @@
-export * from "../../dist/declarations/src/rsc/index";
-//# sourceMappingURL=valbuild-next-rsc.cjs.d.ts.map
+export * from "../../dist/declarations/src/rsc/index.js";
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsYnVpbGQtbmV4dC1yc2MuY2pzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9kaXN0L2RlY2xhcmF0aW9ucy9zcmMvcnNjL2luZGV4LmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEifQ==

package/rsc/dist/valbuild-next-rsc.cjs.dev.js

@@ -3,142 +3,168 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
-var objectSpread2 = require('../../dist/objectSpread2-bb9509e8.cjs.dev.js');
-var asyncToGenerator = require('../../dist/asyncToGenerator-ba66657c.cjs.dev.js');
+var objectSpread2 = require('../../dist/objectSpread2-792eb2c2.cjs.dev.js');
+var asyncToGenerator = require('../../dist/asyncToGenerator-6ba61221.cjs.dev.js');
 var stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
 var internal = require('@valbuild/shared/internal');
 var server = require('@valbuild/server');
 var version = require('../../dist/version-82faa1d0.cjs.dev.js');
 
+stega.SET_RSC(true);
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
   return function (selector) {
-    var enabled = false;
-    try {
-      enabled = isEnabled();
-    } catch (err) {
-      console.error("Val: could not check if Val is enabled! This might be due to an error to check draftMode. fetchVal can only be used server-side. Use useVal on clients.", err);
-    }
-    if (enabled) {
-      stega.SET_AUTO_TAG_JSX_ENABLED(true);
-      var headers;
-      try {
-        headers = getHeaders();
-        if (!(headers instanceof Headers)) {
-          throw new Error("Expected an instance of Headers. Check Val rsc config.");
-        }
-      } catch (err) {
-        console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", err);
-        headers = null;
-      }
-      var cookies = function () {
-        try {
-          return getCookies();
-        } catch (err) {
-          console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-          return null;
-        }
-      }();
-      var host = headers && getHost(headers);
-      if (host && cookies) {
-        return valServerPromise.then( /*#__PURE__*/function () {
-          var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(valServer) {
-            var _cookies$get, _cookies$get2;
-            var patchesRes, allPatches, treeRes, modules;
-            return asyncToGenerator._regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  _context.next = 2;
-                  return valServer["/patches/~"]["GET"]({
-                    query: {
-                      omit_patch: true,
-                      author: undefined,
-                      patch_id: undefined,
-                      module_file_path: undefined
-                    },
-                    cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies$get = cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies$get === void 0 ? void 0 : _cookies$get.value)
-                  });
-                case 2:
-                  patchesRes = _context.sent;
-                  if (!(patchesRes.status !== 200)) {
-                    _context.next = 6;
-                    break;
-                  }
-                  console.error("Val: could not fetch patches", patchesRes.json);
-                  throw Error(JSON.stringify(patchesRes.json, null, 2));
-                case 6:
-                  allPatches = Object.keys(patchesRes.json.patches);
-                  _context.next = 9;
-                  return valServer["/tree/~"]["PUT"]({
-                    path: "/",
-                    query: {
-                      validate_sources: true,
-                      validate_all: false,
-                      validate_binary_files: false
-                    },
-                    body: {
-                      patchIds: allPatches
-                    },
-                    cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies$get2 = cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies$get2 === void 0 ? void 0 : _cookies$get2.value)
-                  });
-                case 9:
-                  treeRes = _context.sent;
-                  if (!(treeRes.status === 200)) {
-                    _context.next = 15;
-                    break;
-                  }
-                  modules = treeRes.json.modules;
-                  return _context.abrupt("return", stega.stegaEncode(selector, {
-                    disabled: !enabled,
-                    getModule: function getModule(path) {
-                      var module = modules[path];
-                      if (module) {
-                        return module.source;
-                      }
-                    }
-                  }));
-                case 15:
-                  if (!(treeRes.status === 401)) {
-                    _context.next = 19;
-                    break;
+    var exec = /*#__PURE__*/function () {
+      var _ref = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee() {
+        var enabled, headers, cookies, host, _cookies, _cookies3, valServer, patchesRes, allPatches, treeRes, modules;
+        return asyncToGenerator._regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              enabled = false;
+              _context.prev = 1;
+              _context.next = 4;
+              return isEnabled();
+            case 4:
+              enabled = _context.sent;
+              _context.next = 10;
+              break;
+            case 7:
+              _context.prev = 7;
+              _context.t0 = _context["catch"](1);
+              console.error("Val: could not check if Val is enabled! This might be due to an error to check draftMode. fetchVal can only be used server-side. Use useVal on clients.", _context.t0);
+            case 10:
+              if (!enabled) {
+                _context.next = 58;
+                break;
+              }
+              stega.SET_AUTO_TAG_JSX_ENABLED(true);
+              _context.prev = 12;
+              _context.next = 15;
+              return getHeaders();
+            case 15:
+              headers = _context.sent;
+              if (!(typeof headers.get !== "function")) {
+                _context.next = 18;
+                break;
+              }
+              throw new Error("Invalid headers");
+            case 18:
+              _context.next = 24;
+              break;
+            case 20:
+              _context.prev = 20;
+              _context.t1 = _context["catch"](12);
+              console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", _context.t1);
+              headers = null;
+            case 24:
+              _context.prev = 24;
+              _context.next = 27;
+              return getCookies();
+            case 27:
+              cookies = _context.sent;
+              _context.next = 34;
+              break;
+            case 30:
+              _context.prev = 30;
+              _context.t2 = _context["catch"](24);
+              console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", _context.t2);
+              cookies = null;
+            case 34:
+              host = headers && getHost(headers);
+              if (!(host && cookies)) {
+                _context.next = 58;
+                break;
+              }
+              _context.next = 38;
+              return valServerPromise;
+            case 38:
+              valServer = _context.sent;
+              _context.next = 41;
+              return valServer["/patches/~"]["GET"]({
+                query: {
+                  omit_patch: true,
+                  author: undefined,
+                  patch_id: undefined,
+                  module_file_path: undefined
+                },
+                cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies = cookies) === null || _cookies === void 0 || (_cookies = _cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies === void 0 ? void 0 : _cookies.value)
+              });
+            case 41:
+              patchesRes = _context.sent;
+              if (!(patchesRes.status !== 200)) {
+                _context.next = 44;
+                break;
+              }
+              throw Error(JSON.stringify(patchesRes.json, null, 2));
+            case 44:
+              allPatches = Object.keys(patchesRes.json.patches);
+              _context.next = 47;
+              return valServer["/sources"]["PUT"]({
+                path: "/",
+                query: {
+                  validate_sources: true,
+                  validate_all: false,
+                  validate_binary_files: false
+                },
+                body: {
+                  patchIds: allPatches
+                },
+                cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies3 = cookies) === null || _cookies3 === void 0 || (_cookies3 = _cookies3.get(internal.VAL_SESSION_COOKIE)) === null || _cookies3 === void 0 ? void 0 : _cookies3.value)
+              });
+            case 47:
+              treeRes = _context.sent;
+              if (!(treeRes.status === 200)) {
+                _context.next = 53;
+                break;
+              }
+              modules = treeRes.json.modules;
+              return _context.abrupt("return", stega.stegaEncode(selector, {
+                disabled: !enabled,
+                getModule: function getModule(path) {
+                  var module = modules[path];
+                  if (module) {
+                    return module.source;
                   }
-                  console.warn("Val: authentication error: ", treeRes.json.message);
-                  _context.next = 21;
-                  break;
-                case 19:
-                  console.error("Val: could not fetch modules", treeRes.json);
-                  throw Error(JSON.stringify(treeRes.json, null, 2));
-                case 21:
-                case "end":
-                  return _context.stop();
+                }
+              }));
+            case 53:
+              if (!(treeRes.status === 401)) {
+                _context.next = 57;
+                break;
               }
-            }, _callee);
-          }));
-          return function (_x) {
-            return _ref.apply(this, arguments);
-          };
-        }())["catch"](function (err) {
-          console.error("Val: failed while fetching modules", err);
-          if (process.env.NODE_ENV === "development") {
-            throw Error("Val: Could not fetch data. This is likely due to a misconfiguration or a bug. Check the console for more details.");
+              console.warn("Val: authentication error: ", treeRes.json.message);
+              _context.next = 58;
+              break;
+            case 57:
+              throw Error(JSON.stringify(treeRes.json, null, 2));
+            case 58:
+              return _context.abrupt("return", stega.stegaEncode(selector, {
+                disabled: !enabled
+              }));
+            case 59:
+            case "end":
+              return _context.stop();
           }
-          return stega.stegaEncode(selector, {});
-        });
-      }
-    }
-    return stega.stegaEncode(selector, {
-      disabled: !enabled
+        }, _callee, null, [[1, 7], [12, 20], [24, 30]]);
+      }));
+      return function exec() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    return exec()["catch"](function (err) {
+      console.error("Val: failed to fetch ", err);
+      return stega.stegaEncode(selector, {});
     });
   };
 };
 function getHost(headers) {
   var _headers$get;
   // TODO: does NextJs have a way to determine this?
-  var host = headers.get("host");
+  var host = headers === null || headers === void 0 ? void 0 : headers.get("host");
   var proto = "https";
-  if (headers.get("x-forwarded-proto") === "http") {
+  if ((headers === null || headers === void 0 ? void 0 : headers.get("x-forwarded-proto")) === "http") {
     proto = "http";
-  } else if ((_headers$get = headers.get("referer")) !== null && _headers$get !== void 0 && _headers$get.startsWith("http://")) {
+  } else if (headers !== null && headers !== void 0 && (_headers$get = headers.get("referer")) !== null && _headers$get !== void 0 && _headers$get.startsWith("http://")) {
     proto = "http";
   } else if (host !== null && host !== void 0 && host.startsWith("localhost")) {
     proto = "http";
@@ -188,14 +214,17 @@ function initValRsc(config, valModules, rscNextConfig) {
       next: nextVersion,
       core: coreVersion
     }
-  }, config), {
+  }, config), config, {
     isEnabled: function isEnabled() {
-      return asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee2() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee2() {
         return asyncToGenerator._regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              return _context2.abrupt("return", rscNextConfig.draftMode().isEnabled);
-            case 1:
+              _context2.next = 2;
+              return rscNextConfig.draftMode();
+            case 2:
+              return _context2.abrupt("return", _context2.sent.isEnabled);
+            case 3:
             case "end":
               return _context2.stop();
           }
@@ -203,12 +232,15 @@ function initValRsc(config, valModules, rscNextConfig) {
       }))();
     },
     onEnable: function onEnable() {
-      return asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee3() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee3() {
         return asyncToGenerator._regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              rscNextConfig.draftMode().enable();
-            case 1:
+              _context3.next = 2;
+              return rscNextConfig.draftMode();
+            case 2:
+              _context3.sent.enable();
+            case 3:
             case "end":
               return _context3.stop();
           }
@@ -216,12 +248,15 @@ function initValRsc(config, valModules, rscNextConfig) {
       }))();
     },
     onDisable: function onDisable() {
-      return asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee4() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee4() {
         return asyncToGenerator._regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              rscNextConfig.draftMode().disable();
-            case 1:
+              _context4.next = 2;
+              return rscNextConfig.draftMode();
+            case 2:
+              _context4.sent.disable();
+            case 3:
             case "end":
               return _context4.stop();
           }
@@ -232,13 +267,46 @@ function initValRsc(config, valModules, rscNextConfig) {
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    valServerPromise, function () {
-      return rscNextConfig.draftMode().isEnabled;
-    }, function () {
-      return rscNextConfig.headers();
-    }, function () {
-      return rscNextConfig.cookies();
-    })
+    valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee5() {
+      return asyncToGenerator._regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return rscNextConfig.draftMode();
+          case 2:
+            return _context5.abrupt("return", _context5.sent.isEnabled);
+          case 3:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee6() {
+      return asyncToGenerator._regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return rscNextConfig.headers();
+          case 2:
+            return _context6.abrupt("return", _context6.sent);
+          case 3:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee7() {
+      return asyncToGenerator._regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            _context7.next = 2;
+            return rscNextConfig.cookies();
+          case 2:
+            return _context7.abrupt("return", _context7.sent);
+          case 3:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7);
+    })))
   };
 }