@ereo/bundler 0.2.29 → 0.2.36

package/dist/dev/hmr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../../src/dev/hmr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../../src/dev/hmr.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -265,13 +265,17 @@ class HMRServer {
   send(update) {
     this.lastUpdate = update;
     const message = JSON.stringify(update);
+    const failed = [];
     for (const client of this.clients) {
       try {
         client.send(message);
       } catch {
-        this.clients.delete(client);
+        failed.push(client);
       }
     }
+    for (const client of failed) {
+      this.clients.delete(client);
+    }
   }
   reload(reason) {
     this.send({
@@ -821,12 +825,11 @@ var ERROR_OVERLAY_SCRIPT = `
 </script>
 `;
 // src/prod/build.ts
-import { join as join2, relative, dirname as dirname2, basename as basename2, extname } from "path";
+import { join, relative, dirname, basename, extname } from "path";
 import { mkdir, rm, readdir, stat, copyFile } from "fs/promises";
 import { initFileRouter } from "@ereo/router";
 
 // src/plugins/islands.ts
-import { basename } from "path";
 var ISLAND_DIRECTIVE_PATTERN = /client:(load|idle|visible|media)(?:="([^"]+)")?/g;
 var COMPONENT_EXPORT_PATTERN = /export\s+(?:default\s+)?(?:function|const|class)\s+(\w+)/g;
 var USE_CLIENT_PATTERN = /^['"]use client['"]/m;
@@ -834,6 +837,7 @@ function extractIslands(content, filePath) {
   const islands = [];
   const isClientComponent = USE_CLIENT_PATTERN.test(content);
   if (!isClientComponent) {
+    ISLAND_DIRECTIVE_PATTERN.lastIndex = 0;
     const hasDirectives = ISLAND_DIRECTIVE_PATTERN.test(content);
     if (!hasDirectives) {
       return islands;
@@ -845,7 +849,6 @@ function extractIslands(content, filePath) {
   while ((match = COMPONENT_EXPORT_PATTERN.exec(content)) !== null) {
     componentNames.push(match[1]);
   }
-  const fileName = basename(filePath, ".tsx").replace(".ts", "");
   if (isClientComponent && componentNames.length > 0) {
     islands.push({
       id: generateIslandId(filePath),
@@ -862,8 +865,9 @@ function generateIslandId(filePath) {
 }
 function transformIslandJSX(code) {
   let transformed = code;
+  let counter = 0;
   transformed = transformed.replace(/<(\w+)\s+([^>]*client:(load|idle|visible|media)[^>]*)>/g, (match, tag, props, strategy) => {
-    const id = `island-${Math.random().toString(36).slice(2, 8)}`;
+    const id = `island-${tag}-${counter++}`;
     return `<${tag} data-island="${id}" data-strategy="${strategy}" ${props}>`;
   });
   return transformed;
@@ -905,9 +909,12 @@ initializeIslands();
   `.trim();
 }
 function createIslandsPlugin() {
-  const islands = [];
+  let islands = [];
   return {
     name: "ereo:islands",
+    buildStart() {
+      islands = [];
+    },
     transform(code, id) {
       if (!id.endsWith(".tsx") && !id.endsWith(".jsx")) {
         return null;
@@ -935,6 +942,7 @@ function findIslandByName(islands, name) {
   return islands.find((i) => i.name === name);
 }
 function hasIslands(content) {
+  ISLAND_DIRECTIVE_PATTERN.lastIndex = 0;
   return USE_CLIENT_PATTERN.test(content) || ISLAND_DIRECTIVE_PATTERN.test(content);
 }
 
@@ -966,7 +974,7 @@ var DEFAULT_ASSET_EXTENSIONS = [
 async function build(options = {}) {
   const startTime = performance.now();
   const root = options.root || process.cwd();
-  const outDir = options.outDir || join2(root, ".ereo");
+  const outDir = options.outDir || join(root, ".ereo");
   const minify = options.minify ?? true;
   const sourcemap = options.sourcemap ?? true;
   const splitting = options.splitting ?? true;
@@ -990,7 +998,7 @@ async function build(options = {}) {
       }
     }
     const router = await initFileRouter({
-      routesDir: join2(root, "app/routes")
+      routesDir: join(root, "app/routes")
     });
     const routes = router.getRoutes();
     const routeCount = countRoutes(routes);
@@ -1007,7 +1015,7 @@ async function build(options = {}) {
   Building server bundle...`);
     const serverResult = await buildServer({
       root,
-      outDir: join2(outDir, "server"),
+      outDir: join(outDir, "server"),
       routes,
       minify,
       sourcemap,
@@ -1024,7 +1032,7 @@ async function build(options = {}) {
   Building client bundle...`);
     const clientResult = await buildClient({
       root,
-      outDir: join2(outDir, "client"),
+      outDir: join(outDir, "client"),
       routes,
       minify,
       sourcemap,
@@ -1041,7 +1049,7 @@ async function build(options = {}) {
   Building island bundles...`);
       const islandResult = await buildIslands({
         root,
-        outDir: join2(outDir, "client/islands"),
+        outDir: join(outDir, "client/islands"),
         islands,
         minify,
         sourcemap,
@@ -1058,7 +1066,7 @@ async function build(options = {}) {
   Building CSS bundle...`);
       const cssResult = await buildCSS({
         root,
-        outDir: join2(outDir, "assets"),
+        outDir: join(outDir, "assets"),
         cssFiles,
         minify,
         sourcemap,
@@ -1074,7 +1082,7 @@ async function build(options = {}) {
   Copying static assets...`);
     const assetResult = await copyAssets({
       root,
-      outDir: join2(outDir, "assets"),
+      outDir: join(outDir, "assets"),
       extensions: assetExtensions
     });
     allOutputs.push(...assetResult.outputs);
@@ -1127,12 +1135,12 @@ function generateBuildId() {
 async function cleanAndCreateDirs(outDir) {
   await rm(outDir, { recursive: true, force: true });
   await mkdir(outDir, { recursive: true });
-  await mkdir(join2(outDir, "server"), { recursive: true });
-  await mkdir(join2(outDir, "server/routes"), { recursive: true });
-  await mkdir(join2(outDir, "client"), { recursive: true });
-  await mkdir(join2(outDir, "client/islands"), { recursive: true });
-  await mkdir(join2(outDir, "client/chunks"), { recursive: true });
-  await mkdir(join2(outDir, "assets"), { recursive: true });
+  await mkdir(join(outDir, "server"), { recursive: true });
+  await mkdir(join(outDir, "server/routes"), { recursive: true });
+  await mkdir(join(outDir, "client"), { recursive: true });
+  await mkdir(join(outDir, "client/islands"), { recursive: true });
+  await mkdir(join(outDir, "client/chunks"), { recursive: true });
+  await mkdir(join(outDir, "assets"), { recursive: true });
 }
 function countRoutes(routes) {
   let count = 0;
@@ -1164,7 +1172,7 @@ async function extractAllIslands(root, routes) {
       }
     }
   };
-  const componentsDir = join2(root, "app/components");
+  const componentsDir = join(root, "app/components");
   try {
     const componentFiles = await scanForFiles(componentsDir, [".tsx", ".jsx"]);
     for (const file of componentFiles) {
@@ -1190,7 +1198,7 @@ async function scanForFiles(dir, extensions) {
   try {
     const entries = await readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join2(dir, entry.name);
+      const fullPath = join(dir, entry.name);
       if (entry.isDirectory()) {
         const subFiles = await scanForFiles(fullPath, extensions);
         files.push(...subFiles);
@@ -1207,9 +1215,9 @@ async function scanForFiles(dir, extensions) {
 async function collectCSSFiles(root) {
   const cssFiles = [];
   const dirsToScan = [
-    join2(root, "app"),
-    join2(root, "styles"),
-    join2(root, "src")
+    join(root, "app"),
+    join(root, "styles"),
+    join(root, "src")
   ];
   for (const dir of dirsToScan) {
     try {
@@ -1234,7 +1242,7 @@ async function buildServer(options) {
   const errors = [];
   const routeModules = {};
   const entrypoints = [];
-  const routesDir = join2(outDir, "routes");
+  const routesDir = join(outDir, "routes");
   const collectEntrypoints = (routeList) => {
     for (const route of routeList) {
       entrypoints.push(route.file);
@@ -1284,11 +1292,11 @@ async function buildServer(options) {
       });
       if (output.kind === "entry-point") {
         const sourcePath = entrypoints.find((e) => {
-          const routeRelPath = relative(join2(root, "app/routes"), e).replace(/\\/g, "/").replace(/\.[^.]+$/, ".js");
+          const routeRelPath = relative(join(root, "app/routes"), e).replace(/\\/g, "/").replace(/\.[^.]+$/, ".js");
           return output.path.replace(/\\/g, "/").endsWith(routeRelPath);
         });
         if (sourcePath) {
-          const routeId = relative(join2(root, "app/routes"), sourcePath).replace(/\.[^.]+$/, "").replace(/\\/g, "/");
+          const routeId = relative(join(root, "app/routes"), sourcePath).replace(/\.[^.]+$/, "").replace(/\\/g, "/");
           routeModules[routeId] = relativePath;
           const outputRelativeToRoutesDir = relative(routesDir, output.path).replace(/\\/g, "/");
           routeOutputMap.set(sourcePath, outputRelativeToRoutesDir);
@@ -1299,7 +1307,7 @@ async function buildServer(options) {
     errors.push(error instanceof Error ? error.message : String(error));
   }
   const serverEntry = generateServerEntry(routes, root, routeOutputMap);
-  const serverEntryPath = join2(outDir, "_entry.server.ts");
+  const serverEntryPath = join(outDir, "_entry.server.ts");
   await Bun.write(serverEntryPath, serverEntry);
   try {
     const entryResult = await Bun.build({
@@ -1344,10 +1352,11 @@ async function buildServer(options) {
 function generateServerEntry(routes, root, routeOutputMap) {
   const imports = [];
   const routeRegistrations = [];
-  const processRoute = (route, index) => {
-    const varName = `route_${index}`;
+  let routeCounter = 0;
+  const processRoute = (route) => {
+    const varName = `route_${routeCounter++}`;
     const outputPath = routeOutputMap.get(route.file);
-    const importPath = outputPath ? `./routes/${outputPath}` : `./routes/${relative(join2(root, "app/routes"), route.file).replace(/\\/g, "/").replace(/\.[^.]+$/, ".js")}`;
+    const importPath = outputPath ? `./routes/${outputPath}` : `./routes/${relative(join(root, "app/routes"), route.file).replace(/\\/g, "/").replace(/\.[^.]+$/, ".js")}`;
     imports.push(`import * as ${varName} from '${importPath}';`);
     routeRegistrations.push(`  {
     id: '${route.id}',
@@ -1357,12 +1366,12 @@ function generateServerEntry(routes, root, routeOutputMap) {
     layout: ${route.layout || false},
   }`);
     if (route.children) {
-      route.children.forEach((child, childIndex) => {
-        processRoute(child, index * 100 + childIndex);
+      route.children.forEach((child) => {
+        processRoute(child);
       });
     }
   };
-  routes.forEach((route, index) => processRoute(route, index));
+  routes.forEach((route) => processRoute(route));
   return `/**
  * Server Entry - Auto-generated by @ereo/bundler
  * Do not edit this file directly.
@@ -1404,8 +1413,8 @@ async function buildClient(options) {
   const outputs = [];
   const errors = [];
   const chunks = {};
-  const clientEntry = join2(root, "app/entry.client.tsx");
-  const clientEntryAlt = join2(root, "app/entry.client.ts");
+  const clientEntry = join(root, "app/entry.client.tsx");
+  const clientEntryAlt = join(root, "app/entry.client.ts");
   const hasClientEntry = await Bun.file(clientEntry).exists();
   const hasClientEntryAlt = await Bun.file(clientEntryAlt).exists();
   let entrypoint;
@@ -1414,7 +1423,7 @@ async function buildClient(options) {
   } else if (hasClientEntryAlt) {
     entrypoint = clientEntryAlt;
   } else {
-    const defaultEntry = join2(outDir, "_entry.client.tsx");
+    const defaultEntry = join(outDir, "_entry.client.tsx");
     await Bun.write(defaultEntry, generateDefaultClientEntry(routes));
     entrypoint = defaultEntry;
   }
@@ -1447,7 +1456,7 @@ async function buildClient(options) {
         isEntry: output.kind === "entry-point"
       });
       if (output.kind === "chunk") {
-        const chunkName = basename2(output.path, extname(output.path));
+        const chunkName = basename(output.path, extname(output.path));
         chunks[chunkName] = relativePath;
       }
     }
@@ -1456,7 +1465,7 @@ async function buildClient(options) {
   }
   if (!hasClientEntry && !hasClientEntryAlt) {
     try {
-      await rm(join2(outDir, "_entry.client.tsx"));
+      await rm(join(outDir, "_entry.client.tsx"));
     } catch (error) {}
   }
   return {
@@ -1510,10 +1519,10 @@ async function buildIslands(options) {
     return { outputs, errors, islands: islandMap };
   }
   const islandEntry = generateIslandEntry(islands);
-  const islandEntryPath = join2(outDir, "_islands.entry.ts");
+  const islandEntryPath = join(outDir, "_islands.entry.ts");
   await Bun.write(islandEntryPath, islandEntry);
   const islandManifest = generateIslandManifest(islands);
-  await Bun.write(join2(outDir, "manifest.json"), islandManifest);
+  await Bun.write(join(outDir, "manifest.json"), islandManifest);
   const islandEntrypoints = islands.map((island) => island.file);
   try {
     const result = await Bun.build({
@@ -1545,7 +1554,7 @@ async function buildIslands(options) {
         isEntry: output.kind === "entry-point"
       });
       if (output.kind === "entry-point") {
-        const sourceIsland = islands.find((i) => output.path.includes(basename2(i.file, extname(i.file))));
+        const sourceIsland = islands.find((i) => output.path.includes(basename(i.file, extname(i.file))));
         if (sourceIsland) {
           islandMap[sourceIsland.id] = relativePath;
         }
@@ -1592,7 +1601,7 @@ ${content}
       errors.push(`Failed to read CSS file ${cssFile}: ${error}`);
     }
   }
-  const outputPath = join2(outDir, "styles.css");
+  const outputPath = join(outDir, "styles.css");
   if (minify) {
     combinedCSS = minifyCSS(combinedCSS);
   }
@@ -1623,23 +1632,29 @@ ${content}
   return { outputs, errors };
 }
 function minifyCSS(css) {
-  return css.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\s+/g, " ").replace(/\s*([{}:;,>+~])\s*/g, "$1").replace(/;}/g, "}").trim();
+  const placeholders = [];
+  const safeCss = css.replace(/("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|url\(\s*(?:"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|[^)]*?)\s*\))/g, (match) => {
+    placeholders.push(match);
+    return `__EREO_PH${placeholders.length - 1}__`;
+  });
+  const minified = safeCss.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\s+/g, " ").replace(/\s*([{}:;,>+~])\s*/g, "$1").replace(/;}/g, "}").trim();
+  return minified.replace(/__EREO_PH(\d+)__/g, (_, idx) => placeholders[Number(idx)]);
 }
 async function copyAssets(options) {
   const { root, outDir, extensions } = options;
   const outputs = [];
   const assetDirs = [
-    join2(root, "public"),
-    join2(root, "app/assets"),
-    join2(root, "assets")
+    join(root, "public"),
+    join(root, "app/assets"),
+    join(root, "assets")
   ];
   for (const dir of assetDirs) {
     try {
       const files = await scanForFiles(dir, extensions);
       for (const file of files) {
         const relativePath = relative(dir, file);
-        const destPath = join2(outDir, relativePath);
-        await mkdir(dirname2(destPath), { recursive: true });
+        const destPath = join(outDir, relativePath);
+        await mkdir(dirname(destPath), { recursive: true });
         await copyFile(file, destPath);
         const fileStat = await stat(destPath);
         outputs.push({
@@ -1648,7 +1663,11 @@ async function copyAssets(options) {
           type: "asset"
         });
       }
-    } catch (error) {}
+    } catch (error) {
+      if (error?.code !== "ENOENT") {
+        console.warn(`  [Assets] Failed to process ${dir}: ${error?.message ?? error}`);
+      }
+    }
   }
   return { outputs };
 }
@@ -1710,7 +1729,7 @@ async function generateManifest(options) {
     assets,
     css: cssFiles
   };
-  await Bun.write(join2(outDir, "manifest.json"), JSON.stringify(manifest, null, 2));
+  await Bun.write(join(outDir, "manifest.json"), JSON.stringify(manifest, null, 2));
 }
 function formatSize(bytes) {
   if (bytes < 1024)
@@ -1788,7 +1807,7 @@ function analyzeBuild(result) {
   };
 }
 // src/plugins/types.ts
-import { join as join3 } from "path";
+import { join as join2 } from "path";
 function extractParams(path) {
   const params = {};
   const segments = path.split("/").filter(Boolean);
@@ -2225,14 +2244,14 @@ function generateIndexFile(fileNames) {
 }
 async function writeRouteTypes(outDir, routes, options = {}) {
   const types = generateRouteTypes(routes, options);
-  const outPath = join3(outDir, "routes.d.ts");
+  const outPath = join2(outDir, "routes.d.ts");
   await Bun.write(outPath, types);
   console.log(`\x1B[32m\u2713\x1B[0m Route types written to ${outPath}`);
 }
 async function writeSplitRouteTypes(outDir, routes, options = {}) {
   const files = generateSplitRouteTypes(routes, options);
   for (const [fileName, content] of files) {
-    const outPath = join3(outDir, fileName);
+    const outPath = join2(outDir, fileName);
     await Bun.write(outPath, content);
   }
   console.log(`\x1B[32m\u2713\x1B[0m Split route types written to ${outDir} (${files.size} files)`);
@@ -2425,7 +2444,7 @@ export declare function useNavigate(): {
   `.trim();
 }
 // src/plugins/tailwind.ts
-import { join as join4, resolve } from "path";
+import { join as join3, resolve } from "path";
 import { readFileSync, existsSync, statSync } from "fs";
 import postcss from "postcss";
 import tailwindcss from "tailwindcss";
@@ -2456,10 +2475,10 @@ function createTailwindPlugin(options = {}) {
   async function loadTailwindConfig() {
     const configPaths = [
       config ? resolve(root, config) : null,
-      join4(root, "tailwind.config.js"),
-      join4(root, "tailwind.config.ts"),
-      join4(root, "tailwind.config.mjs"),
-      join4(root, "tailwind.config.cjs")
+      join3(root, "tailwind.config.js"),
+      join3(root, "tailwind.config.ts"),
+      join3(root, "tailwind.config.mjs"),
+      join3(root, "tailwind.config.cjs")
     ].filter(Boolean);
     for (const configPath of configPaths) {
       try {
@@ -2714,7 +2733,7 @@ ${code}`;
       ];
       if (server.watcher) {
         for (const configFile of configPaths) {
-          const fullPath = join4(root, configFile);
+          const fullPath = join3(root, configFile);
           if (existsSync(fullPath)) {
             server.watcher.add(fullPath);
           }
@@ -2835,12 +2854,12 @@ async function hasTailwindConfig(root) {
     "tailwind.config.mjs"
   ];
   for (const file of configFiles) {
-    if (existsSync(join4(root, file))) {
+    if (existsSync(join3(root, file))) {
       return true;
     }
   }
   try {
-    const pkgPath = join4(root, "package.json");
+    const pkgPath = join3(root, "package.json");
     if (existsSync(pkgPath)) {
       const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
       const deps = { ...pkg.dependencies, ...pkg.devDependencies };
@@ -2858,8 +2877,8 @@ function tailwindMiddleware(options = {}) {
     if (!processor) {
       const configPaths = [
         options.config ? resolve(root, options.config) : null,
-        join4(root, "tailwind.config.js"),
-        join4(root, "tailwind.config.ts")
+        join3(root, "tailwind.config.js"),
+        join3(root, "tailwind.config.ts")
       ].filter(Boolean);
       for (const configPath of configPaths) {
         if (existsSync(configPath)) {

package/dist/plugins/islands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"islands.d.ts","sourceRoot":"","sources":["../../src/plugins/islands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AASD;;GAEG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,UAAU,EAAE,CAqCd;AAYD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcvD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAcpE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAsBjE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAuC5C;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,UAAU,EAAE,EACrB,IAAI,EAAE,MAAM,GACX,UAAU,GAAG,SAAS,CAExB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEnD"}
+{"version":3,"file":"islands.d.ts","sourceRoot":"","sources":["../../src/plugins/islands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AASD;;GAEG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,UAAU,EAAE,CAoCd;AAYD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAiBvD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAcpE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAsBjE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CA4C5C;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,UAAU,EAAE,EACrB,IAAI,EAAE,MAAM,GACX,UAAU,GAAG,SAAS,CAExB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGnD"}

package/dist/prod/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/prod/build.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAuC,MAAM,EAAE,MAAM,YAAY,CAAC;AAU9E;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0BAA0B;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB;IACrB,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,wBAAwB;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAwED;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAyL5E;AAw4BD;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAyC1D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,CA2CA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/prod/build.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAuC,MAAM,EAAE,MAAM,YAAY,CAAC;AAU9E;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0BAA0B;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB;IACrB,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,wBAAwB;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAwED;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAyL5E;AA25BD;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAyC1D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,CA2CA"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ereo/bundler",
-  "version": "0.2.29",
+  "version": "0.2.36",
   "license": "MIT",
-  "author": "Ereo Team",
+  "author": "Enoch Kujem Abassey",
   "homepage": "https://ereojs.github.io/ereoJS",
   "repository": {
     "type": "git",
@@ -32,8 +32,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ereo/core": "^0.2.29",
-    "@ereo/router": "^0.2.29",
+    "@ereo/core": "^0.2.36",
+    "@ereo/router": "^0.2.36",
     "postcss": "^8.4.35",
     "tailwindcss": "^3.4.1",
     "autoprefixer": "^10.4.17",