@modern-js/server 3.9.3 → 3.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/dist/cjs/createDevServer.js +1 -1
  2. package/dist/cjs/dev.js +3 -3
  3. package/dist/cjs/helpers/fileReader.js +7 -9
  4. package/dist/cjs/helpers/repack.js +5 -6
  5. package/dist/esm/createDevServer.mjs +1 -1
  6. package/dist/esm/dev.mjs +3 -3
  7. package/dist/esm/helpers/fileReader.mjs +4 -6
  8. package/dist/esm/helpers/repack.mjs +2 -3
  9. package/dist/esm-node/createDevServer.mjs +1 -1
  10. package/dist/esm-node/dev.mjs +3 -3
  11. package/dist/esm-node/helpers/fileReader.mjs +4 -6
  12. package/dist/esm-node/helpers/repack.mjs +2 -3
  13. package/dist/types/dev.d.ts +1 -1
  14. package/dist/types/helpers/fileReader.d.ts +2 -1
  15. package/dist/types/helpers/repack.d.ts +2 -1
  16. package/package.json +15 -16
  17. package/rstack.config.mts +4 -0
  18. package/rslib.config.mts +0 -4
package/dist/cjs/createDevServer.js CHANGED
@@ -94,7 +94,7 @@ async function createDevServer(options, applyPlugins) {
94
94
  (0, external_dev_js_namespaceObject.devRuntimeMiddlewarePlugin)({
95
95
  ...options,
96
96
  builderDevServer
97
- }, compiler)
97
+ }, compiler, runtimeServer)
98
98
  ]);
99
99
  await applyPlugins(runtimeServer, runtimeOptions, nodeServer);
100
100
  await runtimeServer.init();
package/dist/cjs/dev.js CHANGED
@@ -34,7 +34,7 @@ __webpack_require__.d(__webpack_exports__, {
34
34
  const node_namespaceObject = require("@modern-js/server-core/node");
35
35
  const utils_namespaceObject = require("@modern-js/utils");
36
36
  const index_js_namespaceObject = require("./helpers/index.js");
37
- const devRuntimeMiddlewarePlugin = (options, compiler)=>({
37
+ const devRuntimeMiddlewarePlugin = (options, compiler, runtimeServer)=>({
38
38
  name: '@modern-js/plugin-dev',
39
39
  setup (api) {
40
40
  const { pwd, builderDevServer } = options;
@@ -76,7 +76,7 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
76
76
  });
77
77
  middlewares.push({
78
78
  name: 'init-file-reader',
79
- handler: (0, index_js_namespaceObject.initFileReader)(compiler)
79
+ handler: (0, index_js_namespaceObject.initFileReader)(compiler, runtimeServer.fileReader)
80
80
  });
81
81
  });
82
82
  }
@@ -93,7 +93,7 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
93
93
  all: false
94
94
  }).name) {
95
95
  const runtimeServer = getRuntimeServer();
96
- if (runtimeServer) (0, index_js_namespaceObject.onRepack)(distDir, runtimeServer.hooks);
96
+ if (runtimeServer) (0, index_js_namespaceObject.onRepack)(distDir, runtimeServer.hooks, runtimeServer.fileReader);
97
97
  }
98
98
  });
99
99
  const { watchOptions } = config.server;
package/dist/cjs/helpers/fileReader.js CHANGED
@@ -27,26 +27,24 @@ var __webpack_require__ = {};
27
27
  })();
28
28
  var __webpack_exports__ = {};
29
29
  __webpack_require__.r(__webpack_exports__);
30
- __webpack_require__.d(__webpack_exports__, {
31
- initFileReader: ()=>initFileReader
32
- });
33
- const fileReader_namespaceObject = require("@modern-js/runtime-utils/fileReader");
34
- const initFileReader = (compiler)=>{
30
+ const initFileReader = (compiler, reader)=>{
35
31
  let isInit = false;
36
32
  return async (ctx, next)=>{
37
33
  if (isInit) return next();
38
34
  isInit = true;
39
- const { res } = ctx.env.node;
40
35
  if (!compiler) {
41
- fileReader_namespaceObject.fileReader.reset();
36
+ reader.reset();
42
37
  return next();
43
38
  }
44
39
  const { outputFileSystem } = 'compilers' in compiler ? compiler.compilers[0] : compiler;
45
- if (outputFileSystem) fileReader_namespaceObject.fileReader.reset(outputFileSystem);
46
- else fileReader_namespaceObject.fileReader.reset();
40
+ if (outputFileSystem) reader.reset(outputFileSystem);
41
+ else reader.reset();
47
42
  return next();
48
43
  };
49
44
  };
45
+ __webpack_require__.d(__webpack_exports__, {}, {
46
+ initFileReader: initFileReader
47
+ });
50
48
  exports.initFileReader = __webpack_exports__.initFileReader;
51
49
  for(var __rspack_i in __webpack_exports__)if (-1 === [
52
50
  "initFileReader"
package/dist/cjs/helpers/repack.js CHANGED
@@ -27,24 +27,23 @@ var __webpack_require__ = {};
27
27
  })();
28
28
  var __webpack_exports__ = {};
29
29
  __webpack_require__.r(__webpack_exports__);
30
- __webpack_require__.d(__webpack_exports__, {
31
- onRepack: ()=>onRepack
32
- });
33
- const fileReader_namespaceObject = require("@modern-js/runtime-utils/fileReader");
34
30
  const cleanSSRCache = (distDir)=>{
35
31
  Object.keys(require.cache).forEach((key)=>{
36
32
  if (key.startsWith(distDir)) delete require.cache[key];
37
33
  });
38
34
  };
39
- const onRepack = (distDir, hooks)=>{
35
+ const onRepack = (distDir, hooks, reader)=>{
40
36
  cleanSSRCache(distDir);
41
- fileReader_namespaceObject.fileReader.reset();
37
+ reader.reset();
42
38
  hooks.onReset.call({
43
39
  event: {
44
40
  type: 'repack'
45
41
  }
46
42
  });
47
43
  };
44
+ __webpack_require__.d(__webpack_exports__, {}, {
45
+ onRepack: onRepack
46
+ });
48
47
  exports.onRepack = __webpack_exports__.onRepack;
49
48
  for(var __rspack_i in __webpack_exports__)if (-1 === [
50
49
  "onRepack"
package/dist/esm/createDevServer.mjs CHANGED
@@ -52,7 +52,7 @@ async function createDevServer(options, applyPlugins) {
52
52
  devRuntimeMiddlewarePlugin({
53
53
  ...options,
54
54
  builderDevServer
55
- }, compiler)
55
+ }, compiler, runtimeServer)
56
56
  ]);
57
57
  await applyPlugins(runtimeServer, runtimeOptions, nodeServer);
58
58
  await runtimeServer.init();
package/dist/esm/dev.mjs CHANGED
@@ -1,7 +1,7 @@
1
1
  import { connectMid2HonoMid } from "@modern-js/server-core/node";
2
2
  import { API_DIR, SHARED_DIR, logger } from "@modern-js/utils";
3
3
  import { getDevOptions, getMockMiddleware, initFileReader, isPathInsideDirectory, onRepack, resolveMockDirectory, startWatcher } from "./helpers/index.mjs";
4
- const devRuntimeMiddlewarePlugin = (options, compiler)=>({
4
+ const devRuntimeMiddlewarePlugin = (options, compiler, runtimeServer)=>({
5
5
  name: '@modern-js/plugin-dev',
6
6
  setup (api) {
7
7
  const { pwd, builderDevServer } = options;
@@ -43,7 +43,7 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
43
43
  });
44
44
  middlewares.push({
45
45
  name: 'init-file-reader',
46
- handler: initFileReader(compiler)
46
+ handler: initFileReader(compiler, runtimeServer.fileReader)
47
47
  });
48
48
  });
49
49
  }
@@ -60,7 +60,7 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
60
60
  all: false
61
61
  }).name) {
62
62
  const runtimeServer = getRuntimeServer();
63
- if (runtimeServer) onRepack(distDir, runtimeServer.hooks);
63
+ if (runtimeServer) onRepack(distDir, runtimeServer.hooks, runtimeServer.fileReader);
64
64
  }
65
65
  });
66
66
  const { watchOptions } = config.server;
package/dist/esm/helpers/fileReader.mjs CHANGED
@@ -1,17 +1,15 @@
1
- import { fileReader } from "@modern-js/runtime-utils/fileReader";
2
- const initFileReader = (compiler)=>{
1
+ const initFileReader = (compiler, reader)=>{
3
2
  let isInit = false;
4
3
  return async (ctx, next)=>{
5
4
  if (isInit) return next();
6
5
  isInit = true;
7
- const { res } = ctx.env.node;
8
6
  if (!compiler) {
9
- fileReader.reset();
7
+ reader.reset();
10
8
  return next();
11
9
  }
12
10
  const { outputFileSystem } = 'compilers' in compiler ? compiler.compilers[0] : compiler;
13
- if (outputFileSystem) fileReader.reset(outputFileSystem);
14
- else fileReader.reset();
11
+ if (outputFileSystem) reader.reset(outputFileSystem);
12
+ else reader.reset();
15
13
  return next();
16
14
  };
17
15
  };
package/dist/esm/helpers/repack.mjs CHANGED
@@ -1,12 +1,11 @@
1
- import { fileReader } from "@modern-js/runtime-utils/fileReader";
2
1
  const cleanSSRCache = (distDir)=>{
3
2
  Object.keys(require.cache).forEach((key)=>{
4
3
  if (key.startsWith(distDir)) delete require.cache[key];
5
4
  });
6
5
  };
7
- const onRepack = (distDir, hooks)=>{
6
+ const onRepack = (distDir, hooks, reader)=>{
8
7
  cleanSSRCache(distDir);
9
- fileReader.reset();
8
+ reader.reset();
10
9
  hooks.onReset.call({
11
10
  event: {
12
11
  type: 'repack'
package/dist/esm-node/createDevServer.mjs CHANGED
@@ -53,7 +53,7 @@ async function createDevServer(options, applyPlugins) {
53
53
  devRuntimeMiddlewarePlugin({
54
54
  ...options,
55
55
  builderDevServer
56
- }, compiler)
56
+ }, compiler, runtimeServer)
57
57
  ]);
58
58
  await applyPlugins(runtimeServer, runtimeOptions, nodeServer);
59
59
  await runtimeServer.init();
package/dist/esm-node/dev.mjs CHANGED
@@ -2,7 +2,7 @@ import "node:module";
2
2
  import { connectMid2HonoMid } from "@modern-js/server-core/node";
3
3
  import { API_DIR, SHARED_DIR, logger } from "@modern-js/utils";
4
4
  import { getDevOptions, getMockMiddleware, initFileReader, isPathInsideDirectory, onRepack, resolveMockDirectory, startWatcher } from "./helpers/index.mjs";
5
- const devRuntimeMiddlewarePlugin = (options, compiler)=>({
5
+ const devRuntimeMiddlewarePlugin = (options, compiler, runtimeServer)=>({
6
6
  name: '@modern-js/plugin-dev',
7
7
  setup (api) {
8
8
  const { pwd, builderDevServer } = options;
@@ -44,7 +44,7 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
44
44
  });
45
45
  middlewares.push({
46
46
  name: 'init-file-reader',
47
- handler: initFileReader(compiler)
47
+ handler: initFileReader(compiler, runtimeServer.fileReader)
48
48
  });
49
49
  });
50
50
  }
@@ -61,7 +61,7 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
61
61
  all: false
62
62
  }).name) {
63
63
  const runtimeServer = getRuntimeServer();
64
- if (runtimeServer) onRepack(distDir, runtimeServer.hooks);
64
+ if (runtimeServer) onRepack(distDir, runtimeServer.hooks, runtimeServer.fileReader);
65
65
  }
66
66
  });
67
67
  const { watchOptions } = config.server;
package/dist/esm-node/helpers/fileReader.mjs CHANGED
@@ -1,18 +1,16 @@
1
1
  import "node:module";
2
- import { fileReader } from "@modern-js/runtime-utils/fileReader";
3
- const initFileReader = (compiler)=>{
2
+ const initFileReader = (compiler, reader)=>{
4
3
  let isInit = false;
5
4
  return async (ctx, next)=>{
6
5
  if (isInit) return next();
7
6
  isInit = true;
8
- const { res } = ctx.env.node;
9
7
  if (!compiler) {
10
- fileReader.reset();
8
+ reader.reset();
11
9
  return next();
12
10
  }
13
11
  const { outputFileSystem } = 'compilers' in compiler ? compiler.compilers[0] : compiler;
14
- if (outputFileSystem) fileReader.reset(outputFileSystem);
15
- else fileReader.reset();
12
+ if (outputFileSystem) reader.reset(outputFileSystem);
13
+ else reader.reset();
16
14
  return next();
17
15
  };
18
16
  };
package/dist/esm-node/helpers/repack.mjs CHANGED
@@ -1,14 +1,13 @@
1
1
  import __rslib_shim_module__ from "node:module";
2
2
  const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
3
- import { fileReader } from "@modern-js/runtime-utils/fileReader";
4
3
  const cleanSSRCache = (distDir)=>{
5
4
  Object.keys(require.cache).forEach((key)=>{
6
5
  if (key.startsWith(distDir)) delete require.cache[key];
7
6
  });
8
7
  };
9
- const onRepack = (distDir, hooks)=>{
8
+ const onRepack = (distDir, hooks, reader)=>{
10
9
  cleanSSRCache(distDir);
11
- fileReader.reset();
10
+ reader.reset();
12
11
  hooks.onReset.call({
13
12
  event: {
14
13
  type: 'repack'
package/dist/types/dev.d.ts CHANGED
@@ -22,7 +22,7 @@ export type DevPluginOptions = ModernDevServerOptions<ServerBaseOptions> & {
22
22
  * - the rsbuild/builder dev middleware (a stable reference, just re-registered)
23
23
  * - the file-reader middleware
24
24
  */
25
- export declare const devRuntimeMiddlewarePlugin: (options: DevPluginOptions, compiler: Rspack.Compiler | Rspack.MultiCompiler | null) => ServerPlugin;
25
+ export declare const devRuntimeMiddlewarePlugin: (options: DevPluginOptions, compiler: Rspack.Compiler | Rspack.MultiCompiler | null, runtimeServer: ServerBase) => ServerPlugin;
26
26
  export interface DevInfraOptions {
27
27
  config: DevPluginOptions['config'];
28
28
  pwd: string;
package/dist/types/helpers/fileReader.d.ts CHANGED
@@ -1,3 +1,4 @@
1
1
  import type { Rspack } from '@modern-js/builder';
2
+ import type { FileReader } from '@modern-js/runtime-utils/fileReader';
2
3
  import type { Middleware } from '@modern-js/server-core';
3
- export declare const initFileReader: (compiler: Rspack.Compiler | Rspack.MultiCompiler | null) => Middleware;
4
+ export declare const initFileReader: (compiler: Rspack.Compiler | Rspack.MultiCompiler | null, reader: FileReader) => Middleware;
package/dist/types/helpers/repack.d.ts CHANGED
@@ -1,2 +1,3 @@
1
+ import type { FileReader } from '@modern-js/runtime-utils/fileReader';
1
2
  import type { ServerPluginHooks } from '@modern-js/server-core';
2
- export declare const onRepack: (distDir: string, hooks: ServerPluginHooks) => void;
3
+ export declare const onRepack: (distDir: string, hooks: ServerPluginHooks, reader: FileReader) => void;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "3.9.3",
18
+ "version": "3.10.1",
19
19
  "types": "./dist/types/index.d.ts",
20
20
  "main": "./dist/cjs/index.js",
21
21
  "exports": {
@@ -38,32 +38,31 @@
38
38
  },
39
39
  "dependencies": {
40
40
  "@swc/helpers": "^0.5.17",
41
- "axios": "^1.15.2",
41
+ "axios": "^1.20.0",
42
42
  "connect-history-api-fallback": "^2.0.0",
43
43
  "http-compression": "1.0.6",
44
44
  "minimatch": "^3.1.5",
45
45
  "path-to-regexp": "^6.3.0",
46
- "ws": "^8.21.3",
47
- "@modern-js/runtime-utils": "3.9.3",
48
- "@modern-js/server-utils": "3.9.3",
49
- "@modern-js/server-core": "3.9.3",
50
- "@modern-js/types": "3.9.3",
51
- "@modern-js/utils": "3.9.3"
46
+ "ws": "^8.22.0",
47
+ "@modern-js/runtime-utils": "3.10.1",
48
+ "@modern-js/server-core": "3.10.1",
49
+ "@modern-js/server-utils": "3.10.1",
50
+ "@modern-js/types": "3.10.1",
51
+ "@modern-js/utils": "3.10.1"
52
52
  },
53
53
  "devDependencies": {
54
- "@rslib/core": "1.0.1",
55
54
  "@types/connect-history-api-fallback": "^1.5.4",
56
55
  "@types/minimatch": "^3.0.5",
57
56
  "@types/node": "^20",
58
- "@types/ws": "^8.18.1",
59
- "node-mocks-http": "^1.17.2",
57
+ "@types/ws": "^8.18.2",
58
+ "node-mocks-http": "^1.18.1",
60
59
  "ts-node": "^10.9.2",
61
60
  "tsconfig-paths": "4.2.0",
62
61
  "typescript": "^5",
63
62
  "websocket": "^1.0.35",
64
- "@modern-js/builder": "3.9.3",
65
- "@modern-js/rslib": "2.68.10",
66
- "@scripts/rstest-config": "2.66.0"
63
+ "@scripts/rstest-config": "2.66.0",
64
+ "@modern-js/builder": "3.10.1",
65
+ "@modern-js/rslib": "2.68.10"
67
66
  },
68
67
  "peerDependencies": {
69
68
  "devcert": "^1.2.3",
@@ -87,8 +86,8 @@
87
86
  "access": "public"
88
87
  },
89
88
  "scripts": {
90
- "build": "rslib build",
91
- "dev": "rslib build --watch",
89
+ "build": "rs lib",
90
+ "dev": "rs lib --watch",
92
91
  "test": "rstest"
93
92
  }
94
93
  }
package/rstack.config.mts ADDED
@@ -0,0 +1,4 @@
1
+ import { rslibConfig } from '@modern-js/rslib';
2
+ import { define } from 'rstack';
3
+
4
+ define.lib(rslibConfig);
package/rslib.config.mts DELETED
@@ -1,4 +0,0 @@
1
- import { rslibConfig } from '@modern-js/rslib';
2
- import { defineConfig } from '@rslib/core';
3
-
4
- export default defineConfig(rslibConfig);