@anaemia/bundler 0.1.2 → 0.1.3

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,CA8I1H;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,CAmJ1H;AAED,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -19,6 +19,9 @@ 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 routes = await scanRoutes(appRoot);
     const serverRoutes = scanServerRoutes(appRoot);
     writeManifest(appRoot, routes);
@@ -44,7 +47,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(coreRuntimeDir, "./src/runtime/entry-client.tsx")],
+            client: [...(isDev ? [require.resolve("solid-refresh")] : []), path.resolve(runtimeDir, `entry-client.${runtimeExt}`)],
         },
         output: {
             path: path.resolve(appRoot, "./dist/client"),
@@ -82,7 +85,9 @@ export async function getRspackConfig(appRoot, config = {}) {
                 __ANAEMIA_RUNTIME_CONFIG__: JSON.stringify({ port: config.port, assets: config.assets, styles: config.styles }),
                 ...config.define?.client,
             }),
-            new rspack.NormalModuleReplacementPlugin(/^node:/, (resource) => { resource.request = resource.request.replace(/^node:/, ""); }),
+            new rspack.NormalModuleReplacementPlugin(/^node:/, (resource) => {
+                resource.request = resource.request.replace(/^node:/, "");
+            }),
             new rspack.NormalModuleReplacementPlugin(/\.server\.(ts|tsx|js|jsx)$/, (() => {
                 const srcPath = path.resolve(__dirname, "./runtime/empty-module.cjs");
                 if (fs.existsSync(srcPath))
@@ -102,7 +107,7 @@ export async function getRspackConfig(appRoot, config = {}) {
                 {
                     ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
                     include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
-                }
+                },
             ],
         },
     };
@@ -110,7 +115,7 @@ export async function getRspackConfig(appRoot, config = {}) {
         name: "server",
         context: appRoot,
         target: "node",
-        entry: { server: path.resolve(coreRuntimeDir, "./src/runtime/entry-server.tsx") },
+        entry: { server: path.resolve(runtimeDir, `entry-server.${runtimeExt}`) },
         output: { path: path.resolve(appRoot, "./dist/server"), filename: "index.js", module: true, chunkFormat: "module", chunkLoading: "import" },
         optimization: { nodeEnv: false },
         resolve: {
@@ -119,8 +124,8 @@ export async function getRspackConfig(appRoot, config = {}) {
             alias: {
                 ...sharedResolve.alias,
                 "solid-refresh": require.resolve("solid-refresh"),
-                "@anaemia/core/config": path.resolve(coreRuntimeDir, "./src/config.ts"),
-                "@anaemia/core": path.resolve(coreRuntimeDir, "./src/index.ts"),
+                "@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_user_config__: path.resolve(appRoot, "./anaemia.config.ts"),
                 __anaemia_server_routes__: serverRoutesFile,
             },
@@ -137,7 +142,7 @@ export async function getRspackConfig(appRoot, config = {}) {
                 {
                     ...createBabelRule({ isServer: true, isDev, plugins: [...extraServerBabelPlugins] }),
                     include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
-                }
+                },
             ],
         },
     };

package/dist/router/manifest.d.ts

@@ -1,12 +1,3 @@
 import type { RouteManifestEntry } from "./scan.js";
-export interface BuildManifest {
-    routes: RouteManifestEntry[];
-    chunks: Record<string, {
-        js: string;
-        css?: string;
-    }>;
-    errors: Record<string, string>;
-    buildTime: string;
-}
 export declare function writeManifest(appRoot: string, routes: RouteManifestEntry[]): void;
 //# sourceMappingURL=manifest.d.ts.map

package/dist/router/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/router/manifest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAE7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAI,CA6BjF"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/router/manifest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAUpD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAI,CA6BjF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anaemia/bundler",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",

package/src/index.ts

@@ -25,6 +25,9 @@ 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 routes = await scanRoutes(appRoot);
   const serverRoutes = scanServerRoutes(appRoot);
@@ -56,7 +59,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(coreRuntimeDir, "./src/runtime/entry-client.tsx")],
+      client: [...(isDev ? [require.resolve("solid-refresh")] : []), path.resolve(runtimeDir, `entry-client.${runtimeExt}`)],
     },
     output: {
       path: path.resolve(appRoot, "./dist/client"),
@@ -94,13 +97,15 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
         __ANAEMIA_RUNTIME_CONFIG__: JSON.stringify({ port: config.port, assets: config.assets, styles: config.styles }),
         ...config.define?.client,
       }),
-      new rspack.NormalModuleReplacementPlugin(/^node:/, (resource) => { resource.request = resource.request.replace(/^node:/, ""); }),
+      new rspack.NormalModuleReplacementPlugin(/^node:/, (resource) => {
+        resource.request = resource.request.replace(/^node:/, "");
+      }),
       new rspack.NormalModuleReplacementPlugin(
         /\.server\.(ts|tsx|js|jsx)$/,
         (() => {
           const srcPath = path.resolve(__dirname, "./runtime/empty-module.cjs");
           if (fs.existsSync(srcPath)) return srcPath;
-          
+
           return path.resolve(__dirname, "../src/runtime/empty-module.cjs");
         })()
       ),
@@ -117,7 +122,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
         {
           ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
           include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
-        }
+        },
       ],
     },
   };
@@ -126,7 +131,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
     name: "server",
     context: appRoot,
     target: "node",
-    entry: { server: path.resolve(coreRuntimeDir, "./src/runtime/entry-server.tsx") },
+    entry: { server: path.resolve(runtimeDir, `entry-server.${runtimeExt}`) },
     output: { path: path.resolve(appRoot, "./dist/server"), filename: "index.js", module: true, chunkFormat: "module", chunkLoading: "import" },
     optimization: { nodeEnv: false },
     resolve: {
@@ -135,8 +140,8 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
       alias: {
         ...sharedResolve.alias,
         "solid-refresh": require.resolve("solid-refresh"),
-        "@anaemia/core/config": path.resolve(coreRuntimeDir, "./src/config.ts"),
-        "@anaemia/core": path.resolve(coreRuntimeDir, "./src/index.ts"),
+        "@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_user_config__: path.resolve(appRoot, "./anaemia.config.ts"),
         __anaemia_server_routes__: serverRoutesFile,
       },
@@ -153,7 +158,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
         {
           ...createBabelRule({ isServer: true, isDev, plugins: [...extraServerBabelPlugins] }),
           include: /[\\/]node_modules[\\/]@solidjs[\\/]router/,
-        }
+        },
       ],
     },
   };

package/src/router/manifest.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import type { RouteManifestEntry } from "./scan.js";
 
-export interface BuildManifest {
+interface BuildManifest {
   routes: RouteManifestEntry[];
   // filled in after rspack build - maps chunkName to hashed filename
   chunks: Record<string, { js: string; css?: string }>;