@rspack/cli 1.5.0-beta.1 → 1.5.0-rc.0

package/dist/index.js

@@ -24,16 +24,6 @@ var __webpack_modules__ = {
             return module;
         });
     },
-    interpret: function(module) {
-        module.exports = import("interpret").then(function(module) {
-            return module;
-        });
-    },
-    rechoir: function(module) {
-        module.exports = import("rechoir").then(function(module) {
-            return module;
-        });
-    },
     "webpack-bundle-analyzer": function(module) {
         module.exports = import("webpack-bundle-analyzer").then(function(module) {
             return module;
@@ -489,6 +479,7 @@ var __webpack_exports__ = {};
             });
         }
     }
+    const external_pirates_namespaceObject = require("pirates");
     const external_node_url_namespaceObject = require("node:url");
     const readPackageUp = (cwd = process.cwd())=>{
         let currentDir = external_node_path_default().resolve(cwd);
@@ -534,29 +525,60 @@ var __webpack_exports__ = {};
     ];
     const findConfig = (basePath)=>DEFAULT_EXTENSIONS.map((ext)=>basePath + ext).find(external_node_fs_default().existsSync);
     const utils_findConfig = findConfig;
+    const TS_EXTENSION = [
+        ".ts",
+        ".cts",
+        ".mts"
+    ];
     const isTsFile_isTsFile = (configPath)=>{
         const ext = external_node_path_default().extname(configPath);
-        return /\.(c|m)?ts$/.test(ext);
+        return TS_EXTENSION.includes(ext);
     };
     const isTsFile = isTsFile_isTsFile;
+    const injectInlineSourceMap = ({ filename, code, map })=>{
+        if (map) {
+            const base64Map = Buffer.from(map, "utf8").toString("base64");
+            const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`;
+            return `${code}\n${sourceMapContent}`;
+        }
+        return code;
+    };
+    function compile(sourcecode, filename) {
+        const { code, map } = core_.experiments.swc.transformSync(sourcecode, {
+            jsc: {
+                parser: {
+                    syntax: "typescript",
+                    tsx: false,
+                    decorators: true,
+                    dynamicImport: true
+                }
+            },
+            filename: filename,
+            module: {
+                type: "commonjs"
+            },
+            sourceMaps: true,
+            isModule: true
+        });
+        return injectInlineSourceMap({
+            filename,
+            code,
+            map
+        });
+    }
     const loadConfig_DEFAULT_CONFIG_NAME = "rspack.config";
-    const registerLoader = async (configPath)=>{
-        const ext = external_node_path_default().extname(configPath);
+    const registerLoader = (configPath)=>{
         if (utils_isEsmFile(configPath) && isTsFile(configPath)) return;
-        const { default: interpret } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "interpret"));
-        const extensions = Object.fromEntries(Object.entries(interpret.extensions).filter(([key])=>key === ext));
-        if (0 === Object.keys(extensions).length) throw new Error(`config file "${configPath}" is not supported.`);
-        try {
-            const { default: rechoir } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "rechoir"));
-            rechoir.prepare(extensions, configPath);
-        } catch (error) {
-            const failures = error?.failures;
-            if (failures) {
-                const messages = failures.map((failure)=>failure.error.message);
-                throw new Error(`${messages.join("\n")}`);
+        if (!isTsFile(configPath)) throw new Error(`config file "${configPath}" is not supported.`);
+        (0, external_pirates_namespaceObject.addHook)((code, filename)=>{
+            try {
+                return compile(code, filename);
+            } catch (err) {
+                throw new Error(`Failed to transform file "${filename}" when loading TypeScript config file:\n ${err instanceof Error ? err.message : String(err)}`);
             }
-            throw error;
-        }
+        }, {
+            exts: TS_EXTENSION
+        });
     };
     const checkIsMultiRspackOptions = (config)=>Array.isArray(config);
     async function loadExtendedConfig(config, configPath, cwd, options) {
@@ -610,7 +632,7 @@ var __webpack_exports__ = {};
                 throw new Error(`Cannot find module '${extendPath}' to extend from.`);
             }
             if (!external_node_fs_default().existsSync(resolvedPath)) throw new Error(`Extended configuration file "${resolvedPath}" not found.`);
-            if (isTsFile(resolvedPath) && "register" === options.configLoader) await registerLoader(resolvedPath);
+            if (isTsFile(resolvedPath) && "register" === options.configLoader) registerLoader(resolvedPath);
             let loadedConfig = await crossImport(resolvedPath, cwd);
             if ("function" == typeof loadedConfig) {
                 loadedConfig = loadedConfig(options.argv?.env, options.argv);
@@ -639,7 +661,7 @@ var __webpack_exports__ = {};
             if (!defaultConfig) return null;
             configPath = defaultConfig;
         }
-        if (isTsFile(configPath) && "register" === options.configLoader) await registerLoader(configPath);
+        if (isTsFile(configPath) && "register" === options.configLoader) registerLoader(configPath);
         const loadedConfig = await crossImport(configPath, cwd);
         return {
             loadedConfig,

package/dist/index.mjs

@@ -5,6 +5,7 @@ import node_util from "node:util";
 import { createColors, isColorSupported } from "colorette";
 import yargs_0 from "yargs";
 import { hideBin } from "yargs/helpers";
+import { addHook } from "pirates";
 import { pathToFileURL } from "node:url";
 var __webpack_modules__ = {
     "@rspack/core": function(module) {
@@ -498,29 +499,60 @@ const DEFAULT_EXTENSIONS = [
 ];
 const findConfig = (basePath)=>DEFAULT_EXTENSIONS.map((ext)=>basePath + ext).find(external_node_fs_["default"].existsSync);
 const utils_findConfig = findConfig;
+const TS_EXTENSION = [
+    ".ts",
+    ".cts",
+    ".mts"
+];
 const isTsFile_isTsFile = (configPath)=>{
     const ext = external_node_path_["default"].extname(configPath);
-    return /\.(c|m)?ts$/.test(ext);
+    return TS_EXTENSION.includes(ext);
 };
 const isTsFile = isTsFile_isTsFile;
+const injectInlineSourceMap = ({ filename, code, map })=>{
+    if (map) {
+        const base64Map = Buffer.from(map, "utf8").toString("base64");
+        const sourceMapContent = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${base64Map}`;
+        return `${code}\n${sourceMapContent}`;
+    }
+    return code;
+};
+function compile(sourcecode, filename) {
+    const { code, map } = core_.experiments.swc.transformSync(sourcecode, {
+        jsc: {
+            parser: {
+                syntax: "typescript",
+                tsx: false,
+                decorators: true,
+                dynamicImport: true
+            }
+        },
+        filename: filename,
+        module: {
+            type: "commonjs"
+        },
+        sourceMaps: true,
+        isModule: true
+    });
+    return injectInlineSourceMap({
+        filename,
+        code,
+        map
+    });
+}
 const loadConfig_DEFAULT_CONFIG_NAME = "rspack.config";
-const registerLoader = async (configPath)=>{
-    const ext = external_node_path_["default"].extname(configPath);
+const registerLoader = (configPath)=>{
     if (utils_isEsmFile(configPath) && isTsFile(configPath)) return;
-    const { default: interpret } = await import("interpret");
-    const extensions = Object.fromEntries(Object.entries(interpret.extensions).filter(([key])=>key === ext));
-    if (0 === Object.keys(extensions).length) throw new Error(`config file "${configPath}" is not supported.`);
-    try {
-        const { default: rechoir } = await import("rechoir");
-        rechoir.prepare(extensions, configPath);
-    } catch (error) {
-        const failures = error?.failures;
-        if (failures) {
-            const messages = failures.map((failure)=>failure.error.message);
-            throw new Error(`${messages.join("\n")}`);
+    if (!isTsFile(configPath)) throw new Error(`config file "${configPath}" is not supported.`);
+    addHook((code, filename)=>{
+        try {
+            return compile(code, filename);
+        } catch (err) {
+            throw new Error(`Failed to transform file "${filename}" when loading TypeScript config file:\n ${err instanceof Error ? err.message : String(err)}`);
         }
-        throw error;
-    }
+    }, {
+        exts: TS_EXTENSION
+    });
 };
 const checkIsMultiRspackOptions = (config)=>Array.isArray(config);
 async function loadExtendedConfig(config, configPath, cwd, options) {
@@ -574,7 +606,7 @@ async function loadExtendedConfig(config, configPath, cwd, options) {
             throw new Error(`Cannot find module '${extendPath}' to extend from.`);
         }
         if (!external_node_fs_["default"].existsSync(resolvedPath)) throw new Error(`Extended configuration file "${resolvedPath}" not found.`);
-        if (isTsFile(resolvedPath) && "register" === options.configLoader) await registerLoader(resolvedPath);
+        if (isTsFile(resolvedPath) && "register" === options.configLoader) registerLoader(resolvedPath);
         let loadedConfig = await crossImport(resolvedPath, cwd);
         if ("function" == typeof loadedConfig) {
             loadedConfig = loadedConfig(options.argv?.env, options.argv);
@@ -603,7 +635,7 @@ async function loadRspackConfig(options, cwd = process.cwd()) {
         if (!defaultConfig) return null;
         configPath = defaultConfig;
     }
-    if (isTsFile(configPath) && "register" === options.configLoader) await registerLoader(configPath);
+    if (isTsFile(configPath) && "register" === options.configLoader) registerLoader(configPath);
     const loadedConfig = await crossImport(configPath, cwd);
     return {
         loadedConfig,

package/dist/utils/isTsFile.d.ts

@@ -1,2 +1,3 @@
+export declare const TS_EXTENSION: string[];
 declare const isTsFile: (configPath: string) => boolean;
 export default isTsFile;

package/dist/utils/loadConfig.d.ts

@@ -1,5 +1,6 @@
 import { type MultiRspackOptions, type RspackOptions } from "@rspack/core";
 import type { RspackCLIOptions } from "../types";
+export declare function compile(sourcecode: string, filename: string): string;
 export type LoadedRspackConfig = undefined | RspackOptions | MultiRspackOptions | ((env: Record<string, any>, argv?: Record<string, any>) => RspackOptions | MultiRspackOptions);
 /**
  * Loads and merges configurations from the 'extends' property

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0-rc.0",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -32,15 +32,12 @@
     "@rspack/dev-server": "~1.1.3",
     "colorette": "2.0.20",
     "exit-hook": "^4.0.0",
-    "interpret": "^3.1.1",
-    "rechoir": "^0.8.0",
     "webpack-bundle-analyzer": "4.10.2",
-    "yargs": "17.7.2"
+    "yargs": "17.7.2",
+    "pirates": "^4.0.7"
   },
   "devDependencies": {
     "@rslib/core": "0.12.1",
-    "@types/interpret": "^1.1.3",
-    "@types/rechoir": "^0.6.4",
     "@types/webpack-bundle-analyzer": "^4.7.0",
     "@types/yargs": "17.0.33",
     "concat-stream": "^2.0.0",
@@ -48,7 +45,7 @@
     "execa": "^5.1.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.2",
-    "@rspack/core": "1.5.0-beta.1"
+    "@rspack/core": "1.5.0-rc.0"
   },
   "peerDependencies": {
     "@rspack/core": "^1.0.0-alpha || ^1.x"