@matthesketh/utopia-router 0.4.0 → 0.5.1

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(index_exports, {
   isNavigating: () => isNavigating,
   matchRoute: () => matchRoute,
   navigate: () => navigate,
+  preloadRoute: () => preloadRoute,
   queryParams: () => queryParams,
   setQueryParam: () => setQueryParam,
   setQueryParams: () => setQueryParams
@@ -43,26 +44,37 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/matcher.ts
+var BACKSLASH_RE = /\\/g;
+var PAGE_FILE_RE = /\/?\+page\.\w+$/;
+var LAYOUT_OR_ERROR_FILE_RE = /\/?\+(layout|error)\.\w+$/;
+var GROUP_SEGMENT_RE = /^\(.+\)$/;
+var REST_PARAM_RE = /^\[\.\.\..+\]$/;
+var DYNAMIC_PARAM_RE = /^\[.+\]$/;
+var ROOT_ROUTE_RE = /^\/$/;
+var REGEX_SPECIAL_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
+var PAGE_FILE_TEST_RE = /\+page\.\w+$/;
+var LAYOUT_FILE_TEST_RE = /\+layout\.\w+$/;
+var ERROR_FILE_TEST_RE = /\+error\.\w+$/;
 function filePathToRoute(filePath) {
-  let normalized = filePath.replace(/\\/g, "/");
+  let normalized = filePath.replace(BACKSLASH_RE, "/");
   const routesIdx = normalized.indexOf("routes/");
   if (routesIdx !== -1) {
     normalized = normalized.slice(routesIdx + "routes/".length);
   }
-  normalized = normalized.replace(/\/?\+page\.\w+$/, "");
-  normalized = normalized.replace(/\/?\+(layout|error)\.\w+$/, "");
+  normalized = normalized.replace(PAGE_FILE_RE, "");
+  normalized = normalized.replace(LAYOUT_OR_ERROR_FILE_RE, "");
   const segments = normalized.split("/").filter(Boolean);
   const routeSegments = [];
   for (const segment of segments) {
-    if (/^\(.+\)$/.test(segment)) {
+    if (GROUP_SEGMENT_RE.test(segment)) {
       continue;
     }
-    if (/^\[\.\.\..+\]$/.test(segment)) {
+    if (REST_PARAM_RE.test(segment)) {
       const paramName = segment.slice(4, -1);
       routeSegments.push(`*${paramName}`);
       continue;
     }
-    if (/^\[.+\]$/.test(segment)) {
+    if (DYNAMIC_PARAM_RE.test(segment)) {
       const paramName = segment.slice(1, -1);
       routeSegments.push(`:${paramName}`);
       continue;
@@ -76,7 +88,7 @@ function compilePattern(pattern) {
   const params = [];
   if (pattern === "/") {
     return {
-      regex: /^\/$/,
+      regex: ROOT_ROUTE_RE,
       params: []
     };
   }
@@ -98,12 +110,13 @@ function compilePattern(pattern) {
   }
   regexStr = "^" + regexStr + "/?$";
   return {
+    // Dynamic regex — built from sanitized input (segments are escaped via escapeRegex).
     regex: new RegExp(regexStr),
     params
   };
 }
 function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return str.replace(REGEX_SPECIAL_CHARS_RE, "\\$&");
 }
 function matchRoute(url, routes2) {
   let pathname = url.pathname;
@@ -127,12 +140,12 @@ function buildRouteTable(manifest) {
   const layouts = /* @__PURE__ */ new Map();
   const errors = /* @__PURE__ */ new Map();
   for (const [filePath, importFn] of Object.entries(manifest)) {
-    const normalized = filePath.replace(/\\/g, "/");
-    if (/\+page\.\w+$/.test(normalized)) {
+    const normalized = filePath.replace(BACKSLASH_RE, "/");
+    if (PAGE_FILE_TEST_RE.test(normalized)) {
       pages.set(normalized, importFn);
-    } else if (/\+layout\.\w+$/.test(normalized)) {
+    } else if (LAYOUT_FILE_TEST_RE.test(normalized)) {
       layouts.set(normalized, importFn);
-    } else if (/\+error\.\w+$/.test(normalized)) {
+    } else if (ERROR_FILE_TEST_RE.test(normalized)) {
       errors.set(normalized, importFn);
     }
   }
@@ -179,12 +192,12 @@ function routeSpecificity(path) {
   return score;
 }
 function findNearestSpecialFile(pageFilePath, specialFiles) {
-  const normalized = pageFilePath.replace(/\\/g, "/");
+  const normalized = pageFilePath.replace(BACKSLASH_RE, "/");
   const lastSlash = normalized.lastIndexOf("/");
   let dir = lastSlash !== -1 ? normalized.slice(0, lastSlash) : "";
   while (dir) {
     for (const [specialPath, importFn] of specialFiles) {
-      const specialNorm = specialPath.replace(/\\/g, "/");
+      const specialNorm = specialPath.replace(BACKSLASH_RE, "/");
       const specialLastSlash = specialNorm.lastIndexOf("/");
       const specialDir = specialLastSlash !== -1 ? specialNorm.slice(0, specialLastSlash) : "";
       if (specialDir === dir) {
@@ -202,6 +215,7 @@ function findNearestSpecialFile(pageFilePath, specialFiles) {
 
 // src/router.ts
 var import_utopia_core = require("@matthesketh/utopia-core");
+var VALID_DOM_ID_RE = /^[A-Za-z0-9_-]+$/;
 var currentRoute = (0, import_utopia_core.signal)(null);
 var isNavigating = (0, import_utopia_core.signal)(false);
 var routes = [];
@@ -324,10 +338,13 @@ async function navigate(url, options = {}) {
     currentRoute.set(match);
     requestAnimationFrame(() => {
       if (fullUrl.hash) {
-        const el = document.getElementById(fullUrl.hash.slice(1));
-        if (el) {
-          el.scrollIntoView();
-          return;
+        const hashId = fullUrl.hash.slice(1);
+        if (hashId && VALID_DOM_ID_RE.test(hashId)) {
+          const el = document.getElementById(hashId);
+          if (el) {
+            el.scrollIntoView();
+            return;
+          }
         }
       }
       window.scrollTo(0, 0);
@@ -401,12 +418,35 @@ function capScrollPositions() {
 
 // src/components.ts
 var import_utopia_core2 = require("@matthesketh/utopia-core");
+var moduleCache = /* @__PURE__ */ new Map();
+async function preloadRoute() {
+  const match = currentRoute.peek();
+  if (!match) return;
+  const promises = [match.route.component()];
+  if (match.route.layout) {
+    promises.push(match.route.layout());
+  }
+  const modules = await Promise.all(promises);
+  moduleCache.set(match.route.component, modules[0]);
+  if (match.route.layout && modules.length > 1) {
+    moduleCache.set(match.route.layout, modules[1]);
+  }
+}
 function createRouterView() {
   const container = document.createElement("div");
   container.setAttribute("data-utopia-router-view", "");
   let currentCleanup = null;
   let currentMatch = null;
   let loadId = 0;
+  const initialMatch = currentRoute.peek();
+  if (initialMatch) {
+    const syncResult = tryRenderFromCache(initialMatch);
+    if (syncResult) {
+      container.appendChild(syncResult.node);
+      currentCleanup = syncResult.cleanup;
+      currentMatch = initialMatch;
+    }
+  }
   (0, import_utopia_core2.effect)(() => {
     const match = currentRoute();
     if (match === currentMatch) {
@@ -440,15 +480,58 @@ function createRouterView() {
   });
   return container;
 }
+function tryRenderFromCache(match) {
+  const cachedPage = moduleCache.get(match.route.component);
+  if (!cachedPage) return null;
+  if (match.route.layout && !moduleCache.has(match.route.layout)) return null;
+  const cachedLayout = match.route.layout ? moduleCache.get(match.route.layout) : null;
+  moduleCache.delete(match.route.component);
+  if (match.route.layout) moduleCache.delete(match.route.layout);
+  const PageComponent = cachedPage.default ?? cachedPage;
+  const LayoutComponent = cachedLayout ? cachedLayout.default ?? cachedLayout : null;
+  const pageNode = renderComponent(PageComponent, {
+    params: match.params,
+    url: match.url
+  });
+  let node;
+  if (LayoutComponent) {
+    node = renderComponent(LayoutComponent, {
+      params: match.params,
+      url: match.url,
+      children: pageNode
+    });
+  } else {
+    node = pageNode;
+  }
+  return {
+    node,
+    cleanup: () => {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+  };
+}
 async function loadRouteComponent(match) {
   try {
-    const promises = [match.route.component()];
-    if (match.route.layout) {
-      promises.push(match.route.layout());
+    const cachedPage = moduleCache.get(match.route.component);
+    const cachedLayout = match.route.layout ? moduleCache.get(match.route.layout) : void 0;
+    let pageModule;
+    let layoutModule = null;
+    if (cachedPage) {
+      pageModule = cachedPage;
+      layoutModule = cachedLayout ?? null;
+      moduleCache.delete(match.route.component);
+      if (match.route.layout) moduleCache.delete(match.route.layout);
+    } else {
+      const promises = [match.route.component()];
+      if (match.route.layout) {
+        promises.push(match.route.layout());
+      }
+      const modules = await Promise.all(promises);
+      pageModule = modules[0];
+      layoutModule = modules.length > 1 ? modules[1] : null;
     }
-    const modules = await Promise.all(promises);
-    const pageModule = modules[0];
-    const layoutModule = modules.length > 1 ? modules[1] : null;
     if (currentRoute.peek() !== match) {
       return null;
     }
@@ -572,8 +655,13 @@ function clearContainer(container) {
     container.removeChild(container.firstChild);
   }
 }
+var AMPERSAND_RE = /&/g;
+var LESS_THAN_RE = /</g;
+var GREATER_THAN_RE = />/g;
+var DOUBLE_QUOTE_RE = /"/g;
+var SINGLE_QUOTE_RE = /'/g;
 function escapeHtml(str) {
-  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#x27;");
+  return str.replace(AMPERSAND_RE, "&amp;").replace(LESS_THAN_RE, "&lt;").replace(GREATER_THAN_RE, "&gt;").replace(DOUBLE_QUOTE_RE, "&quot;").replace(SINGLE_QUOTE_RE, "&#x27;");
 }
 
 // src/query.ts
@@ -641,6 +729,7 @@ function getRouteParam(name) {
   isNavigating,
   matchRoute,
   navigate,
+  preloadRoute,
   queryParams,
   setQueryParam,
   setQueryParams

package/dist/index.d.cts

@@ -167,6 +167,20 @@ declare function beforeNavigate(hook: BeforeNavigateHook): () => void;
  */
 declare function destroy(): void;
 
+/**
+ * Pre-load the current route's component (and layout) so that
+ * `createRouterView()` can render it synchronously on first paint.
+ *
+ * Call this **after** `createRouter()` and **before** `mount()`.
+ *
+ * @example
+ * ```ts
+ * createRouter(routes)
+ * await preloadRoute()
+ * mount(App, '#app')
+ * ```
+ */
+declare function preloadRoute(): Promise<void>;
 /**
  * Creates a DOM node that renders the current route's component.
  *
@@ -239,4 +253,4 @@ declare function setQueryParams(params: Record<string, string | null>): void;
  */
 declare function getRouteParam(name: string): _matthesketh_utopia_core.ReadonlySignal<string | null>;
 
-export { type BeforeNavigateHook, type Route, type RouteMatch, type RouterState, back, beforeNavigate, buildRouteTable, compilePattern, createLink, createRouter, createRouterView, currentRoute, destroy, filePathToRoute, forward, getQueryParam, getRouteParam, isNavigating, matchRoute, navigate, queryParams, setQueryParam, setQueryParams };
+export { type BeforeNavigateHook, type Route, type RouteMatch, type RouterState, back, beforeNavigate, buildRouteTable, compilePattern, createLink, createRouter, createRouterView, currentRoute, destroy, filePathToRoute, forward, getQueryParam, getRouteParam, isNavigating, matchRoute, navigate, preloadRoute, queryParams, setQueryParam, setQueryParams };

package/dist/index.d.ts

@@ -167,6 +167,20 @@ declare function beforeNavigate(hook: BeforeNavigateHook): () => void;
  */
 declare function destroy(): void;
 
+/**
+ * Pre-load the current route's component (and layout) so that
+ * `createRouterView()` can render it synchronously on first paint.
+ *
+ * Call this **after** `createRouter()` and **before** `mount()`.
+ *
+ * @example
+ * ```ts
+ * createRouter(routes)
+ * await preloadRoute()
+ * mount(App, '#app')
+ * ```
+ */
+declare function preloadRoute(): Promise<void>;
 /**
  * Creates a DOM node that renders the current route's component.
  *
@@ -239,4 +253,4 @@ declare function setQueryParams(params: Record<string, string | null>): void;
  */
 declare function getRouteParam(name: string): _matthesketh_utopia_core.ReadonlySignal<string | null>;
 
-export { type BeforeNavigateHook, type Route, type RouteMatch, type RouterState, back, beforeNavigate, buildRouteTable, compilePattern, createLink, createRouter, createRouterView, currentRoute, destroy, filePathToRoute, forward, getQueryParam, getRouteParam, isNavigating, matchRoute, navigate, queryParams, setQueryParam, setQueryParams };
+export { type BeforeNavigateHook, type Route, type RouteMatch, type RouterState, back, beforeNavigate, buildRouteTable, compilePattern, createLink, createRouter, createRouterView, currentRoute, destroy, filePathToRoute, forward, getQueryParam, getRouteParam, isNavigating, matchRoute, navigate, preloadRoute, queryParams, setQueryParam, setQueryParams };

package/dist/index.js

@@ -1,24 +1,35 @@
 // src/matcher.ts
+var BACKSLASH_RE = /\\/g;
+var PAGE_FILE_RE = /\/?\+page\.\w+$/;
+var LAYOUT_OR_ERROR_FILE_RE = /\/?\+(layout|error)\.\w+$/;
+var GROUP_SEGMENT_RE = /^\(.+\)$/;
+var REST_PARAM_RE = /^\[\.\.\..+\]$/;
+var DYNAMIC_PARAM_RE = /^\[.+\]$/;
+var ROOT_ROUTE_RE = /^\/$/;
+var REGEX_SPECIAL_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
+var PAGE_FILE_TEST_RE = /\+page\.\w+$/;
+var LAYOUT_FILE_TEST_RE = /\+layout\.\w+$/;
+var ERROR_FILE_TEST_RE = /\+error\.\w+$/;
 function filePathToRoute(filePath) {
-  let normalized = filePath.replace(/\\/g, "/");
+  let normalized = filePath.replace(BACKSLASH_RE, "/");
   const routesIdx = normalized.indexOf("routes/");
   if (routesIdx !== -1) {
     normalized = normalized.slice(routesIdx + "routes/".length);
   }
-  normalized = normalized.replace(/\/?\+page\.\w+$/, "");
-  normalized = normalized.replace(/\/?\+(layout|error)\.\w+$/, "");
+  normalized = normalized.replace(PAGE_FILE_RE, "");
+  normalized = normalized.replace(LAYOUT_OR_ERROR_FILE_RE, "");
   const segments = normalized.split("/").filter(Boolean);
   const routeSegments = [];
   for (const segment of segments) {
-    if (/^\(.+\)$/.test(segment)) {
+    if (GROUP_SEGMENT_RE.test(segment)) {
       continue;
     }
-    if (/^\[\.\.\..+\]$/.test(segment)) {
+    if (REST_PARAM_RE.test(segment)) {
       const paramName = segment.slice(4, -1);
       routeSegments.push(`*${paramName}`);
       continue;
     }
-    if (/^\[.+\]$/.test(segment)) {
+    if (DYNAMIC_PARAM_RE.test(segment)) {
       const paramName = segment.slice(1, -1);
       routeSegments.push(`:${paramName}`);
       continue;
@@ -32,7 +43,7 @@ function compilePattern(pattern) {
   const params = [];
   if (pattern === "/") {
     return {
-      regex: /^\/$/,
+      regex: ROOT_ROUTE_RE,
       params: []
     };
   }
@@ -54,12 +65,13 @@ function compilePattern(pattern) {
   }
   regexStr = "^" + regexStr + "/?$";
   return {
+    // Dynamic regex — built from sanitized input (segments are escaped via escapeRegex).
     regex: new RegExp(regexStr),
     params
   };
 }
 function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return str.replace(REGEX_SPECIAL_CHARS_RE, "\\$&");
 }
 function matchRoute(url, routes2) {
   let pathname = url.pathname;
@@ -83,12 +95,12 @@ function buildRouteTable(manifest) {
   const layouts = /* @__PURE__ */ new Map();
   const errors = /* @__PURE__ */ new Map();
   for (const [filePath, importFn] of Object.entries(manifest)) {
-    const normalized = filePath.replace(/\\/g, "/");
-    if (/\+page\.\w+$/.test(normalized)) {
+    const normalized = filePath.replace(BACKSLASH_RE, "/");
+    if (PAGE_FILE_TEST_RE.test(normalized)) {
       pages.set(normalized, importFn);
-    } else if (/\+layout\.\w+$/.test(normalized)) {
+    } else if (LAYOUT_FILE_TEST_RE.test(normalized)) {
       layouts.set(normalized, importFn);
-    } else if (/\+error\.\w+$/.test(normalized)) {
+    } else if (ERROR_FILE_TEST_RE.test(normalized)) {
       errors.set(normalized, importFn);
     }
   }
@@ -135,12 +147,12 @@ function routeSpecificity(path) {
   return score;
 }
 function findNearestSpecialFile(pageFilePath, specialFiles) {
-  const normalized = pageFilePath.replace(/\\/g, "/");
+  const normalized = pageFilePath.replace(BACKSLASH_RE, "/");
   const lastSlash = normalized.lastIndexOf("/");
   let dir = lastSlash !== -1 ? normalized.slice(0, lastSlash) : "";
   while (dir) {
     for (const [specialPath, importFn] of specialFiles) {
-      const specialNorm = specialPath.replace(/\\/g, "/");
+      const specialNorm = specialPath.replace(BACKSLASH_RE, "/");
       const specialLastSlash = specialNorm.lastIndexOf("/");
       const specialDir = specialLastSlash !== -1 ? specialNorm.slice(0, specialLastSlash) : "";
       if (specialDir === dir) {
@@ -158,6 +170,7 @@ function findNearestSpecialFile(pageFilePath, specialFiles) {
 
 // src/router.ts
 import { signal } from "@matthesketh/utopia-core";
+var VALID_DOM_ID_RE = /^[A-Za-z0-9_-]+$/;
 var currentRoute = signal(null);
 var isNavigating = signal(false);
 var routes = [];
@@ -280,10 +293,13 @@ async function navigate(url, options = {}) {
     currentRoute.set(match);
     requestAnimationFrame(() => {
       if (fullUrl.hash) {
-        const el = document.getElementById(fullUrl.hash.slice(1));
-        if (el) {
-          el.scrollIntoView();
-          return;
+        const hashId = fullUrl.hash.slice(1);
+        if (hashId && VALID_DOM_ID_RE.test(hashId)) {
+          const el = document.getElementById(hashId);
+          if (el) {
+            el.scrollIntoView();
+            return;
+          }
         }
       }
       window.scrollTo(0, 0);
@@ -357,12 +373,35 @@ function capScrollPositions() {
 
 // src/components.ts
 import { effect } from "@matthesketh/utopia-core";
+var moduleCache = /* @__PURE__ */ new Map();
+async function preloadRoute() {
+  const match = currentRoute.peek();
+  if (!match) return;
+  const promises = [match.route.component()];
+  if (match.route.layout) {
+    promises.push(match.route.layout());
+  }
+  const modules = await Promise.all(promises);
+  moduleCache.set(match.route.component, modules[0]);
+  if (match.route.layout && modules.length > 1) {
+    moduleCache.set(match.route.layout, modules[1]);
+  }
+}
 function createRouterView() {
   const container = document.createElement("div");
   container.setAttribute("data-utopia-router-view", "");
   let currentCleanup = null;
   let currentMatch = null;
   let loadId = 0;
+  const initialMatch = currentRoute.peek();
+  if (initialMatch) {
+    const syncResult = tryRenderFromCache(initialMatch);
+    if (syncResult) {
+      container.appendChild(syncResult.node);
+      currentCleanup = syncResult.cleanup;
+      currentMatch = initialMatch;
+    }
+  }
   effect(() => {
     const match = currentRoute();
     if (match === currentMatch) {
@@ -396,15 +435,58 @@ function createRouterView() {
   });
   return container;
 }
+function tryRenderFromCache(match) {
+  const cachedPage = moduleCache.get(match.route.component);
+  if (!cachedPage) return null;
+  if (match.route.layout && !moduleCache.has(match.route.layout)) return null;
+  const cachedLayout = match.route.layout ? moduleCache.get(match.route.layout) : null;
+  moduleCache.delete(match.route.component);
+  if (match.route.layout) moduleCache.delete(match.route.layout);
+  const PageComponent = cachedPage.default ?? cachedPage;
+  const LayoutComponent = cachedLayout ? cachedLayout.default ?? cachedLayout : null;
+  const pageNode = renderComponent(PageComponent, {
+    params: match.params,
+    url: match.url
+  });
+  let node;
+  if (LayoutComponent) {
+    node = renderComponent(LayoutComponent, {
+      params: match.params,
+      url: match.url,
+      children: pageNode
+    });
+  } else {
+    node = pageNode;
+  }
+  return {
+    node,
+    cleanup: () => {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+  };
+}
 async function loadRouteComponent(match) {
   try {
-    const promises = [match.route.component()];
-    if (match.route.layout) {
-      promises.push(match.route.layout());
+    const cachedPage = moduleCache.get(match.route.component);
+    const cachedLayout = match.route.layout ? moduleCache.get(match.route.layout) : void 0;
+    let pageModule;
+    let layoutModule = null;
+    if (cachedPage) {
+      pageModule = cachedPage;
+      layoutModule = cachedLayout ?? null;
+      moduleCache.delete(match.route.component);
+      if (match.route.layout) moduleCache.delete(match.route.layout);
+    } else {
+      const promises = [match.route.component()];
+      if (match.route.layout) {
+        promises.push(match.route.layout());
+      }
+      const modules = await Promise.all(promises);
+      pageModule = modules[0];
+      layoutModule = modules.length > 1 ? modules[1] : null;
     }
-    const modules = await Promise.all(promises);
-    const pageModule = modules[0];
-    const layoutModule = modules.length > 1 ? modules[1] : null;
     if (currentRoute.peek() !== match) {
       return null;
     }
@@ -528,8 +610,13 @@ function clearContainer(container) {
     container.removeChild(container.firstChild);
   }
 }
+var AMPERSAND_RE = /&/g;
+var LESS_THAN_RE = /</g;
+var GREATER_THAN_RE = />/g;
+var DOUBLE_QUOTE_RE = /"/g;
+var SINGLE_QUOTE_RE = /'/g;
 function escapeHtml(str) {
-  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#x27;");
+  return str.replace(AMPERSAND_RE, "&amp;").replace(LESS_THAN_RE, "&lt;").replace(GREATER_THAN_RE, "&gt;").replace(DOUBLE_QUOTE_RE, "&quot;").replace(SINGLE_QUOTE_RE, "&#x27;");
 }
 
 // src/query.ts
@@ -596,6 +683,7 @@ export {
   isNavigating,
   matchRoute,
   navigate,
+  preloadRoute,
   queryParams,
   setQueryParam,
   setQueryParams

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matthesketh/utopia-router",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "File-based routing for UtopiaJS",
   "type": "module",
   "license": "MIT",
@@ -39,12 +39,12 @@
   "files": [
     "dist"
   ],
-  "dependencies": {
-    "@matthesketh/utopia-core": "0.4.0",
-    "@matthesketh/utopia-runtime": "0.4.0"
-  },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "dev": "tsup src/index.ts --format esm,cjs --dts --watch"
+  },
+  "dependencies": {
+    "@matthesketh/utopia-core": "workspace:*",
+    "@matthesketh/utopia-runtime": "workspace:*"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Matt Hesketh
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.