honox 0.1.13 → 0.1.15

package/dist/vite/island-components.js

@@ -151,25 +151,44 @@ const transformJsxTags = (contents, componentName) => {
     return code;
   }
 };
+function getIslandComponentName(root, id, options) {
+  const defaultIsIsland = (id2) => {
+    const islandDirectoryPath = path.join(root, "app");
+    return path.resolve(id2).startsWith(islandDirectoryPath);
+  };
+  const matchIslandPath = options?.isIsland ?? defaultIsIsland;
+  if (!matchIslandPath(id)) {
+    return null;
+  }
+  const match = id.match(/(\/islands\/.+?\.tsx$)|(\/routes\/.*\_[a-zA-Z0-9[-]+\.island\.tsx$)/);
+  if (!match) {
+    return null;
+  }
+  return match[0];
+}
 function islandComponents(options) {
+  const insideIslandSuffix = "?inside-island";
   let root = "";
   return {
     name: "transform-island-components",
+    enforce: "pre",
     configResolved: (config) => {
       root = config.root;
     },
+    async resolveId(source, importer) {
+      const resolution = await this.resolve(source, importer);
+      if (resolution && importer && getIslandComponentName(root, importer, options)) {
+        if (getIslandComponentName(root, resolution.id, options)) {
+          return resolution.id + insideIslandSuffix;
+        }
+      }
+    },
     async load(id) {
-      const defaultIsIsland = (id2) => {
-        const islandDirectoryPath = path.join(root, "app");
-        return path.resolve(id2).startsWith(islandDirectoryPath);
-      };
-      const matchIslandPath = options?.isIsland ?? defaultIsIsland;
-      if (!matchIslandPath(id)) {
+      if (id.endsWith(insideIslandSuffix)) {
         return;
       }
-      const match = id.match(/(\/islands\/.+?\.tsx$)|(\/routes\/.*\_[a-zA-Z0-9[-]+\.island\.tsx$)/);
-      if (match) {
-        const componentName = match[0];
+      const componentName = getIslandComponentName(root, id, options);
+      if (componentName) {
         const contents = await fs.readFile(id, "utf-8");
         const code = transformJsxTags(contents, componentName);
         if (code) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "honox",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {