@valbuild/next 0.63.3 → 0.64.0

package/README.md

@@ -200,7 +200,7 @@ export const schema = s.object({
           bold: true, // <- Enables bold in richtext
         },
       }),
-    })
+    }),
   ),
 });
 
@@ -223,7 +223,7 @@ export default c.define(
         ],
       },
     ],
-  }
+  },
 );
 ```
 
@@ -524,7 +524,7 @@ export function ValRichText({
 }) {
   function build(
     node: RichTextNode<MyRichTextOptions>,
-    key?: number
+    key?: number,
   ): JSX.Element | string {
     if (typeof node === "string") {
       return node;
@@ -543,7 +543,7 @@ export function ValRichText({
         key,
         className,
       },
-      "children" in node ? node.children.map(build) : null
+      "children" in node ? node.children.map(build) : null,
     );
   }
   return <div {...val.attrs(root)}>{root.children.map(build)}</div>;
@@ -622,7 +622,7 @@ s.union(
     type: s.literal("productPage"),
     sku: s.number(),
     // ...
-  })
+  }),
 ); // <- Schema<{ type: "blogPage", author: string } | { type: "productPage", sku: number }>
 ```
 
@@ -633,7 +633,7 @@ You can also use a union to create a union of string literals. This is useful if
 ```ts
 s.union(
   s.literal("one"),
-  s.literal("two")
+  s.literal("two"),
   //...
 ); // <- Schema<"one" | "two">
 ```

package/dist/declarations/src/external_exempt_from_val_quickjs.d.ts

@@ -35,6 +35,13 @@ export declare const Internal: {
     createValPathOfItem: typeof import("@valbuild/core/dist/declarations/src/selector/SelectorProxy").createValPathOfItem;
     getSHA256Hash: (bits: Uint8Array) => string;
     initSchema: typeof import("@valbuild/core/dist/declarations/src/initSchema").initSchema;
+    getMimeType: typeof import("@valbuild/core/dist/declarations/src/mimeType").getMimeType;
+    mimeTypeToFileExt: typeof import("@valbuild/core/dist/declarations/src/mimeType").mimeTypeToFileExt;
+    filenameToMimeType: typeof import("@valbuild/core/dist/declarations/src/mimeType").filenameToMimeType;
+    EXT_TO_MIME_TYPES: Record<string, string>;
+    MIME_TYPES_TO_EXT: {
+        [k: string]: string;
+    };
     ModuleFilePathSep: string;
     notFileOp: (op: import("@valbuild/core/patch").Operation) => boolean;
     isFileOp: (op: import("@valbuild/core/patch").Operation) => op is {

package/dist/declarations/src/rsc/initValRsc.d.ts

@@ -1,8 +1,8 @@
 import { type StegaOfSource } from "@valbuild/react/stega";
-import { SelectorSource, SelectorOf, GenericSelector } from "@valbuild/core";
-import { ValConfig } from "@valbuild/core";
+import { SelectorSource, SelectorOf, GenericSelector, ValConfig, ValModules } from "@valbuild/core";
 import { cookies, draftMode, headers } from "next/headers";
-declare const initFetchValStega: (config: ValConfig, valApiEndpoints: string, isEnabled: () => boolean, getHeaders: () => Headers, getCookies: () => {
+import { ValServer } from "@valbuild/server";
+declare const initFetchValStega: (config: ValConfig, valApiEndpoints: string, valServerPromise: Promise<ValServer>, isEnabled: () => boolean, getHeaders: () => Headers, getCookies: () => {
     get(name: string): {
         name: string;
         value: string;
@@ -13,7 +13,7 @@ type ValNextRscConfig = {
     headers: typeof headers;
     cookies: typeof cookies;
 };
-export declare function initValRsc(config: ValConfig, rscNextConfig: ValNextRscConfig): {
+export declare function initValRsc(config: ValConfig, valModules: ValModules, rscNextConfig: ValNextRscConfig): {
     fetchValStega: ReturnType<typeof initFetchValStega>;
 };
 export {};

package/dist/declarations/src/server/initValServer.d.ts

@@ -2,11 +2,11 @@ import { ValConfig, ValModules } from "@valbuild/core";
 import type { draftMode } from "next/headers";
 import { NextResponse } from "next/server";
 declare const initValNextAppRouter: (valModules: ValModules, config: ValConfig, nextConfig: ValServerNextConfig & {
-    formatter?: ((code: string, filePath: string) => string) | undefined;
+    formatter?: ((code: string, filePath: string) => Promise<string> | string) | undefined;
 }) => (req: Request) => Promise<NextResponse<unknown>>;
 type ValServerNextConfig = {
     draftMode: typeof draftMode;
-    formatter?: (code: string, filePath: string) => string;
+    formatter?: (code: string, filePath: string) => Promise<string> | string;
 };
 export declare function initValServer(valModules: ValModules, config: ValConfig & {
     disableCache?: boolean;

package/package.json

@@ -8,7 +8,7 @@
     "next",
     "react"
   ],
-  "version": "0.63.3",
+  "version": "0.64.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest"
@@ -45,10 +45,11 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.63.1",
-    "@valbuild/react": "~0.63.1",
-    "@valbuild/server": "~0.63.1",
-    "@valbuild/ui": "~0.63.1",
+    "@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",
     "client-only": "^0.0.1",
     "server-only": "^0.0.1"
   },

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

@@ -3,12 +3,15 @@
 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 stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
-var fp = require('@valbuild/core/fp');
+var internal = require('@valbuild/shared/internal');
+var server = require('@valbuild/server');
+var version = require('../../dist/version-82faa1d0.cjs.dev.js');
 
-var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
+var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
     try {
@@ -28,58 +31,84 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
         console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", err);
         headers = null;
       }
-      var cookies;
-      try {
-        cookies = getCookies();
-      } catch (err) {
-        console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-        cookies = 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) {
-        var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        return api.getPatches().then( /*#__PURE__*/function () {
-          var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(patchesRes) {
-            var allPatches;
+        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:
-                  if (!fp.result.isErr(patchesRes)) {
-                    _context.next = 3;
+                  _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.error);
-                  throw Error(JSON.stringify(patchesRes.error, null, 2));
-                case 3:
-                  allPatches = Object.values(patchesRes.value).flatMap(function (mp) {
-                    return mp.map(function (p) {
-                      return p.patch_id;
-                    });
+                  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)
                   });
-                  return _context.abrupt("return", api.putTree({
-                    patchIds: allPatches
-                  }).then(function (res) {
-                    if (fp.result.isOk(res)) {
-                      var modules = res.value.modules;
-                      return stega.stegaEncode(selector, {
-                        disabled: !enabled,
-                        getModule: function getModule(path) {
-                          var module = modules[path];
-                          if (module) {
-                            return module.source;
-                          }
-                        }
-                      });
-                    } else {
-                      if (res.error.statusCode === 401) {
-                        console.warn("Val: authentication error: ", res.error.message);
-                      } else {
-                        console.error("Val: could not fetch modules", res.error);
-                        throw Error(JSON.stringify(res.error, null, 2));
+                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 5:
+                case 15:
+                  if (!(treeRes.status === 401)) {
+                    _context.next = 19;
+                    break;
+                  }
+                  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();
               }
@@ -145,11 +174,65 @@ function getHost(headers) {
 
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function initValRsc(config, rscNextConfig) {
+function initValRsc(config, valModules, rscNextConfig) {
+  var coreVersion = core.Internal.VERSION.core;
+  if (!coreVersion) {
+    throw new Error("Could not get @valbuild/core package version");
+  }
+  var nextVersion = version.VERSION;
+  if (!nextVersion) {
+    throw new Error("Could not get @valbuild/next package version");
+  }
+  var valServerPromise = server.createValServer(valModules, "/api/val", objectSpread2._objectSpread2({
+    versions: {
+      next: nextVersion,
+      core: coreVersion
+    }
+  }, config), {
+    isEnabled: function isEnabled() {
+      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:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
+    },
+    onEnable: function onEnable() {
+      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:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }))();
+    },
+    onDisable: function onDisable() {
+      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:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }))();
+    }
+  });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    function () {
+    valServerPromise, function () {
       return rscNextConfig.draftMode().isEnabled;
     }, function () {
       return rscNextConfig.headers();

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

@@ -3,12 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
+var objectSpread2 = require('../../dist/objectSpread2-24e737a6.cjs.prod.js');
 var asyncToGenerator = require('../../dist/asyncToGenerator-3551d940.cjs.prod.js');
 var stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
-var fp = require('@valbuild/core/fp');
+var internal = require('@valbuild/shared/internal');
+var server = require('@valbuild/server');
+var version = require('../../dist/version-a9a6a619.cjs.prod.js');
 
-var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
+var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
     try {
@@ -28,58 +31,84 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
         console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", err);
         headers = null;
       }
-      var cookies;
-      try {
-        cookies = getCookies();
-      } catch (err) {
-        console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-        cookies = 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) {
-        var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        return api.getPatches().then( /*#__PURE__*/function () {
-          var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(patchesRes) {
-            var allPatches;
+        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:
-                  if (!fp.result.isErr(patchesRes)) {
-                    _context.next = 3;
+                  _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.error);
-                  throw Error(JSON.stringify(patchesRes.error, null, 2));
-                case 3:
-                  allPatches = Object.values(patchesRes.value).flatMap(function (mp) {
-                    return mp.map(function (p) {
-                      return p.patch_id;
-                    });
+                  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)
                   });
-                  return _context.abrupt("return", api.putTree({
-                    patchIds: allPatches
-                  }).then(function (res) {
-                    if (fp.result.isOk(res)) {
-                      var modules = res.value.modules;
-                      return stega.stegaEncode(selector, {
-                        disabled: !enabled,
-                        getModule: function getModule(path) {
-                          var module = modules[path];
-                          if (module) {
-                            return module.source;
-                          }
-                        }
-                      });
-                    } else {
-                      if (res.error.statusCode === 401) {
-                        console.warn("Val: authentication error: ", res.error.message);
-                      } else {
-                        console.error("Val: could not fetch modules", res.error);
-                        throw Error(JSON.stringify(res.error, null, 2));
+                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 5:
+                case 15:
+                  if (!(treeRes.status === 401)) {
+                    _context.next = 19;
+                    break;
+                  }
+                  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();
               }
@@ -142,11 +171,65 @@ function getHost(headers) {
 
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function initValRsc(config, rscNextConfig) {
+function initValRsc(config, valModules, rscNextConfig) {
+  var coreVersion = core.Internal.VERSION.core;
+  if (!coreVersion) {
+    throw new Error("Could not get @valbuild/core package version");
+  }
+  var nextVersion = version.VERSION;
+  if (!nextVersion) {
+    throw new Error("Could not get @valbuild/next package version");
+  }
+  var valServerPromise = server.createValServer(valModules, "/api/val", objectSpread2._objectSpread2({
+    versions: {
+      next: nextVersion,
+      core: coreVersion
+    }
+  }, config), {
+    isEnabled: function isEnabled() {
+      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:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
+    },
+    onEnable: function onEnable() {
+      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:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }))();
+    },
+    onDisable: function onDisable() {
+      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:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }))();
+    }
+  });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    function () {
+    valServerPromise, function () {
       return rscNextConfig.draftMode().isEnabled;
     }, function () {
       return rscNextConfig.headers();

package/rsc/dist/valbuild-next-rsc.esm.js

@@ -1,10 +1,13 @@
 import 'server-only';
+import { _ as _objectSpread2, a as _defineProperty } from '../../dist/objectSpread2-439bdcdd.esm.js';
 import { _ as _asyncToGenerator, a as _regeneratorRuntime } from '../../dist/asyncToGenerator-0859ab5c.esm.js';
 import { SET_AUTO_TAG_JSX_ENABLED, stegaEncode } from '@valbuild/react/stega';
-import { ValApi } from '@valbuild/core';
-import { result } from '@valbuild/core/fp';
+import { Internal } from '@valbuild/core';
+import { VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
+import { createValServer } from '@valbuild/server';
+import { V as VERSION } from '../../dist/version-98ec5c7a.esm.js';
 
-var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
+var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
     try {
@@ -24,58 +27,84 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
         console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", err);
         headers = null;
       }
-      var cookies;
-      try {
-        cookies = getCookies();
-      } catch (err) {
-        console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-        cookies = 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) {
-        var api = new ValApi("".concat(host).concat(valApiEndpoints));
-        return api.getPatches().then( /*#__PURE__*/function () {
-          var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(patchesRes) {
-            var allPatches;
+        return valServerPromise.then( /*#__PURE__*/function () {
+          var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(valServer) {
+            var _cookies$get, _cookies$get2;
+            var patchesRes, allPatches, treeRes, modules;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  if (!result.isErr(patchesRes)) {
-                    _context.next = 3;
+                  _context.next = 2;
+                  return valServer["/patches/~"]["GET"]({
+                    query: {
+                      omit_patch: true,
+                      author: undefined,
+                      patch_id: undefined,
+                      module_file_path: undefined
+                    },
+                    cookies: _defineProperty({}, VAL_SESSION_COOKIE, (_cookies$get = cookies.get(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.error);
-                  throw Error(JSON.stringify(patchesRes.error, null, 2));
-                case 3:
-                  allPatches = Object.values(patchesRes.value).flatMap(function (mp) {
-                    return mp.map(function (p) {
-                      return p.patch_id;
-                    });
+                  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: _defineProperty({}, VAL_SESSION_COOKIE, (_cookies$get2 = cookies.get(VAL_SESSION_COOKIE)) === null || _cookies$get2 === void 0 ? void 0 : _cookies$get2.value)
                   });
-                  return _context.abrupt("return", api.putTree({
-                    patchIds: allPatches
-                  }).then(function (res) {
-                    if (result.isOk(res)) {
-                      var modules = res.value.modules;
-                      return stegaEncode(selector, {
-                        disabled: !enabled,
-                        getModule: function getModule(path) {
-                          var module = modules[path];
-                          if (module) {
-                            return module.source;
-                          }
-                        }
-                      });
-                    } else {
-                      if (res.error.statusCode === 401) {
-                        console.warn("Val: authentication error: ", res.error.message);
-                      } else {
-                        console.error("Val: could not fetch modules", res.error);
-                        throw Error(JSON.stringify(res.error, null, 2));
+                case 9:
+                  treeRes = _context.sent;
+                  if (!(treeRes.status === 200)) {
+                    _context.next = 15;
+                    break;
+                  }
+                  modules = treeRes.json.modules;
+                  return _context.abrupt("return", stegaEncode(selector, {
+                    disabled: !enabled,
+                    getModule: function getModule(path) {
+                      var module = modules[path];
+                      if (module) {
+                        return module.source;
                       }
                     }
                   }));
-                case 5:
+                case 15:
+                  if (!(treeRes.status === 401)) {
+                    _context.next = 19;
+                    break;
+                  }
+                  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();
               }
@@ -141,11 +170,65 @@ function getHost(headers) {
 
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function initValRsc(config, rscNextConfig) {
+function initValRsc(config, valModules, rscNextConfig) {
+  var coreVersion = Internal.VERSION.core;
+  if (!coreVersion) {
+    throw new Error("Could not get @valbuild/core package version");
+  }
+  var nextVersion = VERSION;
+  if (!nextVersion) {
+    throw new Error("Could not get @valbuild/next package version");
+  }
+  var valServerPromise = createValServer(valModules, "/api/val", _objectSpread2({
+    versions: {
+      next: nextVersion,
+      core: coreVersion
+    }
+  }, config), {
+    isEnabled: function isEnabled() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", rscNextConfig.draftMode().isEnabled);
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
+    },
+    onEnable: function onEnable() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              rscNextConfig.draftMode().enable();
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }))();
+    },
+    onDisable: function onDisable() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              rscNextConfig.draftMode().disable();
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }))();
+    }
+  });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    function () {
+    valServerPromise, function () {
       return rscNextConfig.draftMode().isEnabled;
     }, function () {
       return rscNextConfig.headers();