@anaemia/bundler 0.3.3 → 0.3.5

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,MAAM,cAAc,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAqB1D,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAE,aAAkB,GAAG,OAAO,CAAC,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAoJ1H;AAED,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,MAAM,cAAc,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAqB1D,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAE,aAAkB,GAAG,OAAO,CAAC,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAwI1H;AAED,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -19,9 +19,7 @@ const __dirname = path.dirname(__filename);
 export async function getRspackConfig(appRoot, config = {}) {
     const isDev = process.env.NODE_ENV !== "production";
     const coreRuntimeDir = path.dirname(require.resolve("@anaemia/core/package.json"));
-    const hasSrc = fs.existsSync(path.resolve(coreRuntimeDir, "./src/runtime"));
-    const runtimeDir = hasSrc ? path.resolve(coreRuntimeDir, "./src/runtime") : path.resolve(coreRuntimeDir, "./dist/runtime");
-    const runtimeExt = hasSrc ? "tsx" : "jsx";
+    const runtimeDir = path.resolve(coreRuntimeDir, "./dist/runtime");
     const routes = await scanRoutes(appRoot);
     const serverRoutes = scanServerRoutes(appRoot);
     writeManifest(appRoot, routes);
@@ -47,7 +45,7 @@ export async function getRspackConfig(appRoot, config = {}) {
         devtool: isDev ? "eval-cheap-module-source-map" : false,
         cache: isDev,
         entry: {
-            client: [...(isDev ? [require.resolve("solid-refresh")] : []), path.resolve(runtimeDir, `entry-client.${runtimeExt}`)],
+            client: [...(isDev ? [require.resolve("solid-refresh")] : []), path.resolve(runtimeDir, "entry-client.jsx")],
         },
         output: {
             path: path.resolve(appRoot, "./dist/client"),
@@ -64,8 +62,7 @@ export async function getRspackConfig(appRoot, config = {}) {
             alias: {
                 ...sharedResolve.alias,
                 "solid-refresh": require.resolve("solid-refresh"),
-                [path.resolve(coreRuntimeDir, "./src/runtime/context.ts")]: path.resolve(coreRuntimeDir, "./src/runtime/context.browser.ts"),
-                [path.resolve(coreRuntimeDir, "./dist/runtime/context.js")]: path.resolve(coreRuntimeDir, "./src/runtime/context.browser.ts"),
+                [path.resolve(coreRuntimeDir, "./dist/runtime/context.js")]: path.resolve(coreRuntimeDir, "./dist/runtime/context.browser.js"),
             },
             fallback: { async_hooks: false, "node:async_hooks": false, fs: false, "node:fs": false, path: false, "node:path": false },
         },
@@ -102,11 +99,7 @@ export async function getRspackConfig(appRoot, config = {}) {
                 styleRules.client,
                 {
                     ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
-                    exclude: /[\\/]node_modules[\\/]/,
-                },
-                {
-                    ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
-                    include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
+                    exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
                 },
             ],
         },
@@ -116,7 +109,7 @@ export async function getRspackConfig(appRoot, config = {}) {
         devtool: isDev ? "source-map" : false,
         context: appRoot,
         target: "node",
-        entry: { server: path.resolve(runtimeDir, `entry-server.${runtimeExt}`) },
+        entry: { server: path.resolve(runtimeDir, "entry-server.jsx") },
         output: { path: path.resolve(appRoot, "./dist/server"), filename: "index.js", module: true, chunkFormat: "module", chunkLoading: "import" },
         optimization: { nodeEnv: false },
         resolve: {
@@ -125,8 +118,8 @@ export async function getRspackConfig(appRoot, config = {}) {
             alias: {
                 ...sharedResolve.alias,
                 "solid-refresh": require.resolve("solid-refresh"),
-                "@anaemia/core/config": hasSrc ? path.resolve(coreRuntimeDir, "./src/config.ts") : path.resolve(coreRuntimeDir, "./dist/config.js"),
-                "@anaemia/core": hasSrc ? path.resolve(coreRuntimeDir, "./src/index.ts") : path.resolve(coreRuntimeDir, "./dist/index.js"),
+                "@anaemia/core/config": path.resolve(coreRuntimeDir, "./dist/config.js"),
+                "@anaemia/core": path.resolve(coreRuntimeDir, "./dist/index.js"),
                 __anaemia_user_config__: path.resolve(appRoot, "./anaemia.config.ts"),
                 __anaemia_server_routes__: serverRoutesFile,
             },
@@ -138,11 +131,7 @@ export async function getRspackConfig(appRoot, config = {}) {
                 styleRules.server,
                 {
                     ...createBabelRule({ isServer: true, isDev, plugins: [serverHashInjector, ...extraServerBabelPlugins] }),
-                    exclude: /[\\/]node_modules[\\/]/,
-                },
-                {
-                    ...createBabelRule({ isServer: true, isDev, plugins: [...extraServerBabelPlugins] }),
-                    include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
+                    exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
                 },
             ],
         },

package/dist/router/generate-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-entry.d.ts","sourceRoot":"","sources":["../../src/router/generate-entry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAgHpD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,CA2LzF"}
+{"version":3,"file":"generate-entry.d.ts","sourceRoot":"","sources":["../../src/router/generate-entry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAiHpD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAqMzF"}

package/dist/router/generate-entry.js

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import { transform } from "sucrase";
 function buildTree(routes, strippedLayouts, routeIndices, routesDir, allLayouts, parentPrefix) {
     const nodes = [];
     const leafIndices = strippedLayouts.map((l, i) => (l.length === 0 ? i : -1)).filter((i) => i !== -1);
@@ -83,7 +84,9 @@ function buildPreloadMapString(routes, allLayouts) {
 export function generateRouterEntry(appRoot, routes) {
     const routesDir = path.resolve(appRoot, "./src/routes");
     const outDir = path.resolve(appRoot, "./.anaemia");
-    const outPath = path.resolve(outDir, "./__anaemia_entry__.tsx");
+    const isTs = fs.existsSync(path.resolve(appRoot, "tsconfig.json"));
+    const ext = isTs ? "tsx" : "jsx";
+    const outPath = path.resolve(outDir, `__anaemia_entry__.${ext}`);
     const conventionalRoutes = routes.filter((r) => !r.filePath.endsWith("404.tsx") && !r.filePath.endsWith("500.tsx"));
     const errorRoutes = routes.filter((r) => r.filePath.endsWith("404.tsx") || r.filePath.endsWith("500.tsx"));
     const allLayouts = new Map();
@@ -203,7 +206,7 @@ export async function preloadActiveClientRoute(pathname: string) {
   await Promise.all(preloads);
 }
 `.trim();
-    const code = `
+    const rawCode = `
 // @ts-nocheck
 // auto-generated by anaemia - do not edit!!
 import { lazy } from "solid-js";
@@ -232,9 +235,16 @@ ${finalJsx}
   );
 }
 `.trimStart();
+    const finalCode = isTs
+        ? rawCode
+        : transform(rawCode.replace("// @ts-nocheck\n", ""), {
+            transforms: ["typescript", "jsx"],
+            jsxRuntime: "preserve",
+            production: true,
+        }).code;
     if (!fs.existsSync(outDir)) {
         fs.mkdirSync(outDir, { recursive: true });
     }
-    fs.writeFileSync(outPath, code);
+    fs.writeFileSync(outPath, finalCode);
     return outPath;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anaemia/bundler",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -11,7 +11,7 @@
     }
   },
   "dependencies": {
-    "@anaemia/core": "^0.3.3",
+    "@anaemia/core": "^0.3.5",
     "@babel/core": "^7.29.7",
     "@babel/preset-typescript": "^7.29.7",
     "@rspack/core": "^2.0.5",
@@ -21,7 +21,8 @@
     "jiti": "^2.7.0",
     "sass": "^1.100.0",
     "sass-loader": "^17.0.0",
-    "solid-refresh": "^0.7.8"
+    "solid-refresh": "^0.7.8",
+    "sucrase": "^3.35.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5"

package/src/index.ts

@@ -25,9 +25,7 @@ const __dirname = path.dirname(__filename);
 export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {}): Promise<[Configuration, Configuration]> {
   const isDev = process.env.NODE_ENV !== "production";
   const coreRuntimeDir = path.dirname(require.resolve("@anaemia/core/package.json"));
-  const hasSrc = fs.existsSync(path.resolve(coreRuntimeDir, "./src/runtime"));
-  const runtimeDir = hasSrc ? path.resolve(coreRuntimeDir, "./src/runtime") : path.resolve(coreRuntimeDir, "./dist/runtime");
-  const runtimeExt = hasSrc ? "tsx" : "jsx";
+  const runtimeDir = path.resolve(coreRuntimeDir, "./dist/runtime");
 
   const routes = await scanRoutes(appRoot);
   const serverRoutes = scanServerRoutes(appRoot);
@@ -40,7 +38,6 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
 
   const entryFile = generateRouterEntry(appRoot, routes);
   const serverRoutesFile = generateServerRoutes(appRoot, serverRoutes);
-
   const styleRules = createStyleRules(config);
   const extraClientBabelPlugins = config.plugins?.flatMap((p) => p.babelPlugins?.client ?? []) ?? [];
   const extraServerBabelPlugins = config.plugins?.flatMap((p) => p.babelPlugins?.server ?? []) ?? [];
@@ -59,7 +56,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
     devtool: isDev ? "eval-cheap-module-source-map" : false,
     cache: isDev,
     entry: {
-      client: [...(isDev ? [require.resolve("solid-refresh")] : []), path.resolve(runtimeDir, `entry-client.${runtimeExt}`)],
+      client: [...(isDev ? [require.resolve("solid-refresh")] : []), path.resolve(runtimeDir, "entry-client.jsx")],
     },
     output: {
       path: path.resolve(appRoot, "./dist/client"),
@@ -76,8 +73,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
       alias: {
         ...sharedResolve.alias,
         "solid-refresh": require.resolve("solid-refresh"),
-        [path.resolve(coreRuntimeDir, "./src/runtime/context.ts")]: path.resolve(coreRuntimeDir, "./src/runtime/context.browser.ts"),
-        [path.resolve(coreRuntimeDir, "./dist/runtime/context.js")]: path.resolve(coreRuntimeDir, "./src/runtime/context.browser.ts"),
+        [path.resolve(coreRuntimeDir, "./dist/runtime/context.js")]: path.resolve(coreRuntimeDir, "./dist/runtime/context.browser.js"),
       },
       fallback: { async_hooks: false, "node:async_hooks": false, fs: false, "node:fs": false, path: false, "node:path": false },
     },
@@ -117,11 +113,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
         styleRules.client,
         {
           ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
-          exclude: /[\\/]node_modules[\\/]/,
-        },
-        {
-          ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
-          include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
+          exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
         },
       ],
     },
@@ -132,7 +124,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
     devtool: isDev ? "source-map" : false,
     context: appRoot,
     target: "node",
-    entry: { server: path.resolve(runtimeDir, `entry-server.${runtimeExt}`) },
+    entry: { server: path.resolve(runtimeDir, "entry-server.jsx") },
     output: { path: path.resolve(appRoot, "./dist/server"), filename: "index.js", module: true, chunkFormat: "module", chunkLoading: "import" },
     optimization: { nodeEnv: false },
     resolve: {
@@ -141,8 +133,8 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
       alias: {
         ...sharedResolve.alias,
         "solid-refresh": require.resolve("solid-refresh"),
-        "@anaemia/core/config": hasSrc ? path.resolve(coreRuntimeDir, "./src/config.ts") : path.resolve(coreRuntimeDir, "./dist/config.js"),
-        "@anaemia/core": hasSrc ? path.resolve(coreRuntimeDir, "./src/index.ts") : path.resolve(coreRuntimeDir, "./dist/index.js"),
+        "@anaemia/core/config": path.resolve(coreRuntimeDir, "./dist/config.js"),
+        "@anaemia/core": path.resolve(coreRuntimeDir, "./dist/index.js"),
         __anaemia_user_config__: path.resolve(appRoot, "./anaemia.config.ts"),
         __anaemia_server_routes__: serverRoutesFile,
       },
@@ -154,11 +146,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
         styleRules.server,
         {
           ...createBabelRule({ isServer: true, isDev, plugins: [serverHashInjector, ...extraServerBabelPlugins] }),
-          exclude: /[\\/]node_modules[\\/]/,
-        },
-        {
-          ...createBabelRule({ isServer: true, isDev, plugins: [...extraServerBabelPlugins] }),
-          include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
+          exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
         },
       ],
     },

package/src/router/generate-entry.ts

@@ -1,6 +1,7 @@
 import fs from "fs";
 import path from "path";
 import type { RouteManifestEntry } from "./scan.js";
+import { transform } from "sucrase";
 
 type LayoutNode = {
   kind: "layout";
@@ -89,7 +90,7 @@ function renderTree(nodes: TreeNode[], indent = 6): string {
         if (routePath === "") {
           return `${pad}<Route component={Route${node.routeIdx}Wrapped} />`;
         }
-        
+
         return `${pad}<Route path="${routePath}" component={Route${node.routeIdx}Wrapped} />`;
       }
 
@@ -115,7 +116,9 @@ function buildPreloadMapString(routes: RouteManifestEntry[], allLayouts: Map<str
 export function generateRouterEntry(appRoot: string, routes: RouteManifestEntry[]): string {
   const routesDir = path.resolve(appRoot, "./src/routes");
   const outDir = path.resolve(appRoot, "./.anaemia");
-  const outPath = path.resolve(outDir, "./__anaemia_entry__.tsx");
+  const isTs = fs.existsSync(path.resolve(appRoot, "tsconfig.json"));
+  const ext = isTs ? "tsx" : "jsx";
+  const outPath = path.resolve(outDir, `__anaemia_entry__.${ext}`);
 
   const conventionalRoutes = routes.filter((r) => !r.filePath.endsWith("404.tsx") && !r.filePath.endsWith("500.tsx"));
   const errorRoutes = routes.filter((r) => r.filePath.endsWith("404.tsx") || r.filePath.endsWith("500.tsx"));
@@ -263,7 +266,7 @@ export async function preloadActiveClientRoute(pathname: string) {
 }
 `.trim();
 
-  const code = `
+  const rawCode = `
 // @ts-nocheck
 // auto-generated by anaemia - do not edit!!
 import { lazy } from "solid-js";
@@ -293,10 +296,18 @@ ${finalJsx}
 }
 `.trimStart();
 
+  const finalCode = isTs
+    ? rawCode
+    : transform(rawCode.replace("// @ts-nocheck\n", ""), {
+        transforms: ["typescript", "jsx"],
+        jsxRuntime: "preserve",
+        production: true,
+      }).code;
+
   if (!fs.existsSync(outDir)) {
     fs.mkdirSync(outDir, { recursive: true });
   }
 
-  fs.writeFileSync(outPath, code);
+  fs.writeFileSync(outPath, finalCode);
   return outPath;
 }

package/test/rspack-config.test.mjs

@@ -0,0 +1,109 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import path from "node:path";
+import fs from "node:fs";
+import os from "node:os";
+import { getRspackConfig } from "../dist/index.js";
+
+async function createTmpProject(isTs = true) {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "anaemia-bundler-test-"));
+
+  fs.mkdirSync(path.join(dir, "src/routes"), { recursive: true });
+  fs.writeFileSync(path.join(dir, "src/routes/index.tsx"), `export default function Index() { return <div>hello</div>; }`);
+  fs.writeFileSync(path.join(dir, "index.html"), `<html><body><div anaemia-entry></div></body></html>`);
+
+  if (isTs) {
+    fs.writeFileSync(path.join(dir, "tsconfig.json"), JSON.stringify({ compilerOptions: { strict: true } }));
+  }
+
+  return dir;
+}
+
+test("getRspackConfig returns two configurations", async () => {
+  const dir = await createTmpProject();
+  try {
+    const configs = await getRspackConfig(dir, {});
+    assert.equal(Array.isArray(configs), true);
+    assert.equal(configs.length, 2);
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("client config targets web, server config targets node", async () => {
+  const dir = await createTmpProject();
+  try {
+    const [clientConfig, serverConfig] = await getRspackConfig(dir, {});
+    assert.equal(clientConfig.target, "web");
+    assert.equal(serverConfig.target, "node");
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("runtimeDir always resolves to dist, never src", async () => {
+  const dir = await createTmpProject();
+  try {
+    const [clientConfig, serverConfig] = await getRspackConfig(dir, {});
+    const clientEntry = Object.values(clientConfig.entry).flat().join(" ");
+    const serverEntry = Object.values(serverConfig.entry).flat().join(" ");
+    assert.ok(!clientEntry.includes("/src/runtime"), `client entry points into src: ${clientEntry}`);
+    assert.ok(!serverEntry.includes("/src/runtime"), `server entry points into src: ${serverEntry}`);
+    assert.ok(clientEntry.includes("/dist/runtime"), `client entry should point to dist: ${clientEntry}`);
+    assert.ok(serverEntry.includes("/dist/runtime"), `server entry should point to dist: ${serverEntry}`);
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("generated entry is .tsx for TypeScript projects", async () => {
+  const dir = await createTmpProject(true);
+  try {
+    await getRspackConfig(dir, {});
+    const entryFile = path.join(dir, ".anaemia/__anaemia_entry__.tsx");
+    assert.ok(fs.existsSync(entryFile), "expected .tsx entry file");
+    assert.ok(!fs.existsSync(path.join(dir, ".anaemia/__anaemia_entry__.jsx")), "unexpected .jsx entry file");
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("generated entry is .jsx for JavaScript projects", async () => {
+  const dir = await createTmpProject(false);
+  try {
+    await getRspackConfig(dir, {});
+    const entryFile = path.join(dir, ".anaemia/__anaemia_entry__.jsx");
+    assert.ok(fs.existsSync(entryFile), "expected .jsx entry file");
+    assert.ok(!fs.existsSync(path.join(dir, ".anaemia/__anaemia_entry__.tsx")), "unexpected .tsx entry file");
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("generated JS entry has no TypeScript syntax", async () => {
+  const dir = await createTmpProject(false);
+  try {
+    await getRspackConfig(dir, {});
+    const content = fs.readFileSync(path.join(dir, ".anaemia/__anaemia_entry__.jsx"), "utf-8");
+    assert.ok(!content.includes(": string"), "found TypeScript type annotation in JS entry");
+    assert.ok(!content.includes("// @ts-nocheck"), "found @ts-nocheck in JS entry");
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("server config aliases point to dist not src", async () => {
+  const dir = await createTmpProject();
+  try {
+    const [, serverConfig] = await getRspackConfig(dir, {});
+    const aliases = serverConfig.resolve?.alias ?? {};
+    for (const [key, val] of Object.entries(aliases)) {
+      if (typeof val === "string" && val.includes("@anaemia/core")) {
+        assert.ok(!val.includes("/src/"), `alias ${key} points to src: ${val}`);
+        assert.ok(val.includes("/dist/"), `alias ${key} should point to dist: ${val}`);
+      }
+    }
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});