@modern-js/server 3.0.0-alpha.1 → 3.0.0

package/dist/cjs/createDevServer.js

@@ -73,8 +73,7 @@ async function createDevServer(options, applyPlugins) {
         compiler = context.compiler;
     });
     const builderDevServer = await builder?.createDevServer({
-        runCompile: options.runCompile,
-        compiler: options.compiler
+        runCompile: options.runCompile
     });
     server.addPlugins([
         (0, external_dev_js_namespaceObject.devPlugin)({

package/dist/cjs/dev-tools/https/index.js

@@ -32,12 +32,7 @@ const genHttpsOptions = async (userOptions, pwd)=>{
     if (!httpsOptions.key || !httpsOptions.cert) {
         let devcertPath;
         try {
-            devcertPath = require.resolve('devcert', {
-                paths: [
-                    pwd,
-                    __dirname
-                ]
-            });
+            devcertPath = (0, utils_namespaceObject.tryResolve)('devcert', pwd, __dirname);
         } catch (err) {
             const packageManager = await (0, utils_namespaceObject.getPackageManager)(pwd);
             const command = utils_namespaceObject.chalk.yellow.bold(`${packageManager} add devcert@1.2.2 -D`);

package/dist/esm/createDevServer.mjs

@@ -1,8 +1,8 @@
 import node_path from "node:path";
 import { createServerBase } from "@modern-js/server-core";
 import { createNodeServer, loadServerRuntimeConfig } from "@modern-js/server-core/node";
-import { devPlugin } from "./dev";
-import { getDevAssetPrefix, getDevOptions } from "./helpers";
+import { devPlugin } from "./dev.mjs";
+import { getDevAssetPrefix, getDevOptions } from "./helpers/index.mjs";
 async function createDevServer(options, applyPlugins) {
     const { config, pwd, serverConfigPath, builder } = options;
     const dev = getDevOptions(options.dev);
@@ -25,7 +25,7 @@ async function createDevServer(options, applyPlugins) {
     const isHttp2 = !!devHttpsOption;
     let nodeServer;
     if (devHttpsOption) {
-        const { genHttpsOptions } = await import("./dev-tools/https");
+        const { genHttpsOptions } = await import("./dev-tools/https/index.mjs");
         const httpsOptions = await genHttpsOptions(devHttpsOption, pwd);
         nodeServer = await createNodeServer(server.handle.bind(server), httpsOptions, isHttp2);
     } else nodeServer = await createNodeServer(server.handle.bind(server));
@@ -35,8 +35,7 @@ async function createDevServer(options, applyPlugins) {
         compiler = context.compiler;
     });
     const builderDevServer = await builder?.createDevServer({
-        runCompile: options.runCompile,
-        compiler: options.compiler
+        runCompile: options.runCompile
     });
     server.addPlugins([
         devPlugin({

package/dist/esm/dev-tools/https/index.mjs

@@ -1,15 +1,10 @@
-import { chalk, getPackageManager, logger } from "@modern-js/utils";
+import { chalk, getPackageManager, logger, tryResolve } from "@modern-js/utils";
 const genHttpsOptions = async (userOptions, pwd)=>{
     const httpsOptions = 'boolean' == typeof userOptions ? {} : userOptions;
     if (!httpsOptions.key || !httpsOptions.cert) {
         let devcertPath;
         try {
-            devcertPath = require.resolve('devcert', {
-                paths: [
-                    pwd,
-                    __dirname
-                ]
-            });
+            devcertPath = tryResolve('devcert', pwd, __dirname);
         } catch (err) {
             const packageManager = await getPackageManager(pwd);
             const command = chalk.yellow.bold(`${packageManager} add devcert@1.2.2 -D`);

package/dist/esm/dev-tools/watcher/index.mjs

@@ -1,7 +1,7 @@
 import path from "path";
 import { chokidar, fs } from "@modern-js/utils";
-import { DependencyTree } from "./dependencyTree";
-import { StatsCache } from "./statsCache";
+import { DependencyTree } from "./dependencyTree.mjs";
+import { StatsCache } from "./statsCache.mjs";
 const defaultWatchOptions = {
     ignoreInitial: true,
     ignored: /api\/typings\/.*/

package/dist/esm/dev.mjs

@@ -1,6 +1,6 @@
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
 import { API_DIR, SHARED_DIR } from "@modern-js/utils";
-import { getDevOptions, getMockMiddleware, initFileReader, onRepack, startWatcher } from "./helpers";
+import { getDevOptions, getMockMiddleware, initFileReader, onRepack, startWatcher } from "./helpers/index.mjs";
 const devPlugin = (options, compiler)=>({
         name: '@modern-js/plugin-dev',
         setup (api) {

package/dist/esm/helpers/index.mjs

@@ -1,13 +1,13 @@
 import path from "path";
 import { AGGRED_DIR } from "@modern-js/server-core";
 import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";
-import dev_tools_watcher, { mergeWatchOptions } from "../dev-tools/watcher";
-import { initOrUpdateMockMiddlewares } from "./mock";
-import { debug } from "./utils";
-export * from "./repack";
-export * from "./devOptions";
-export * from "./fileReader";
-export * from "./mock";
+import dev_tools_watcher, { mergeWatchOptions } from "../dev-tools/watcher/index.mjs";
+import { initOrUpdateMockMiddlewares } from "./mock.mjs";
+import { debug } from "./utils.mjs";
+export * from "./repack.mjs";
+export * from "./devOptions.mjs";
+export * from "./fileReader.mjs";
+export * from "./mock.mjs";
 async function onServerChange({ pwd, filepath, event, server }) {
     const { mock } = AGGRED_DIR;
     const mockPath = path.normalize(path.join(pwd, mock));

package/dist/esm/index.mjs

@@ -1,2 +1,2 @@
-import { createDevServer } from "./createDevServer";
+import { createDevServer } from "./createDevServer.mjs";
 export { createDevServer };

package/dist/esm-node/createDevServer.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 import node_path from "node:path";
 import { createServerBase } from "@modern-js/server-core";
 import { createNodeServer, loadServerRuntimeConfig } from "@modern-js/server-core/node";
@@ -35,8 +36,7 @@ async function createDevServer(options, applyPlugins) {
         compiler = context.compiler;
     });
     const builderDevServer = await builder?.createDevServer({
-        runCompile: options.runCompile,
-        compiler: options.compiler
+        runCompile: options.runCompile
     });
     server.addPlugins([
         devPlugin({

package/dist/esm-node/dev-tools/https/index.mjs

@@ -1,15 +1,15 @@
-import { chalk, getPackageManager, logger } from "@modern-js/utils";
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
+import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
+import { dirname as __rspack_dirname } from "node:path";
+import { chalk, getPackageManager, logger, tryResolve } from "@modern-js/utils";
+var https_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const genHttpsOptions = async (userOptions, pwd)=>{
     const httpsOptions = 'boolean' == typeof userOptions ? {} : userOptions;
     if (!httpsOptions.key || !httpsOptions.cert) {
         let devcertPath;
         try {
-            devcertPath = require.resolve('devcert', {
-                paths: [
-                    pwd,
-                    __dirname
-                ]
-            });
+            devcertPath = tryResolve('devcert', pwd, https_dirname);
         } catch (err) {
             const packageManager = await getPackageManager(pwd);
             const command = chalk.yellow.bold(`${packageManager} add devcert@1.2.2 -D`);

package/dist/esm-node/dev-tools/watcher/dependencyTree.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 import minimatch from "minimatch";
 const defaultIgnores = [
     '**/coverage/**',

package/dist/esm-node/dev-tools/watcher/index.mjs

@@ -1,3 +1,5 @@
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import path from "path";
 import { chokidar, fs } from "@modern-js/utils";
 import { DependencyTree } from "./dependencyTree.mjs";

package/dist/esm-node/dev-tools/watcher/statsCache.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 import crypto_0 from "crypto";
 import fs from "fs";
 class StatsCache {

package/dist/esm-node/dev.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
 import { API_DIR, SHARED_DIR } from "@modern-js/utils";
 import { getDevOptions, getMockMiddleware, initFileReader, onRepack, startWatcher } from "./helpers/index.mjs";

package/dist/esm-node/helpers/devOptions.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 const getDevOptions = (devOptions)=>{
     const defaultOptions = {
         https: false,

package/dist/esm-node/helpers/fileReader.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
 const initFileReader = (compiler)=>{
     let isInit = false;

package/dist/esm-node/helpers/index.mjs

@@ -1,3 +1,5 @@
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import path from "path";
 import { AGGRED_DIR } from "@modern-js/server-core";
 import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";

package/dist/esm-node/helpers/mock.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 import node_path from "node:path";
 import { AGGRED_DIR } from "@modern-js/server-core";
 import { connectMockMid2HonoMid } from "@modern-js/server-core/node";

package/dist/esm-node/helpers/repack.mjs

@@ -1,3 +1,5 @@
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
 const cleanSSRCache = (distDir)=>{
     Object.keys(require.cache).forEach((key)=>{

package/dist/esm-node/helpers/utils.mjs

@@ -1,3 +1,4 @@
+import "node:module";
 import { createDebugger } from "@modern-js/utils";
 const debug = createDebugger('server');
 export { debug };

package/dist/esm-node/index.mjs

@@ -1,2 +1,3 @@
+import "node:module";
 import { createDevServer } from "./createDevServer.mjs";
 export { createDevServer };

package/dist/esm-node/types.mjs

@@ -0,0 +1 @@
+import "node:module";

package/dist/types/types.d.ts

@@ -1,6 +1,6 @@
 import type { Server as NodeServer } from 'node:http';
 import type { Http2SecureServer } from 'node:http2';
-import type { BuilderInstance, Rspack } from '@modern-js/builder';
+import type { BuilderInstance } from '@modern-js/builder';
 import type { DevServerHttpsOptions, ExposeServerApis, RequestHandler } from '@modern-js/types';
 import type { ServerBase, ServerBaseOptions, ServerPlugin } from '@modern-js/server-core';
 export type { DevServerHttpsOptions };
@@ -48,10 +48,6 @@ export type DevServerOptions = {
 export type ExtraOptions = {
     dev: DevServerOptions;
     runCompile?: boolean;
-    /**
-     * The existing compiler can be used here.
-     */
-    compiler?: Rspack.Compiler | Rspack.MultiCompiler;
     serverConfigPath: string;
     builder?: BuilderInstance;
     plugins?: ServerPlugin[];

package/package.json

@@ -15,72 +15,54 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-alpha.1",
-  "jsnext:source": "./src/index.ts",
+  "version": "3.0.0",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.mjs",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
       "modern:source": "./src/index.ts",
-      "jsnext:source": "./src/index.ts",
       "node": {
         "import": "./dist/esm-node/index.mjs",
         "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/esm/index.mjs"
-    },
-    "./hmr-client": {
-      "types": "./dist/types/dev-tools/dev-middleware/hmr-client/index.d.ts",
-      "jsnext:source": "./src/dev-tools/dev-middleware/hmr-client/index.ts",
-      "node": {
-        "require": "./dist/cjs/dev-tools/dev-middleware/hmr-client/index.js"
-      },
-      "default": "./dist/cjs/dev-tools/dev-middleware/hmr-client/index.js"
+      "default": "./dist/cjs/index.js"
     }
   },
   "typesVersions": {
     "*": {
       ".": [
         "./dist/types/index.d.ts"
-      ],
-      "hmr-client": [
-        "./dist/types/dev-tools/dev-middleware/hmr-client/index.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@babel/core": "^7.28.5",
-    "@babel/register": "^7.28.3",
     "@swc/helpers": "^0.5.17",
-    "axios": "^1.13.2",
+    "axios": "^1.13.4",
     "connect-history-api-fallback": "^2.0.0",
     "http-compression": "1.0.6",
     "minimatch": "^3.1.2",
     "path-to-regexp": "^6.3.0",
-    "ws": "^8.18.3",
-    "@modern-js/runtime-utils": "3.0.0-alpha.1",
-    "@modern-js/server-core": "3.0.0-alpha.1",
-    "@modern-js/types": "3.0.0-alpha.1",
-    "@modern-js/utils": "3.0.0-alpha.1",
-    "@modern-js/server-utils": "3.0.0-alpha.1"
+    "ws": "^8.19.0",
+    "@modern-js/server-core": "3.0.0",
+    "@modern-js/runtime-utils": "3.0.0",
+    "@modern-js/types": "3.0.0",
+    "@modern-js/utils": "3.0.0",
+    "@modern-js/server-utils": "3.0.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.19.1",
+    "@rslib/core": "0.19.4",
     "@types/connect-history-api-fallback": "^1.5.4",
-    "@types/jest": "^29.5.14",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^20",
     "@types/ws": "^8.18.1",
-    "jest": "^29.7.0",
     "node-mocks-http": "^1.17.2",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "4.2.0",
     "typescript": "^5",
     "websocket": "^1.0.35",
-    "@modern-js/builder": "3.0.0-alpha.1",
-    "@scripts/jest-config": "2.66.0",
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/builder": "3.0.0",
     "@modern-js/rslib": "2.68.10"
   },
   "peerDependencies": {
@@ -107,6 +89,6 @@
   "scripts": {
     "build": "rslib build",
     "dev": "rslib build --watch",
-    "test": "jest"
+    "test": "rstest"
   }
 }

package/rstest.config.ts

@@ -0,0 +1,5 @@
+import { withTestPreset } from '@scripts/rstest-config';
+
+export default withTestPreset({
+  globals: true,
+});