rspress 1.15.0 → 1.16.0

package/dist/index.js

@@ -1,16 +1,16 @@
 // src/index.ts
-import { createRequire as createRequire2 } from "module";
+import { createRequire } from "module";
 import path3 from "path";
 import { cac } from "cac";
 import { build, dev, serve } from "@rspress/core";
-import { logger as logger2 } from "@rspress/shared/logger";
+import { logger as logger3 } from "@rspress/shared/logger";
 import chokidar from "chokidar";
 import chalk from "chalk";
 
 // src/config/loadConfigFile.ts
 import fs from "fs";
 import path from "path";
-import { createRequire } from "module";
+import { logger } from "@rspress/shared/logger";
 
 // src/constants.ts
 var DEFAULT_CONFIG_NAME = "rspress.config";
@@ -40,18 +40,15 @@ async function loadConfigFile(customConfigFile) {
     configFilePath = findConfig(path.join(baseDir, DEFAULT_CONFIG_NAME));
   }
   if (!configFilePath) {
-    console.log("no config file found");
+    logger.info(`No config file found in ${baseDir}`);
     return {};
   }
-  const require3 = createRequire(import.meta.url);
-  const nodeBundleRequire = require3("@modern-js/node-bundle-require");
-  let result = await nodeBundleRequire.bundleRequire(configFilePath, {
-    require: require3
+  const { loadConfig } = await import("@rsbuild/core");
+  const { content } = await loadConfig({
+    cwd: path.dirname(configFilePath),
+    path: configFilePath
   });
-  if (result && typeof result === "object" && "default" in result) {
-    result = result.default || {};
-  }
-  return result;
+  return content;
 }
 
 // src/update.ts
@@ -59,7 +56,7 @@ import path2 from "path";
 import fs2 from "fs/promises";
 import { spawn } from "child_process";
 import { pathExists } from "@rspress/shared/fs-extra";
-import { logger } from "@rspress/shared/logger";
+import { logger as logger2 } from "@rspress/shared/logger";
 var lockfileMap = {
   "package-lock.json": "npm",
   "yarn.lock": "yarn",
@@ -90,7 +87,7 @@ async function update() {
   const cwd = process.cwd();
   const packageManager = await getPackageManager(cwd);
   const rspressDependencies = await getRspressDependencies(cwd);
-  logger.greet(
+  logger2.greet(
     `Using ${packageManager} to update ${rspressDependencies.join(" ")}`
   );
   if (packageManager === "npm" || packageManager === "bun") {
@@ -113,12 +110,12 @@ var CONFIG_FILES = [
   "_meta.json",
   "i18n.json"
 ];
-var require2 = createRequire2(import.meta.url);
+var require2 = createRequire(import.meta.url);
 var packageJson = require2("../package.json");
 var cli = cac("rspress").version(packageJson.version).help();
 var landingMessage = `🔥 Rspress v${packageJson.version}
 `;
-logger2.greet(landingMessage);
+logger3.greet(landingMessage);
 var setNodeEnv = (env) => {
   process.env.NODE_ENV = env;
 };
@@ -207,5 +204,5 @@ cli.command("preview").alias("serve").option("--port [port]", "port number").opt
     });
   }
 );
-cli.command("update", "update elavant packages about rspress").action(update);
+cli.command("update", "update relevant packages about rspress").action(update);
 cli.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rspress",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -28,12 +28,12 @@
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.48.1",
+    "@rsbuild/core": "0.5.1",
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",
     "chalk": "5.3.0",
-    "@rspress/core": "1.15.0",
-    "@rspress/shared": "1.15.0"
+    "@rspress/core": "1.16.0",
+    "@rspress/shared": "1.16.0"
   },
   "devDependencies": {
     "@types/jest": "~29.2.4",