@ereo/bundler 0.2.37 → 0.2.39

package/dist/index.js

@@ -830,23 +830,22 @@ import { mkdir, rm, readdir, stat, copyFile } from "fs/promises";
 import { initFileRouter } from "@ereo/router";
 
 // src/plugins/islands.ts
-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 ISLAND_DIRECTIVE_TEST = /client:(load|idle|visible|media)(?:="([^"]+)")?/;
+var COMPONENT_EXPORT_EXEC = /export\s+(?:default\s+)?(?:function|const|class)\s+(\w+)/g;
 var USE_CLIENT_PATTERN = /^['"]use client['"]/m;
 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);
+    const hasDirectives = ISLAND_DIRECTIVE_TEST.test(content);
     if (!hasDirectives) {
       return islands;
     }
   }
   const componentNames = [];
   let match;
-  COMPONENT_EXPORT_PATTERN.lastIndex = 0;
-  while ((match = COMPONENT_EXPORT_PATTERN.exec(content)) !== null) {
+  COMPONENT_EXPORT_EXEC.lastIndex = 0;
+  while ((match = COMPONENT_EXPORT_EXEC.exec(content)) !== null) {
     componentNames.push(match[1]);
   }
   if (isClientComponent && componentNames.length > 0) {
@@ -861,14 +860,14 @@ function extractIslands(content, filePath) {
   return islands;
 }
 function generateIslandId(filePath) {
-  return filePath.replace(/[\/\\]/g, "_").replace(/\.[^.]+$/, "").replace(/[^a-zA-Z0-9_]/g, "");
+  return filePath.replace(/[\/\\]/g, "_").replace(/\.[^.]+$/, "").replace(/[^a-zA-Z0-9_-]/g, "");
 }
 function transformIslandJSX(code) {
   let transformed = code;
   let counter = 0;
-  transformed = transformed.replace(/<(\w+)\s+([^>]*client:(load|idle|visible|media)[^>]*)>/g, (match, tag, props, strategy) => {
+  transformed = transformed.replace(/<(\w+)\s+([^>]*?client:(load|idle|visible|media)[^>]*?)\s*(\/?)>/g, (match, tag, props, strategy, selfClose) => {
     const id = `island-${tag}-${counter++}`;
-    return `<${tag} data-island="${id}" data-strategy="${strategy}" ${props}>`;
+    return `<${tag} data-island="${id}" data-strategy="${strategy}" ${props}${selfClose ? " /" : ""}>`;
   });
   return transformed;
 }
@@ -890,8 +889,8 @@ function generateIslandEntry(islands) {
   const registrations = [];
   for (const island of islands) {
     const importName = `Island_${island.id}`;
-    imports.push(`import ${importName} from '${island.file}';`);
-    registrations.push(`  registerIslandComponent('${island.name}', ${importName});`);
+    imports.push(`import * as ${importName}_ns from '${island.file}';`);
+    registrations.push(`  registerIslandComponent('${island.name}', ${importName}_ns.default || ${importName}_ns.${island.name});`);
   }
   return `
 import { registerIslandComponent, initializeIslands } from '@ereo/client';
@@ -942,8 +941,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);
+  return USE_CLIENT_PATTERN.test(content) || ISLAND_DIRECTIVE_TEST.test(content);
 }
 
 // src/prod/build.ts
@@ -1357,10 +1355,10 @@ function generateServerEntry(routes, root, routeOutputMap) {
     const varName = `route_${routeCounter++}`;
     const outputPath = routeOutputMap.get(route.file);
     const importPath = outputPath ? `./routes/${outputPath}` : `./routes/${relative(join(root, "app/routes"), route.file).replace(/\\/g, "/").replace(/\.[^.]+$/, ".js")}`;
-    imports.push(`import * as ${varName} from '${importPath}';`);
+    imports.push(`import * as ${varName} from '${importPath.replace(/'/g, "\\'")}';`);
     routeRegistrations.push(`  {
-    id: '${route.id}',
-    path: '${route.path}',
+    id: ${JSON.stringify(route.id)},
+    path: ${JSON.stringify(route.path)},
     module: ${varName},
     index: ${route.index || false},
     layout: ${route.layout || false},
@@ -1544,7 +1542,8 @@ async function buildIslands(options) {
         isEntry: output.kind === "entry-point"
       });
       if (output.kind === "entry-point") {
-        const sourceIsland = islands.find((i) => output.path.includes(basename(i.file, extname(i.file))));
+        const outputBaseName = basename(output.path, extname(output.path)).replace(/-[a-f0-9]+$/, "");
+        const sourceIsland = islands.find((i) => basename(i.file, extname(i.file)) === outputBaseName);
         if (sourceIsland) {
           islandMap[sourceIsland.id] = relativePath;
         }
@@ -1926,7 +1925,7 @@ function generateRouteTypes(routes, options = {}) {
     const importPath = generateImportPath(info.file, routesDir);
     const safeName = safeIdentifier(importPath);
     const wrapType = lazyEvaluation ? (t) => `LazyEval<${t}>` : (t) => t;
-    lines.push(`    '${info.path}': {`);
+    lines.push(`    '${info.path.replace(/'/g, "\\'")}': {`);
     lines.push(`      params: ${paramsType};`);
     if (generateSearchParams && info.hasSearchParams && inferTypes) {
       lines.push(`      search: ${wrapType(`${safeName} extends { searchParams: infer S } ? (S extends { parse: (data: any) => infer R } ? R : Record<string, string | string[] | undefined>) : Record<string, string | string[] | undefined>`)};`);
@@ -2615,6 +2614,7 @@ function createTailwindPlugin(options = {}) {
       /cva\(([^)]+)\)/g
     ];
     for (const pattern of patterns) {
+      pattern.lastIndex = 0;
       let match;
       while ((match = pattern.exec(content2)) !== null) {
         const classString = match[1];
@@ -2794,7 +2794,7 @@ function generateTailwindConfig(options = {}) {
 /** @type {import('tailwindcss').Config} */
 export default {
   content: ${JSON.stringify(content, null, 4)},
-  darkMode: '${darkMode}',
+  darkMode: ${darkMode === false ? "false" : `'${darkMode}'`},
   theme: {
     extend: {
       // Add your custom theme extensions here
@@ -2946,6 +2946,7 @@ function extractTailwindClasses(content) {
     /cn\(\s*["']([^"']+)["']/g
   ];
   for (const pattern of patterns) {
+    pattern.lastIndex = 0;
     let match;
     while ((match = pattern.exec(content)) !== null) {
       const classString = match[1];

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;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"}
+{"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;AAWD;;GAEG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,UAAU,EAAE,CAmCd;AAaD;;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,CAuBjE;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,CAEnD"}

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

@@ -1 +1 @@
-{"version":3,"file":"tailwind.d.ts","sourceRoot":"","sources":["../../src/plugins/tailwind.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,MAAM,EAA4B,MAAM,YAAY,CAAC;AAOnE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kCAAkC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC;IAClD,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,yBAAyB;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,6BAA6B;IAC7B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;IACvB,iDAAiD;IACjD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA8BD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CAgehF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CA0BlF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAqBzC;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BtE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,qBAA0B,IA6CtD,SAAS,OAAO,EAAE,SAAS,GAAG,EAAE,MAAM,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAqD5E;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CA2BhE;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAuB1F"}
+{"version":3,"file":"tailwind.d.ts","sourceRoot":"","sources":["../../src/plugins/tailwind.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,MAAM,EAA4B,MAAM,YAAY,CAAC;AAOnE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kCAAkC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC;IAClD,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,yBAAyB;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,6BAA6B;IAC7B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;IACvB,iDAAiD;IACjD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA8BD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CAiehF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CA0BlF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAqBzC;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BtE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,qBAA0B,IA6CtD,SAAS,OAAO,EAAE,SAAS,GAAG,EAAE,MAAM,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAqD5E;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CA4BhE;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAuB1F"}

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;AAi5BD;;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;AAk5BD;;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,6 +1,6 @@
 {
   "name": "@ereo/bundler",
-  "version": "0.2.37",
+  "version": "0.2.39",
   "license": "MIT",
   "author": "Enoch Kujem Abassey",
   "homepage": "https://ereojs.github.io/ereoJS",
@@ -32,8 +32,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ereo/core": "^0.2.37",
-    "@ereo/router": "^0.2.37",
+    "@ereo/core": "^0.2.39",
+    "@ereo/router": "^0.2.39",
     "postcss": "^8.4.35",
     "tailwindcss": "^3.4.1",
     "autoprefixer": "^10.4.17",