@anaemia/bundler 0.3.5 → 0.3.7

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

package/dist/index.js

@@ -18,6 +18,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 export async function getRspackConfig(appRoot, config = {}) {
     const isDev = process.env.NODE_ENV !== "production";
+    const rawEnv = process.env;
     const coreRuntimeDir = path.dirname(require.resolve("@anaemia/core/package.json"));
     const runtimeDir = path.resolve(coreRuntimeDir, "./dist/runtime");
     const routes = await scanRoutes(appRoot);
@@ -33,6 +34,25 @@ export async function getRspackConfig(appRoot, config = {}) {
     const extraClientBabelPlugins = config.plugins?.flatMap((p) => p.babelPlugins?.client ?? []) ?? [];
     const extraServerBabelPlugins = config.plugins?.flatMap((p) => p.babelPlugins?.server ?? []) ?? [];
     const solidRefreshPlugin = [require.resolve("solid-refresh/babel"), { bundler: "rspack-esm", jsx: false }];
+    // env processing
+    const serverEnv = {
+        MODE: JSON.stringify(process.env.NODE_ENV || "development"),
+        DEV: JSON.stringify(isDev),
+        PROD: JSON.stringify(!isDev),
+    };
+    for (const key in rawEnv) {
+        serverEnv[key] = JSON.stringify(rawEnv[key]);
+    }
+    const clientEnv = {
+        MODE: JSON.stringify(process.env.NODE_ENV || "development"),
+        DEV: JSON.stringify(isDev),
+        PROD: JSON.stringify(!isDev),
+    };
+    for (const key in rawEnv) {
+        if (key.startsWith("PUBLIC_")) {
+            clientEnv[key] = JSON.stringify(rawEnv[key]);
+        }
+    }
     const sharedResolve = {
         extensions: [".tsx", ".ts", ".jsx", ".js", ".json", ".scss", ".css"],
         extensionAlias: { ".js": [".ts", ".js"], ".jsx": [".tsx", ".jsx"] },
@@ -81,6 +101,7 @@ export async function getRspackConfig(appRoot, config = {}) {
             new rspack.DefinePlugin({
                 __ANAEMIA_RUNTIME_CONFIG__: JSON.stringify({ port: config.port, assets: config.assets, styles: config.styles }),
                 ...config.define?.client,
+                "import.meta.env": clientEnv,
             }),
             new rspack.NormalModuleReplacementPlugin(/^node:/, (resource) => {
                 resource.request = resource.request.replace(/^node:/, "");
@@ -99,7 +120,13 @@ export async function getRspackConfig(appRoot, config = {}) {
                 styleRules.client,
                 {
                     ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
-                    exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
+                    exclude: (modulePath) => {
+                        if (modulePath.includes("@anaemia") && modulePath.includes("core"))
+                            return false;
+                        if (modulePath.includes("@solidjs") && modulePath.includes("router"))
+                            return false;
+                        return modulePath.includes("node_modules");
+                    },
                 },
             ],
         },
@@ -124,14 +151,20 @@ export async function getRspackConfig(appRoot, config = {}) {
                 __anaemia_server_routes__: serverRoutesFile,
             },
         },
-        plugins: [new rspack.DefinePlugin({ ...config.define?.server })],
+        plugins: [new rspack.DefinePlugin({ ...config.define?.server, "import.meta.env": serverEnv })],
         module: {
             parser: { "css/auto": { namedExports: false } },
             rules: [
                 styleRules.server,
                 {
                     ...createBabelRule({ isServer: true, isDev, plugins: [serverHashInjector, ...extraServerBabelPlugins] }),
-                    exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
+                    exclude: (modulePath) => {
+                        if (modulePath.includes("@anaemia") && modulePath.includes("core"))
+                            return false;
+                        if (modulePath.includes("@solidjs") && modulePath.includes("router"))
+                            return false;
+                        return modulePath.includes("node_modules");
+                    },
                 },
             ],
         },

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

@@ -1 +1 @@
-{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../src/router/scan.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAC;AAExD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;AAezD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAYpE;AAUD,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiE/E"}
+{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../src/router/scan.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAC;AAExD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;AAezD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAkBpE;AAUD,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiE/E"}

package/dist/router/scan.js

@@ -14,10 +14,13 @@ const CATCH_ALL_FILE = /^\[\.\.\.(.+?)\]\.(tsx|jsx)$/;
 const DYNAMIC_SEGMENT = /^\[(.+?)\]\.(tsx|jsx)$/;
 export function scanServerRoutes(appRoot) {
     const routesDir = path.resolve(appRoot, "./src/routes");
-    const files = glob.sync("**/_route.{ts,tsx}", { cwd: routesDir, posix: true });
+    const files = glob.sync("**/_route.{ts,tsx,js,jsx}", { cwd: routesDir, posix: true });
     return files.map((file) => {
         const dir = path.dirname(file);
-        const urlPattern = dir === "." ? "/" : `/${dir}`;
+        const normalizedDir = dir
+            .replace(/\[\.\.\.(.+?)\]/g, "*")
+            .replace(/\[(.+?)\]/g, ":$1");
+        const urlPattern = normalizedDir === "." ? "/" : `/${normalizedDir}`;
         return {
             urlPattern,
             filePath: path.resolve(routesDir, file),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anaemia/bundler",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -11,7 +11,7 @@
     }
   },
   "dependencies": {
-    "@anaemia/core": "^0.3.5",
+    "@anaemia/core": "^0.3.7",
     "@babel/core": "^7.29.7",
     "@babel/preset-typescript": "^7.29.7",
     "@rspack/core": "^2.0.5",

package/src/index.ts

@@ -24,6 +24,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 rawEnv = process.env;
   const coreRuntimeDir = path.dirname(require.resolve("@anaemia/core/package.json"));
   const runtimeDir = path.resolve(coreRuntimeDir, "./dist/runtime");
 
@@ -43,6 +44,27 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
   const extraServerBabelPlugins = config.plugins?.flatMap((p) => p.babelPlugins?.server ?? []) ?? [];
   const solidRefreshPlugin = [require.resolve("solid-refresh/babel"), { bundler: "rspack-esm", jsx: false }];
 
+  // env processing
+  const serverEnv: Record<string, string> = {
+    MODE: JSON.stringify(process.env.NODE_ENV || "development"),
+    DEV: JSON.stringify(isDev),
+    PROD: JSON.stringify(!isDev),
+  };
+  for (const key in rawEnv) {
+    serverEnv[key] = JSON.stringify(rawEnv[key]);
+  }
+
+  const clientEnv: Record<string, string> = {
+    MODE: JSON.stringify(process.env.NODE_ENV || "development"),
+    DEV: JSON.stringify(isDev),
+    PROD: JSON.stringify(!isDev),
+  };
+  for (const key in rawEnv) {
+    if (key.startsWith("PUBLIC_")) {
+      clientEnv[key] = JSON.stringify(rawEnv[key]);
+    }
+  }
+
   const sharedResolve = {
     extensions: [".tsx", ".ts", ".jsx", ".js", ".json", ".scss", ".css"],
     extensionAlias: { ".js": [".ts", ".js"], ".jsx": [".tsx", ".jsx"] },
@@ -92,6 +114,7 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
       new rspack.DefinePlugin({
         __ANAEMIA_RUNTIME_CONFIG__: JSON.stringify({ port: config.port, assets: config.assets, styles: config.styles }),
         ...config.define?.client,
+        "import.meta.env": clientEnv,
       }),
       new rspack.NormalModuleReplacementPlugin(/^node:/, (resource) => {
         resource.request = resource.request.replace(/^node:/, "");
@@ -113,7 +136,11 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
         styleRules.client,
         {
           ...createBabelRule({ isServer: false, isDev, plugins: [clientServerFnTransform, ...(isDev ? [solidRefreshPlugin] : []), ...extraClientBabelPlugins] }),
-          exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
+          exclude: (modulePath: string) => {
+            if (modulePath.includes("@anaemia") && modulePath.includes("core")) return false;
+            if (modulePath.includes("@solidjs") && modulePath.includes("router")) return false;
+            return modulePath.includes("node_modules");
+          },
         },
       ],
     },
@@ -139,14 +166,18 @@ export async function getRspackConfig(appRoot: string, config: AnaemiaConfig = {
         __anaemia_server_routes__: serverRoutesFile,
       },
     },
-    plugins: [new rspack.DefinePlugin({ ...config.define?.server })],
+    plugins: [new rspack.DefinePlugin({ ...config.define?.server, "import.meta.env": serverEnv })],
     module: {
       parser: { "css/auto": { namedExports: false } },
       rules: [
         styleRules.server,
         {
           ...createBabelRule({ isServer: true, isDev, plugins: [serverHashInjector, ...extraServerBabelPlugins] }),
-          exclude: /[\\/]node_modules[\\/](?!@anaemia[\\/]core|@solidjs[\\/]router)/,
+          exclude: (modulePath: string) => {
+            if (modulePath.includes("@anaemia") && modulePath.includes("core")) return false;
+            if (modulePath.includes("@solidjs") && modulePath.includes("router")) return false;
+            return modulePath.includes("node_modules");
+          },
         },
       ],
     },

package/src/router/scan.ts

@@ -50,11 +50,17 @@ const DYNAMIC_SEGMENT = /^\[(.+?)\]\.(tsx|jsx)$/;
 
 export function scanServerRoutes(appRoot: string): ServerRouteEntry[] {
   const routesDir = path.resolve(appRoot, "./src/routes");
-  const files = glob.sync("**/_route.{ts,tsx}", { cwd: routesDir, posix: true });
-
+  const files = glob.sync("**/_route.{ts,tsx,js,jsx}", { cwd: routesDir, posix: true });
+  
   return files.map((file) => {
     const dir = path.dirname(file);
-    const urlPattern = dir === "." ? "/" : `/${dir}`;
+    
+    const normalizedDir = dir
+      .replace(/\[\.\.\.(.+?)\]/g, "*")
+      .replace(/\[(.+?)\]/g, ":$1");
+
+    const urlPattern = normalizedDir === "." ? "/" : `/${normalizedDir}`;
+    
     return {
       urlPattern,
       filePath: path.resolve(routesDir, file),