@useavalon/avalon 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@useavalon/avalon",
-	"version": "0.1.6",
+	"version": "0.1.8",
 	"description": "Multi-framework islands architecture for the modern web",
 	"license": "MIT",
 	"type": "module",

package/src/build/prop-extractors/index.ts

@@ -1,15 +1,15 @@
-export { type PropExtractionResult, FALLBACK_PROPS, extractVueProps } from "./vue";
-export { extractSvelteProps } from "./svelte";
-export { extractLitProps } from "./lit";
-export { extractSolidProps } from "./solid";
-export { extractQwikProps } from "./qwik";
+export { type PropExtractionResult, FALLBACK_PROPS, extractVueProps } from "./vue.ts";
+export { extractSvelteProps } from "./svelte.ts";
+export { extractLitProps } from "./lit.ts";
+export { extractSolidProps } from "./solid.ts";
+export { extractQwikProps } from "./qwik.ts";
 
-import type { PropExtractionResult } from "./vue";
-import { extractVueProps } from "./vue";
-import { extractSvelteProps } from "./svelte";
-import { extractLitProps } from "./lit";
-import { extractSolidProps } from "./solid";
-import { extractQwikProps } from "./qwik";
+import type { PropExtractionResult } from "./vue.ts";
+import { extractVueProps } from "./vue.ts";
+import { extractSvelteProps } from "./svelte.ts";
+import { extractLitProps } from "./lit.ts";
+import { extractSolidProps } from "./solid.ts";
+import { extractQwikProps } from "./qwik.ts";
 
 /** Maps framework name to its prop extractor function */
 export const EXTRACTOR_MAP: Record<string, (source: string) => PropExtractionResult> = {

package/src/build/prop-extractors/lit.ts

@@ -1,4 +1,4 @@
-import { FALLBACK_PROPS, type PropExtractionResult } from "./vue";
+import { FALLBACK_PROPS, type PropExtractionResult } from "./vue.ts";
 
 /** Mapping from Lit type constructors to TypeScript type strings */
 const LIT_TYPE_MAP: Record<string, string> = {

package/src/build/prop-extractors/qwik.ts

@@ -1,5 +1,5 @@
-import type { PropExtractionResult } from "./vue";
-import { FALLBACK_PROPS } from "./vue";
+import type { PropExtractionResult } from "./vue.ts";
+import { FALLBACK_PROPS } from "./vue.ts";
 
 /**
  * Extract props type from a Qwik component file.

package/src/build/prop-extractors/solid.ts

@@ -1,4 +1,4 @@
-import { FALLBACK_PROPS, type PropExtractionResult } from "./vue";
+import { FALLBACK_PROPS, type PropExtractionResult } from "./vue.ts";
 
 /**
  * Extract props from a Solid component source string.

package/src/build/prop-extractors/svelte.ts

@@ -1,4 +1,4 @@
-import { FALLBACK_PROPS, type PropExtractionResult } from "./vue";
+import { FALLBACK_PROPS, type PropExtractionResult } from "./vue.ts";
 
 /**
  * Extract props from a Svelte component source string.

package/src/schemas/routing.ts

@@ -362,7 +362,7 @@ export type {
 	ValidRoutePattern,
 	ValidRouteExtension,
 	PageComponentProps,
-} from '../types/routing';
+} from '../types/routing.ts';
 
 export {
 	isValidRouteParams,
@@ -373,4 +373,4 @@ export {
 	createTypedMetadataGenerator,
 	createTypedPageLoader,
 	createTypedApiHandler,
-} from '../types/routing';
+} from '../types/routing.ts';

package/src/vite-plugin/image-optimization.ts

@@ -26,6 +26,8 @@
 
 import type { Plugin } from "vite";
 import type { ResolvedImageConfig } from "./types.ts";
+import { createRequire } from "node:module";
+import { join } from "node:path";
 
 /**
  * Creates the vite-imagetools plugin with Avalon's configuration
@@ -42,8 +44,11 @@ export async function createImagePlugin(
   }
 
   try {
-    // Dynamic import to avoid hard dependency if user disables images
-    const { imagetools } = await import("vite-imagetools");
+    // Dynamic import to avoid hard dependency if user disables images.
+    // Use createRequire from the project root so we resolve the package
+    // from the consuming project's node_modules, not avalon's own context.
+    const require = createRequire(join(process.cwd(), 'package.json'));
+    const { imagetools } = require("vite-imagetools");
 
     if (verbose) {
       console.log("   🖼️  Image optimization enabled");

package/src/vite-plugin/nitro-integration.ts

@@ -43,7 +43,7 @@ function resolveAvalonPackagePath(relativePath: string): string {
  * Resolves the absolute path to a file inside an @useavalon/<name> integration package.
  */
 function resolveIntegrationPackagePath(name: string, relativePath: string): string {
-	const require = createRequire(import.meta.url);
+	const require = createRequire(join(process.cwd(), 'package.json'));
 	const modEntry = require.resolve(`@useavalon/${name}`);
 	const pkgRoot = dirname(modEntry);
 	return join(pkgRoot, relativePath);

package/src/vite-plugin/plugin.ts

@@ -269,14 +269,12 @@ export async function avalon(config?: AvalonPluginConfig): Promise<PluginOption[
   }
 
   // Resolve /@useavalon/*/client virtual imports used by main.js
-  const integrationClientMap: Record<string, string | null> = {};
-  for (const name of ['preact', 'react', 'vue', 'svelte', 'solid', 'lit', 'qwik']) {
-    try {
-      integrationClientMap[`/@useavalon/${name}/client`] = require.resolve(`@useavalon/${name}/client`);
-    } catch {
-      integrationClientMap[`/@useavalon/${name}/client`] = null;
-    }
-  }
+  // These are resolved dynamically in the resolveId hook using Vite's resolver
+  const integrationClientIds = new Set(
+    ['preact', 'react', 'vue', 'svelte', 'solid', 'lit', 'qwik'].map(
+      name => `/@useavalon/${name}/client`
+    )
+  );
 
   // The main Avalon plugin
   const avalonPlugin: Plugin = {
@@ -285,17 +283,13 @@ export async function avalon(config?: AvalonPluginConfig): Promise<PluginOption[
 
     config() {
       // @useavalon packages ship raw .ts source. Mark them as noExternal so
-      // Vite processes them through the transform pipeline. Also exclude them
-      // from Vite's built-in OXC transform (which applies the project's jsx
-      // config and fails on plain .ts files). Our own transform hook below
-      // handles TS stripping for these files instead.
+      // Vite processes them through the transform pipeline (SSR).
+      // For client-side, Vite's built-in OXC plugin handles .ts stripping
+      // and sets moduleType: 'js' automatically.
       return {
         ssr: {
           noExternal: [/^@useavalon\//],
         },
-        oxc: {
-          exclude: [/node_modules\/@useavalon\//],
-        },
       };
     },
 
@@ -309,30 +303,21 @@ export async function avalon(config?: AvalonPluginConfig): Promise<PluginOption[
       checkDirectoriesExist(resolvedConfig, resolvedViteConfig.root);
     },
 
-    resolveId(id: string) {
+    async resolveId(id: string) {
       if (id === "/src/client/main.js" && clientMainResolved) {
         return clientMainResolved;
       }
-      if (id in integrationClientMap && integrationClientMap[id]) {
-        return integrationClientMap[id];
+      // /@useavalon/*/client — resolve through Vite's pipeline so it finds
+      // workspace-linked or npm-installed integration packages from the
+      // consuming project's node_modules, not from avalon's own context.
+      if (integrationClientIds.has(id)) {
+        const packageId = id.slice(1); // strip leading /
+        const resolved = await this.resolve(packageId);
+        return resolved?.id ?? null;
       }
       return null;
     },
 
-    async transform(code: string, id: string) {
-      // Vite 8's OXC transform applies the project's jsx config to ALL .ts files,
-      // including those in node_modules/@useavalon. OXC rejects jsx options for
-      // plain .ts files. Strip TypeScript ourselves for @useavalon packages so
-      // Vite's built-in OXC doesn't need to touch them.
-      if (id.includes('node_modules/@useavalon/') && /\.tsx?$/.test(id)) {
-        const { transform: oxcTransform } = await import('oxc-transform');
-        const result = await oxcTransform(id, code, {
-          typescript: { onlyRemoveTypeImports: false },
-        });
-        return { code: result.code, map: result.map };
-      }
-    },
-
     async buildStart() {
       await runAutoDiscovery(resolvedConfig, viteConfig?.root, activeIntegrations);
       runValidation(resolvedConfig, activeIntegrations);