@hyperspan/plugin-preact 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/plugin-preact",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Hyperspan Plugin for Preact",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -23,16 +23,17 @@
     "url": "git+https://github.com/vlucas/hyperspan.git"
   },
   "devDependencies": {
-    "@types/bun": "^1.2.11",
-    "prettier": "^3.2.5",
-    "typescript": "^5.0.0"
+    "@types/bun": "^1.3.8",
+    "prettier": "^3.8.1",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@hyperspan/html": "^1.0.0",
-    "@hyperspan/framework": "^1.0.0"
+    "@hyperspan/framework": "^1.0.1"
   },
   "dependencies": {
-    "preact": "^10.26.5",
-    "preact-render-to-string": "^6.1.0"
+    "debug": "^4.4.3",
+    "preact": "^10.28.3",
+    "preact-render-to-string": "^6.6.5"
   }
 }

package/src/index.ts

@@ -4,6 +4,9 @@ import { IS_PROD } from '@hyperspan/framework/server';
 import { join, resolve } from 'node:path';
 import type { Hyperspan as HS } from '@hyperspan/framework';
 import { html } from '@hyperspan/html';
+import debug from 'debug';
+
+const log = debug('hyperspan:plugin-preact');
 
 // External ESM = https://esm.sh/preact@10.26.4/compat
 const PREACT_ISLAND_CACHE = new Map<string, string>();
@@ -12,7 +15,11 @@ const PREACT_ISLAND_CACHE = new Map<string, string>();
  * Build Preact client JS and copy to public folder
  */
 async function copyPreactToPublicFolder(config: HS.Config) {
+  const currentNodeEnv = process.env.NODE_ENV || 'production';
   const sourceFile = resolve(__dirname, './preact-client.ts');
+
+  // Preact client JS is always production mode
+  process.env.NODE_ENV = 'production';
   const result = await Bun.build({
     entrypoints: [sourceFile],
     outdir: join('./', config.publicDir, JS_ISLAND_PUBLIC_PATH),
@@ -21,6 +28,7 @@ async function copyPreactToPublicFolder(config: HS.Config) {
     format: 'esm',
     target: 'browser',
   });
+  process.env.NODE_ENV = currentNodeEnv;
 
   const builtFileName = String(result.outputs[0].path.split('/').reverse()[0]).replace('.js', '');
   const builtFilePath = `${JS_ISLAND_PUBLIC_PATH}/${builtFileName}.js`;
@@ -29,6 +37,7 @@ async function copyPreactToPublicFolder(config: HS.Config) {
   JS_IMPORT_MAP.set('preact/compat', builtFilePath);
   JS_IMPORT_MAP.set('preact/hooks', builtFilePath);
   JS_IMPORT_MAP.set('preact/jsx-runtime', builtFilePath);
+  JS_IMPORT_MAP.set('preact/jsx-dev-runtime', builtFilePath);
 
   if (!JS_IMPORT_MAP.has('react')) {
     JS_IMPORT_MAP.set('react', builtFilePath);
@@ -41,79 +50,88 @@ async function copyPreactToPublicFolder(config: HS.Config) {
  */
 export function preactPlugin(): HS.Plugin {
   return async (config: HS.Config) => {
-    // Ensure Preact can be loaded on the client
-    if (!JS_IMPORT_MAP.has('preact')) {
-      await copyPreactToPublicFolder(config);
-    }
-
-    // Define a Bun plugin to handle .tsx files
-    await Bun.plugin({
-      name: 'Hyperspan Preact Loader',
-      async setup(build) {
-        // when a .tsx file is imported...
-        build.onLoad({ filter: /\.tsx$/ }, async (args) => {
-          const jsId = assetHash(args.path);
-
-          // Cache: Avoid re-processing the same file
-          if (PREACT_ISLAND_CACHE.has(jsId)) {
-            return {
-              contents: PREACT_ISLAND_CACHE.get(jsId) || '',
-              loader: 'js',
-            };
-          }
-
-          // We need to build the file to ensure we can ship it to the client with dependencies
-          // Ironic, right? Calling Bun.build() inside of a plugin that runs on Bun.build()?
-          const result = await Bun.build({
-            entrypoints: [args.path],
-            outdir: join('./', config.publicDir, JS_ISLAND_PUBLIC_PATH),
-            naming: IS_PROD ? '[dir]/[name]-[hash].[ext]' : undefined,
-            external: Array.from(JS_IMPORT_MAP.keys()),
-            minify: true,
-            format: 'esm',
-            target: 'browser',
-            env: 'APP_PUBLIC_*',
-          });
-
-          // Add output file to import map
-          const esmName = String(result.outputs[0].path.split('/').reverse()[0]).replace('.js', '');
-          JS_IMPORT_MAP.set(esmName, `${JS_ISLAND_PUBLIC_PATH}/${esmName}.js`);
-
-          let contents = await result.outputs[0].text();
-
-          // Look for the default export
-          const RE_EXPORT_DEFAULT = /export\{([^\s]+) as default\}/;
-          const RE_EXPORT_DEFAULT_FN = /export default function\s+([^\s]+)/;
-          const RE_EXPORT_DEFAULT_CONST = /export default const\s+([^\s]+)/;
-          const RE_EXPORT_DEFAULT_ANY = /export default\s+([^\s]+)/;
-
-          const exportedDefault = contents.match(RE_EXPORT_DEFAULT);
-          const exportedDefaultFn = contents.match(RE_EXPORT_DEFAULT_FN);
-          const exportedDefaultConst = contents.match(RE_EXPORT_DEFAULT_CONST);
-          const exportedDefaultAny = contents.match(RE_EXPORT_DEFAULT_ANY);
-
-          const componentName =
-            exportedDefault?.[1] ||
-            exportedDefaultFn?.[1] ||
-            exportedDefaultConst?.[1] ||
-            exportedDefaultAny?.[1];
-
-          if (!componentName) {
-            throw new Error(
-              `No default export found in ${args.path}. Did you forget to export a component?`
-            );
-          }
-
-          // Add to contents so this is in the client JS as well
-          contents = `import { h, h as __hs_h, render as __hs_render, hydrate as __hs_hydrate } from 'preact';${contents}`;
-
-          // Some _interesting_ work at play here...
-          // We have to modify the original file contents to add an __HS_PLUGIN export that the renderIsland() function can use to render the component.
-          // A lot of this work actaully has to be done now, ahead of time, to ensure we use the same Preact instance to hydrate and render the component so there are no errors.
-          // So... we have to import the preact-render-to-string library to render the component to a string here, with simple functions to do that work and return HTML.
-          // All imports needed for this work are prefixed with __hs_ to avoid clashing with other imports in the module, as some of them may be duplicates.
-          // Finally, we need to export all of the functions that do this work in a special way so we don't change the default export or other functions in the module, so that only the Hyperspan renderIsland() function can use them.
-          const moduleCode = `// hyperspan:processed
+    try {
+      log('plguin loaded');
+      // Ensure Preact can be loaded on the client
+      if (!JS_IMPORT_MAP.has('preact')) {
+        await copyPreactToPublicFolder(config);
+      }
+
+      // Define a Bun plugin to handle .tsx files
+      await Bun.plugin({
+        name: 'Hyperspan Preact Loader',
+        async setup(build) {
+          // when a .tsx file is imported...
+          build.onLoad({ filter: /\.tsx$/ }, async (args) => {
+            log('tsx file loaded', args.path);
+            const jsId = assetHash(args.path);
+
+            // Cache: Avoid re-processing the same file
+            if (PREACT_ISLAND_CACHE.has(jsId)) {
+              log('tsx file cached', args.path);
+              return {
+                contents: PREACT_ISLAND_CACHE.get(jsId) || '',
+                loader: 'js',
+              };
+            }
+
+            log('tsx file not cached, building...', args.path);
+            // We need to build the file to ensure we can ship it to the client with dependencies
+            // Ironic, right? Calling Bun.build() inside of a plugin that runs on Bun.build()?
+            const result = await Bun.build({
+              entrypoints: [args.path],
+              outdir: join('./', config.publicDir, JS_ISLAND_PUBLIC_PATH),
+              naming: IS_PROD ? '[dir]/[name]-[hash].[ext]' : undefined,
+              external: Array.from(JS_IMPORT_MAP.keys()),
+              minify: true,
+              format: 'esm',
+              target: 'browser',
+              env: 'APP_PUBLIC_*',
+            });
+
+            // Add output file to import map
+            const esmName = String(result.outputs[0].path.split('/').reverse()[0]).replace('.js', '');
+            JS_IMPORT_MAP.set(esmName, `${JS_ISLAND_PUBLIC_PATH}/${esmName}.js`);
+            log('added to import map', esmName, `${JS_ISLAND_PUBLIC_PATH}/${esmName}.js`);
+
+            let contents = await result.outputs[0].text();
+
+            // Look for the default export
+            const RE_EXPORT_DEFAULT = /export\{([^\s]+) as default\}/;
+            const RE_EXPORT_DEFAULT_FN = /export default function\s+([^\s]+)/;
+            const RE_EXPORT_DEFAULT_CONST = /export default const\s+([^\s]+)/;
+            const RE_EXPORT_DEFAULT_ANY = /export default\s+([^\s]+)/;
+
+            const exportedDefault = contents.match(RE_EXPORT_DEFAULT);
+            const exportedDefaultFn = contents.match(RE_EXPORT_DEFAULT_FN);
+            const exportedDefaultConst = contents.match(RE_EXPORT_DEFAULT_CONST);
+            const exportedDefaultAny = contents.match(RE_EXPORT_DEFAULT_ANY);
+
+            const componentName =
+              exportedDefault?.[1] ||
+              exportedDefaultFn?.[1] ||
+              exportedDefaultConst?.[1] ||
+              exportedDefaultAny?.[1];
+
+            if (!componentName) {
+              log('ERROR: no default export found', args.path);
+              throw new Error(
+                `No default export found in ${args.path}. Did you forget to export a component?`
+              );
+            }
+
+            log('component name', componentName);
+
+            // Add to contents so this is in the client JS as well
+            contents = `import { h as __hs_h, render as __hs_render, hydrate as __hs_hydrate } from 'preact';${contents}`;
+
+            // Some _interesting_ work at play here...
+            // We have to modify the original file contents to add an __HS_PLUGIN export that the renderIsland() function can use to render the component.
+            // A lot of this work actaully has to be done now, ahead of time, to ensure we use the same Preact instance to hydrate and render the component so there are no errors.
+            // So... we have to import the preact-render-to-string library to render the component to a string here, with simple functions to do that work and return HTML.
+            // All imports needed for this work are prefixed with __hs_ to avoid clashing with other imports in the module, as some of them may be duplicates.
+            // Finally, we need to export all of the functions that do this work in a special way so we don't change the default export or other functions in the module, so that only the Hyperspan renderIsland() function can use them.
+            const moduleCode = `// hyperspan:processed
 import { render as __hs_renderToString } from 'preact-render-to-string';
 
 // Original file contents
@@ -144,15 +162,21 @@ ${componentName}.__HS_ISLAND = {
 }
 `;
 
-          PREACT_ISLAND_CACHE.set(jsId, moduleCode);
+            PREACT_ISLAND_CACHE.set(jsId, moduleCode);
 
-          return {
-            contents: moduleCode,
-            loader: 'js',
-          };
-        });
-      },
-    });
+            return {
+              contents: moduleCode,
+              loader: 'js',
+            };
+          });
+        },
+      });
+    } catch (e) {
+      log('ERROR: plugin build error', e);
+      console.error('[Hyperspan] @hyperspan/plugin-preact build error');
+      console.error(e);
+      throw e;
+    }
   };
 }
 

package/src/preact-client.ts

@@ -1,3 +1,4 @@
 export * from 'preact/compat';
 export * from 'preact/hooks';
+export * from 'preact/jsx-runtime';
 export { h, render, hydrate } from 'preact';