@ogygia/devtools 0.11.4 → 0.12.0

package/README.md

@@ -23,4 +23,4 @@ export default defineConfig(({ mode }) => ({
 
 Code for the profiler: `@ogygia/devtools/profiler` (`span`, `instrument`), `@ogygia/devtools/profiler/client` (`mark`), and stores at `@ogygia/devtools/profiler/storage/sqlite`, `/redis`, `/postgres`.
 
-Docs: [Devtools](https://ogygiajs.dev/docs/devtools/overview) and [the profiler](https://ogygiajs.dev/docs/profiler/overview).
+Docs: [@ogygia/devtools](https://ogygiajs.dev/docs/devtools/overview), with [the dock](https://ogygiajs.dev/docs/devtools/dock) and [the profiler](https://ogygiajs.dev/docs/devtools/profiler/overview).

package/dist/profiler/standalone.js

@@ -3,7 +3,9 @@ const STYLESHEET_RE = /<link\b[^>]*\brel=["']stylesheet["'][^>]*>/gi;
 const MODULEPRELOAD_RE = /<link\b[^>]*\brel=["']modulepreload["'][^>]*>/gi;
 const HREF_RE = /\bhref=["']([^"']+)["']/i;
 const MODULE_SCRIPT_RE = /<script\b([^>]*\btype=["']module["'][^>]*)\bsrc=["']([^"']+)["']([^>]*)><\/script>/gi;
-const ENTRY_ATTR_RE = /(<ogygia-region\b[^>]*\bentry=["'])([^"']+)(["'])/gi;
+const REGION_TAG_RE = /<ogygia-region\b[^>]*>/gi;
+const REGION_ENTRY_RE = /((?<![\w-])entry=["'])([^"']+)(["'])/i;
+const REGION_SRC_RE = /((?<![\w-])src=["'])([^"']+)(["'])/i;
 /** a static or dynamic import of a RELATIVE specifier inside a built chunk — quoted, or a
 *  template literal with no interpolation (Vite emits `import(\`./chunks/x.js\`)`) */
 const IMPORT_RE = /((?:\bfrom|\bimport)\s*\(?\s*)(["'`])(\.{1,2}\/[^"'`$]+)\2/g;
@@ -78,10 +80,16 @@ async function build_standalone(html, opts) {
 		chunks.delete(key);
 	}
 	const entries = [];
-	html = html.replace(ENTRY_ATTR_RE, (_, open, href, close) => {
-		const u = new URL(href, base);
+	html = html.replace(REGION_TAG_RE, (tag) => {
+		const src = REGION_SRC_RE.exec(tag)?.[2];
+		const file = src ?? REGION_ENTRY_RE.exec(tag)?.[2];
+		if (!file) return tag;
+		const u = new URL(file, base);
 		entries.push(u);
-		return `${open}${key_of(u)}${close}`;
+		const key = key_of(u);
+		let out = tag.replace(REGION_ENTRY_RE, (_m, open, _v, close) => open + key + close);
+		if (src) out = out.replace(REGION_SRC_RE, (_m, open, _v, close) => open + key + close);
+		return out;
 	});
 	for (const u of entries) await add_chunk(u);
 	const imports = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogygia/devtools",
-  "version": "0.11.4",
+  "version": "0.12.0",
   "description": "Devtools for ogygia: the in-page dock, and the SSR profiler with its report, client marks and storage adapters",
   "keywords": [
     "devtools",
@@ -66,10 +66,13 @@
   },
   "dependencies": {
     "@neodrag/svelte": "3.0.0-next.12",
-    "devalue": "^5.9.3",
-    "@ogygia/router": "^0.11.0"
+    "@ogygia/router": "^0.12.0",
+    "devalue": "^5.9.3"
   },
   "devDependencies": {
+    "@ogygia/core": "0.12.0",
+    "@ogygia/tooling": "0.0.0",
+    "@ogygia/tsdown-plugin-svelte": "1.1.1",
     "@playwright/test": "1.62.1",
     "@sveltejs/kit": "^2.70.2",
     "@sveltejs/vite-plugin-svelte": "^7.2.0",
@@ -80,16 +83,13 @@
     "tsdown": "^0.23.4",
     "typescript": "^6.0.3",
     "vite": "^8.3.5",
-    "vitest": "^4.1.12",
-    "@ogygia/core": "0.11.4",
-    "@ogygia/tooling": "0.0.0",
-    "@ogygia/tsdown-plugin-svelte": "1.1.0"
+    "vitest": "^4.1.12"
   },
   "peerDependencies": {
+    "@ogygia/core": "^0.12.0",
     "@sveltejs/kit": ">=2.70.2 <4",
     "svelte": "^5.56.8",
-    "vite": "^8.2.4",
-    "@ogygia/core": "^0.11.4"
+    "vite": "^8.2.4"
   },
   "scripts": {
     "build": "tsdown",