@rspack/cli 2.0.0-rc.1 → 2.0.0-rc.2

package/dist/{697.js → 162.js}

@@ -72,17 +72,10 @@ var __webpack_require__temp = __webpack_require__;
         });
     };
 })();
-(()=>{
-    __webpack_require__.nmd = (module)=>{
-        module.paths = [];
-        if (!module.children) module.children = [];
-        return module;
-    };
-})();
 (()=>{
     var installedChunks = {
-        410: 0,
-        697: 0
+        162: 0,
+        410: 0
     };
     var installChunk = (data)=>{
         var __rspack_esm_ids = data.__rspack_esm_ids;
@@ -100,77 +93,8 @@ var __webpack_require__temp = __webpack_require__;
     __webpack_require__.C = installChunk;
 })();
 __webpack_require__.add({
-    "../../node_modules/.pnpm/pirates@4.0.7/node_modules/pirates/lib/index.js" (module, exports, __webpack_require__) {
-        module = __webpack_require__.nmd(module);
-        const BuiltinModule = __webpack_require__("module");
-        const path = __webpack_require__("path");
-        const nodeModulesRegex = /^(?:.*[\\/])?node_modules(?:[\\/].*)?$/;
-        const Module = module.constructor.length > 1 ? module.constructor : BuiltinModule;
-        const HOOK_RETURNED_NOTHING_ERROR_MESSAGE = "[Pirates] A hook returned a non-string, or nothing at all! This is a violation of intergalactic law!\n--------------------\nIf you have no idea what this means or what Pirates is, let me explain: Pirates is a module that makes it easy to implement require hooks. One of the require hooks you're using uses it. One of these require hooks didn't return anything from it's handler, so we don't know what to do. You might want to debug this.";
-        function shouldCompile(filename, exts, matcher, ignoreNodeModules) {
-            if ('string' != typeof filename) return false;
-            if (-1 === exts.indexOf(path.extname(filename))) return false;
-            const resolvedFilename = path.resolve(filename);
-            if (ignoreNodeModules && nodeModulesRegex.test(resolvedFilename)) return false;
-            if (matcher && 'function' == typeof matcher) return !!matcher(resolvedFilename);
-            return true;
-        }
-        function addHook(hook, opts = {}) {
-            let reverted = false;
-            const loaders = [];
-            const oldLoaders = [];
-            let exts;
-            const originalJSLoader = Module._extensions['.js'];
-            const matcher = opts.matcher || null;
-            const ignoreNodeModules = false !== opts.ignoreNodeModules;
-            exts = opts.extensions || opts.exts || opts.extension || opts.ext || [
-                '.js'
-            ];
-            if (!Array.isArray(exts)) exts = [
-                exts
-            ];
-            exts.forEach((ext)=>{
-                if ('string' != typeof ext) throw new TypeError(`Invalid Extension: ${ext}`);
-                const oldLoader = Module._extensions[ext] || originalJSLoader;
-                oldLoaders[ext] = Module._extensions[ext];
-                loaders[ext] = Module._extensions[ext] = function(mod, filename) {
-                    let compile;
-                    if (!reverted) {
-                        if (shouldCompile(filename, exts, matcher, ignoreNodeModules)) {
-                            compile = mod._compile;
-                            mod._compile = function(code) {
-                                mod._compile = compile;
-                                const newCode = hook(code, filename);
-                                if ('string' != typeof newCode) throw new Error(HOOK_RETURNED_NOTHING_ERROR_MESSAGE);
-                                return mod._compile(newCode, filename);
-                            };
-                        }
-                    }
-                    oldLoader(mod, filename);
-                };
-            });
-            return function() {
-                if (reverted) return;
-                reverted = true;
-                exts.forEach((ext)=>{
-                    if (Module._extensions[ext] === loaders[ext]) if (oldLoaders[ext]) Module._extensions[ext] = oldLoaders[ext];
-                    else delete Module._extensions[ext];
-                });
-            };
-        }
-        exports.addHook = addHook;
-    },
-    module (module) {
-        module.exports = __rspack_createRequire_require("module");
-    },
-    path (module) {
-        module.exports = __rspack_createRequire_require("path");
-    },
     stream (module) {
         module.exports = __rspack_createRequire_require("stream");
-    },
-    util (module) {
-        module.exports = __rspack_createRequire_require("util");
     }
 });
 function toArr(any) {
@@ -725,8 +649,8 @@ const commonOptions = (command)=>command.option('-c, --config <path>', 'config f
             String
         ],
         default: []
-    }).option('--config-loader <loader>', 'Specify the loader to load the config file, can be `native` or `register`.', {
-        default: 'register'
+    }).option('--config-loader <loader>', 'Specify the loader to load the config file, can be `auto`, `jiti` or `native`.', {
+        default: 'auto'
     }).option('--env <env>', 'env passed to config function', {
         type: [
             String
@@ -899,6 +823,7 @@ async function getPreviewConfig(item, options, dir) {
                 directory: dir ? node_path.join(item.context ?? process.cwd(), dir) : item.output?.path ?? node_path.join(item.context ?? process.cwd(), DEFAULT_ROOT),
                 publicPath: options.publicPath ?? '/'
             },
+            hot: false,
             port: options.port ?? 8080,
             proxy: devServer?.proxy,
             host: options.host ?? devServer?.host,
@@ -1014,105 +939,83 @@ class ServeCommand {
         }));
     }
 }
-const readPackageUp = (cwd = process.cwd())=>{
-    let currentDir = node_path.resolve(cwd);
-    let packageJsonPath = node_path.join(currentDir, 'package.json');
-    while(!node_fs.existsSync(packageJsonPath)){
-        const parentDir = node_path.dirname(currentDir);
-        if (parentDir === currentDir) return null;
-        currentDir = parentDir;
-        packageJsonPath = node_path.join(currentDir, 'package.json');
-    }
-    try {
-        return JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf8'));
-    } catch  {
-        return null;
-    }
-};
-const utils_readPackageUp = readPackageUp;
-const isEsmFile = (filePath)=>{
-    if (/\.(mjs|mts)$/.test(filePath)) return true;
-    if (/\.(cjs|cts)$/.test(filePath)) return false;
-    const packageJson = utils_readPackageUp(node_path.dirname(filePath));
-    return packageJson?.type === 'module';
-};
-const crossImport_require = createRequire(import.meta.url);
-const crossImport = async (path)=>{
-    if (isEsmFile(path)) {
-        const url = pathToFileURL(path).href;
-        const { default: config } = await import(url);
-        return config;
-    }
-    let result = crossImport_require(path);
-    if (result && 'object' == typeof result && 'default' in result) result = result.default || {};
-    return result;
-};
 const DEFAULT_EXTENSIONS = [
-    '.js',
     '.ts',
-    '.mjs',
+    '.js',
     '.mts',
-    '.cjs',
-    '.cts'
+    '.mjs',
+    '.cts',
+    '.cjs'
 ];
 const findConfig = (basePath)=>DEFAULT_EXTENSIONS.map((ext)=>basePath + ext).find(node_fs.existsSync);
 const utils_findConfig = findConfig;
-const TS_EXTENSION = [
-    '.ts',
-    '.cts',
-    '.mts'
+const loadConfig_require = createRequire(import.meta.url);
+const loadConfig_DEFAULT_CONFIG_NAME = 'rspack.config';
+const JS_CONFIG_EXTENSION_REGEXP = /\.(?:js|mjs|cjs)$/;
+const CONFIG_LOADER_VALUES = [
+    'auto',
+    'jiti',
+    'native'
 ];
-const isTsFile = (configPath)=>{
-    const ext = node_path.extname(configPath);
-    return TS_EXTENSION.includes(ext);
+const PREBUNDLED_JITI_PATH = new URL('../compiled/jiti/index.js', import.meta.url).href;
+const supportsNativeTypeScript = ()=>{
+    const features = process.features;
+    return Boolean(features.typescript || process.versions.bun || process.versions.deno);
 };
-const utils_isTsFile = isTsFile;
-const lib = __webpack_require__("../../node_modules/.pnpm/pirates@4.0.7/node_modules/pirates/lib/index.js");
-const loadConfig_require = createRequire(import.meta.url);
-const injectInlineSourceMap = ({ 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;
+const normalizeConfigLoader = (configLoader)=>{
+    const normalizedLoader = configLoader ?? 'auto';
+    if (CONFIG_LOADER_VALUES.includes(normalizedLoader)) return normalizedLoader;
+    throw new Error(`config loader "${normalizedLoader}" is not supported. Expected one of: ${CONFIG_LOADER_VALUES.join(', ')}.`);
 };
-function compile(sourcecode, filename) {
-    const { code, map } = rspack.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({
-        code,
-        map
+const resolveDefaultExport = (result)=>result && 'object' == typeof result && 'default' in result ? result.default : result;
+const loadConfigWithNativeLoader = async (configPath)=>{
+    const configFileURL = pathToFileURL(configPath).href;
+    const loadedModule = await import(`${configFileURL}?t=${Date.now()}`);
+    return resolveDefaultExport(loadedModule);
+};
+let jitiInstancePromise;
+const getJiti = async ()=>{
+    if (!jitiInstancePromise) jitiInstancePromise = import(PREBUNDLED_JITI_PATH).then((module)=>{
+        const createJiti = 'createJiti' in module ? module.createJiti : module.default;
+        return createJiti(import.meta.filename, {
+            moduleCache: false,
+            interopDefault: true,
+            nativeModules: [
+                "typescript"
+            ]
+        });
     });
-}
-const loadConfig_DEFAULT_CONFIG_NAME = 'rspack.config';
-const registerLoader = (configPath)=>{
-    if (isEsmFile(configPath) && utils_isTsFile(configPath)) return;
-    if (!utils_isTsFile(configPath)) throw new Error(`config file "${configPath}" is not supported.`);
-    (0, lib.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)}`);
-        }
-    }, {
-        exts: TS_EXTENSION
+    return jitiInstancePromise;
+};
+const loadConfigWithJiti = async (configPath)=>{
+    const jiti = await getJiti();
+    return jiti.import(configPath, {
+        default: true
     });
 };
+const loadConfigByPath = async (configPath, options)=>{
+    const configLoader = normalizeConfigLoader(options.configLoader);
+    const useNative = Boolean('native' === configLoader || 'auto' === configLoader && supportsNativeTypeScript());
+    if (useNative || JS_CONFIG_EXTENSION_REGEXP.test(configPath)) try {
+        return await loadConfigWithNativeLoader(configPath);
+    } catch (error) {
+        if ('native' === configLoader) throw error;
+    }
+    return loadConfigWithJiti(configPath);
+};
+const isConfigObject = (value)=>Boolean(value) && 'object' == typeof value && !Array.isArray(value);
+const isRspackConfig = (value)=>Array.isArray(value) || isConfigObject(value);
+const resolveRspackConfigExport = async (configExport, options)=>{
+    let loadedConfig = configExport;
+    if ('function' == typeof loadedConfig) {
+        let functionResult = loadedConfig(options.env, options);
+        if ('function' == typeof functionResult.then) functionResult = await functionResult;
+        if (void 0 === functionResult) throw new Error('[rspack-cli:loadConfig] The config function must return a config object.');
+        loadedConfig = functionResult;
+    }
+    if (!isRspackConfig(loadedConfig)) throw new Error(`[rspack-cli:loadConfig] The config must be an object, an array, or a function that returns one, get ${String(loadedConfig)}`);
+    return loadedConfig;
+};
 const checkIsMultiRspackOptions = (config)=>Array.isArray(config);
 async function loadExtendedConfig(config, configPath, cwd, options) {
     if (checkIsMultiRspackOptions(config)) {
@@ -1165,13 +1068,9 @@ async function loadExtendedConfig(config, configPath, cwd, options) {
             throw new Error(`Cannot find module '${extendPath}' to extend from.`);
         }
         if (!node_fs.existsSync(resolvedPath)) throw new Error(`Extended configuration file "${resolvedPath}" not found.`);
-        if (utils_isTsFile(resolvedPath) && 'register' === options.configLoader) registerLoader(resolvedPath);
-        let loadedConfig = await crossImport(resolvedPath);
-        if ('function' == typeof loadedConfig) {
-            loadedConfig = loadedConfig(options.env, options);
-            if ('function' == typeof loadedConfig.then) loadedConfig = await loadedConfig;
-        }
-        const { config: extendedConfig, pathMap: extendedPathMap } = await loadExtendedConfig(loadedConfig, resolvedPath, cwd, options);
+        const loadedConfig = await loadConfigByPath(resolvedPath, options);
+        const resolvedConfig = await resolveRspackConfigExport(loadedConfig, options);
+        const { config: extendedConfig, pathMap: extendedPathMap } = await loadExtendedConfig(resolvedConfig, resolvedPath, cwd, options);
         const configPaths = [
             ...pathMap.get(resultConfig) || [],
             ...extendedPathMap.get(extendedConfig) || []
@@ -1194,8 +1093,7 @@ async function loadRspackConfig(options, cwd = process.cwd()) {
         if (!defaultConfig) return null;
         configPath = defaultConfig;
     }
-    if (utils_isTsFile(configPath) && 'register' === options.configLoader) registerLoader(configPath);
-    const loadedConfig = await crossImport(configPath);
+    const loadedConfig = await loadConfigByPath(configPath, options);
     return {
         loadedConfig,
         configPath
@@ -1233,7 +1131,7 @@ class RspackCLI {
         this.colors = this.createColors();
         this.program = program;
         program.help();
-        program.version("2.0.0-rc.1");
+        program.version("2.0.0-rc.2");
     }
     wrapAction(fn) {
         return (...args)=>{
@@ -1362,13 +1260,9 @@ class RspackCLI {
             config: this.filterConfig(options, {}),
             pathMap: new WeakMap()
         };
-        let { loadedConfig, configPath } = config;
-        if ('function' == typeof loadedConfig) {
-            let functionResult = loadedConfig(options.env, options);
-            if ('function' == typeof functionResult.then) functionResult = await functionResult;
-            loadedConfig = functionResult;
-        }
-        const { config: extendedConfig, pathMap } = await loadExtendedConfig(loadedConfig, configPath, process.cwd(), options);
+        const { loadedConfig, configPath } = config;
+        const resolvedConfig = await resolveRspackConfigExport(loadedConfig, options);
+        const { config: extendedConfig, pathMap } = await loadExtendedConfig(resolvedConfig, configPath, process.cwd(), options);
         return {
             config: this.filterConfig(options, extendedConfig),
             pathMap

package/dist/constants.d.ts

@@ -1,3 +1,3 @@
 export declare const DEFAULT_CONFIG_NAME: "rspack.config";
-export declare const DEFAULT_EXTENSIONS: readonly [".js", ".ts", ".mjs", ".mts", ".cjs", ".cts"];
+export declare const DEFAULT_EXTENSIONS: readonly [".ts", ".js", ".mts", ".mjs", ".cts", ".cjs"];
 export declare const DEFAULT_SERVER_HOT = true;

package/dist/index.js

@@ -1 +1 @@
-export { RspackCLI, defineConfig, definePlugin } from "./697.js";
+export { RspackCLI, defineConfig, definePlugin } from "./162.js";

package/dist/json-ext.js

@@ -1,5 +1,6 @@
-import { __webpack_require__ } from "./697.js";
-import "./697.js";
+import { __webpack_require__ } from "./162.js";
+import "./162.js";
+import * as __rspack_external_util from "util";
 __webpack_require__.add({
     "../../node_modules/.pnpm/@discoveryjs+json-ext@0.5.7/node_modules/@discoveryjs/json-ext/src/index.js" (module, __unused_rspack_exports, __webpack_require__) {
         module.exports = {
@@ -763,6 +764,9 @@ __webpack_require__.add({
     "../../node_modules/.pnpm/@discoveryjs+json-ext@0.5.7/node_modules/@discoveryjs/json-ext/src/version.js" (module, __unused_rspack_exports, __webpack_require__) {
         module.exports = __webpack_require__("../../node_modules/.pnpm/@discoveryjs+json-ext@0.5.7/node_modules/@discoveryjs/json-ext/package.json").version;
     },
+    util (module) {
+        module.exports = __rspack_external_util;
+    },
     "../../node_modules/.pnpm/@discoveryjs+json-ext@0.5.7/node_modules/@discoveryjs/json-ext/package.json" (module) {
         module.exports = {
             version: "0.5.7"

package/dist/utils/loadConfig.d.ts

@@ -1,7 +1,7 @@
 import type { MultiRspackOptions, RspackOptions } from '@rspack/core';
 import type { CommonOptions } from './options';
-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);
+export type LoadedRspackConfig = undefined | RspackOptions | MultiRspackOptions | ((env: Record<string, any>, argv?: Record<string, any>) => RspackOptions | MultiRspackOptions | Promise<RspackOptions | MultiRspackOptions>);
+export declare const resolveRspackConfigExport: (configExport: LoadedRspackConfig, options: CommonOptions) => Promise<RspackOptions | MultiRspackOptions>;
 /**
  * Loads and merges configurations from the 'extends' property
  * @param config The configuration object that may contain an 'extends' property

package/dist/utils/options.d.ts

@@ -1,4 +1,5 @@
 import type { Command } from 'cac';
+export type ConfigLoader = 'auto' | 'jiti' | 'native';
 /**
  * Apply common options for all commands
  */
@@ -6,7 +7,7 @@ export declare const commonOptions: (command: Command) => Command;
 export type CommonOptions = {
     config?: string;
     configName?: string[];
-    configLoader?: string;
+    configLoader?: ConfigLoader;
     env?: Record<string, unknown> | string[];
     nodeEnv?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -24,22 +24,23 @@
   },
   "files": [
     "bin",
+    "compiled",
     "dist"
   ],
   "devDependencies": {
     "@discoveryjs/json-ext": "^0.5.7",
-    "@rslib/core": "0.20.3",
+    "@rslib/core": "0.21.0",
     "@rspack/dev-server": "2.0.0-rc.2",
     "cac": "^7.0.0",
     "concat-stream": "^2.0.0",
     "cross-env": "^10.1.0",
     "execa": "^5.1.1",
     "exit-hook": "^4.0.0",
-    "pirates": "^4.0.7",
-    "ts-node": "^10.9.2",
+    "jiti": "^2.6.1",
+    "prebundle": "^1.6.4",
     "typescript": "^6.0.2",
-    "@rspack/core": "2.0.0-rc.1",
-    "@rspack/test-tools": "2.0.0-rc.1"
+    "@rspack/core": "2.0.0-rc.2",
+    "@rspack/test-tools": "2.0.0-rc.2"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0",

package/dist/utils/crossImport.d.ts

@@ -1 +0,0 @@
-export declare const crossImport: <T = any>(path: string) => Promise<T>;

package/dist/utils/isEsmFile.d.ts

@@ -1 +0,0 @@
-export declare const isEsmFile: (filePath: string) => boolean;

package/dist/utils/readPackageUp.d.ts

@@ -1,4 +0,0 @@
-declare const readPackageUp: (cwd?: string) => {
-    type?: "module";
-} | null;
-export default readPackageUp;