@modern-js/plugin-server 2.49.4 → 2.51.0

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 (8) hide show
  1. package/dist/cjs/server.js +16 -3
  2. package/dist/cjs/utils.js +2 -1
  3. package/dist/esm/server.js +18 -3
  4. package/dist/esm/utils.js +4 -2
  5. package/dist/esm-node/server.js +16 -3
  6. package/dist/esm-node/utils.js +2 -1
  7. package/dist/types/utils.d.ts +4 -2
  8. package/package.json +9 -9
package/dist/cjs/server.js CHANGED
@@ -34,10 +34,12 @@ var HOOKS;
34
34
  class Storage {
35
35
  reset() {
36
36
  this.middlewares = [];
37
+ this.unstableMiddlewares = [];
37
38
  this.hooks = {};
38
39
  }
39
40
  constructor() {
40
41
  this.middlewares = [];
42
+ this.unstableMiddlewares = [];
41
43
  this.hooks = {};
42
44
  }
43
45
  }
@@ -66,6 +68,11 @@ const compose = (middlewares) => {
66
68
  return dispatch;
67
69
  };
68
70
  };
71
+ function getFactory(storage) {
72
+ const { middlewares } = storage;
73
+ const factory = compose(middlewares);
74
+ return factory;
75
+ }
69
76
  var server_default = () => ({
70
77
  name: "@modern-js/plugin-server",
71
78
  setup: (api) => {
@@ -75,7 +82,7 @@ var server_default = () => ({
75
82
  const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
76
83
  const loadMod = () => {
77
84
  const { middleware: unstableMiddleware } = (0, import_utils2.loadMiddleware)(pwd);
78
- const { defaultExports, hooks, middleware } = (0, import_utils2.loadServerMod)(pwd);
85
+ const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = (0, import_utils2.loadServerMod)(pwd);
79
86
  if (defaultExports) {
80
87
  defaultExports(transformAPI);
81
88
  }
@@ -91,7 +98,9 @@ var server_default = () => ({
91
98
  storage.middlewares = [].concat(middleware);
92
99
  }
93
100
  storage.middlewares = storage.middlewares.concat(unstableMiddleware);
101
+ storage.unstableMiddlewares.push(...unstableMiddlewares || []);
94
102
  };
103
+ let factory;
95
104
  return {
96
105
  prepare() {
97
106
  loadMod();
@@ -99,6 +108,7 @@ var server_default = () => ({
99
108
  reset() {
100
109
  storage.reset();
101
110
  loadMod();
111
+ factory = getFactory(storage);
102
112
  },
103
113
  afterMatch(context, next) {
104
114
  if (!storage.hooks.afterMatch) {
@@ -113,8 +123,11 @@ var server_default = () => ({
113
123
  return storage.hooks.afterRender(context, next);
114
124
  },
115
125
  prepareWebServer() {
116
- const { middlewares } = storage;
117
- const factory = compose(middlewares);
126
+ const { unstableMiddlewares } = storage;
127
+ if (unstableMiddlewares.length > 0) {
128
+ return unstableMiddlewares;
129
+ }
130
+ factory = getFactory(storage);
118
131
  return (ctx) => {
119
132
  const { source: { res } } = ctx;
120
133
  return new Promise((resolve, reject) => {
package/dist/cjs/utils.js CHANGED
@@ -50,9 +50,10 @@ const loadServerMod = (pwd = process.cwd()) => {
50
50
  const mod = (0, import_utils.requireExistModule)(webAppPath, {
51
51
  interop: false
52
52
  });
53
- const { default: defaultExports, middleware, ...hooks } = mod || {};
53
+ const { default: defaultExports, middleware, unstableMiddleware, ...hooks } = mod || {};
54
54
  return {
55
55
  defaultExports,
56
+ unstableMiddleware,
56
57
  hooks,
57
58
  middleware
58
59
  };
package/dist/esm/server.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
2
+ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
2
3
  import { isProd, logger } from "@modern-js/utils";
3
4
  import { loadMiddleware, loadServerMod } from "./utils";
4
5
  var HOOKS;
@@ -11,11 +12,13 @@ var Storage = /* @__PURE__ */ function() {
11
12
  function Storage2() {
12
13
  _class_call_check(this, Storage2);
13
14
  this.middlewares = [];
15
+ this.unstableMiddlewares = [];
14
16
  this.hooks = {};
15
17
  }
16
18
  var _proto = Storage2.prototype;
17
19
  _proto.reset = function reset() {
18
20
  this.middlewares = [];
21
+ this.unstableMiddlewares = [];
19
22
  this.hooks = {};
20
23
  };
21
24
  return Storage2;
@@ -49,6 +52,11 @@ var compose = function(middlewares) {
49
52
  return dispatch;
50
53
  };
51
54
  };
55
+ function getFactory(storage) {
56
+ var middlewares = storage.middlewares;
57
+ var factory = compose(middlewares);
58
+ return factory;
59
+ }
52
60
  function server_default() {
53
61
  return {
54
62
  name: "@modern-js/plugin-server",
@@ -58,8 +66,9 @@ function server_default() {
58
66
  var transformAPI = createTransformAPI(storage);
59
67
  var pwd = isProd() ? distDirectory : appDirectory;
60
68
  var loadMod = function() {
69
+ var _storage_unstableMiddlewares;
61
70
  var _loadMiddleware = loadMiddleware(pwd), unstableMiddleware = _loadMiddleware.middleware;
62
- var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware;
71
+ var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware, unstableMiddlewares = _loadServerMod.unstableMiddleware;
63
72
  if (defaultExports) {
64
73
  defaultExports(transformAPI);
65
74
  }
@@ -75,7 +84,9 @@ function server_default() {
75
84
  storage.middlewares = [].concat(middleware);
76
85
  }
77
86
  storage.middlewares = storage.middlewares.concat(unstableMiddleware);
87
+ (_storage_unstableMiddlewares = storage.unstableMiddlewares).push.apply(_storage_unstableMiddlewares, _to_consumable_array(unstableMiddlewares || []));
78
88
  };
89
+ var factory;
79
90
  return {
80
91
  prepare: function prepare() {
81
92
  loadMod();
@@ -83,6 +94,7 @@ function server_default() {
83
94
  reset: function reset() {
84
95
  storage.reset();
85
96
  loadMod();
97
+ factory = getFactory(storage);
86
98
  },
87
99
  afterMatch: function afterMatch(context, next) {
88
100
  if (!storage.hooks.afterMatch) {
@@ -97,8 +109,11 @@ function server_default() {
97
109
  return storage.hooks.afterRender(context, next);
98
110
  },
99
111
  prepareWebServer: function prepareWebServer() {
100
- var middlewares = storage.middlewares;
101
- var factory = compose(middlewares);
112
+ var unstableMiddlewares = storage.unstableMiddlewares;
113
+ if (unstableMiddlewares.length > 0) {
114
+ return unstableMiddlewares;
115
+ }
116
+ factory = getFactory(storage);
102
117
  return function(ctx) {
103
118
  var res = ctx.source.res;
104
119
  return new Promise(function(resolve, reject) {
package/dist/esm/utils.js CHANGED
@@ -19,12 +19,14 @@ var loadServerMod = function() {
19
19
  var mod = requireExistModule(webAppPath, {
20
20
  interop: false
21
21
  });
22
- var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _object_without_properties(_ref, [
22
+ var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, unstableMiddleware = _ref.unstableMiddleware, hooks = _object_without_properties(_ref, [
23
23
  "default",
24
- "middleware"
24
+ "middleware",
25
+ "unstableMiddleware"
25
26
  ]);
26
27
  return {
27
28
  defaultExports,
29
+ unstableMiddleware,
28
30
  hooks,
29
31
  middleware
30
32
  };
package/dist/esm-node/server.js CHANGED
@@ -8,10 +8,12 @@ var HOOKS;
8
8
  class Storage {
9
9
  reset() {
10
10
  this.middlewares = [];
11
+ this.unstableMiddlewares = [];
11
12
  this.hooks = {};
12
13
  }
13
14
  constructor() {
14
15
  this.middlewares = [];
16
+ this.unstableMiddlewares = [];
15
17
  this.hooks = {};
16
18
  }
17
19
  }
@@ -40,6 +42,11 @@ const compose = (middlewares) => {
40
42
  return dispatch;
41
43
  };
42
44
  };
45
+ function getFactory(storage) {
46
+ const { middlewares } = storage;
47
+ const factory = compose(middlewares);
48
+ return factory;
49
+ }
43
50
  var server_default = () => ({
44
51
  name: "@modern-js/plugin-server",
45
52
  setup: (api) => {
@@ -49,7 +56,7 @@ var server_default = () => ({
49
56
  const pwd = isProd() ? distDirectory : appDirectory;
50
57
  const loadMod = () => {
51
58
  const { middleware: unstableMiddleware } = loadMiddleware(pwd);
52
- const { defaultExports, hooks, middleware } = loadServerMod(pwd);
59
+ const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = loadServerMod(pwd);
53
60
  if (defaultExports) {
54
61
  defaultExports(transformAPI);
55
62
  }
@@ -65,7 +72,9 @@ var server_default = () => ({
65
72
  storage.middlewares = [].concat(middleware);
66
73
  }
67
74
  storage.middlewares = storage.middlewares.concat(unstableMiddleware);
75
+ storage.unstableMiddlewares.push(...unstableMiddlewares || []);
68
76
  };
77
+ let factory;
69
78
  return {
70
79
  prepare() {
71
80
  loadMod();
@@ -73,6 +82,7 @@ var server_default = () => ({
73
82
  reset() {
74
83
  storage.reset();
75
84
  loadMod();
85
+ factory = getFactory(storage);
76
86
  },
77
87
  afterMatch(context, next) {
78
88
  if (!storage.hooks.afterMatch) {
@@ -87,8 +97,11 @@ var server_default = () => ({
87
97
  return storage.hooks.afterRender(context, next);
88
98
  },
89
99
  prepareWebServer() {
90
- const { middlewares } = storage;
91
- const factory = compose(middlewares);
100
+ const { unstableMiddlewares } = storage;
101
+ if (unstableMiddlewares.length > 0) {
102
+ return unstableMiddlewares;
103
+ }
104
+ factory = getFactory(storage);
92
105
  return (ctx) => {
93
106
  const { source: { res } } = ctx;
94
107
  return new Promise((resolve, reject) => {
package/dist/esm-node/utils.js CHANGED
@@ -16,9 +16,10 @@ const loadServerMod = (pwd = process.cwd()) => {
16
16
  const mod = requireExistModule(webAppPath, {
17
17
  interop: false
18
18
  });
19
- const { default: defaultExports, middleware, ...hooks } = mod || {};
19
+ const { default: defaultExports, middleware, unstableMiddleware, ...hooks } = mod || {};
20
20
  return {
21
21
  defaultExports,
22
+ unstableMiddleware,
22
23
  hooks,
23
24
  middleware
24
25
  };
package/dist/types/utils.d.ts CHANGED
@@ -3,7 +3,8 @@ export type Hook = (ctx: HookContext, next: NextFunction) => void;
3
3
  export type Middleware = (ctx: MiddlewareContext, next: NextFunction) => void;
4
4
  export type ServerMod = {
5
5
  default: (args: any) => void;
6
- middleware: Middleware | Middleware[];
6
+ middleware: Middleware[];
7
+ unstableMiddleware: any[];
7
8
  afterMatch: Hook;
8
9
  afterRender: Hook;
9
10
  };
@@ -12,9 +13,10 @@ export declare const loadMiddleware: (pwd?: string) => {
12
13
  };
13
14
  export declare const loadServerMod: (pwd?: string) => {
14
15
  defaultExports: (args: any) => void;
16
+ unstableMiddleware: any[];
15
17
  hooks: {
16
18
  afterMatch: Hook;
17
19
  afterRender: Hook;
18
20
  };
19
- middleware: Middleware | Middleware[];
21
+ middleware: Middleware[];
20
22
  };
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.49.4",
18
+ "version": "2.51.0",
19
19
  "types": "./dist/types/cli.d.ts",
20
20
  "jsnext:source": "./src/cli",
21
21
  "main": "./dist/cjs/cli.js",
@@ -51,20 +51,20 @@
51
51
  },
52
52
  "dependencies": {
53
53
  "@swc/helpers": "0.5.3",
54
- "@modern-js/utils": "2.49.4",
55
- "@modern-js/server-utils": "2.49.4"
54
+ "@modern-js/utils": "2.51.0",
55
+ "@modern-js/server-utils": "2.51.0"
56
56
  },
57
57
  "devDependencies": {
58
58
  "typescript": "^5",
59
59
  "@types/jest": "^29",
60
60
  "@types/node": "^14",
61
61
  "jest": "^29",
62
- "@modern-js/server-core": "2.49.4",
63
- "@modern-js/core": "2.49.4",
64
- "@modern-js/app-tools": "2.49.4",
65
- "@scripts/build": "2.49.4",
66
- "@scripts/jest-config": "2.49.4",
67
- "@modern-js/types": "2.49.4"
62
+ "@modern-js/server-core": "2.51.0",
63
+ "@modern-js/app-tools": "2.51.0",
64
+ "@modern-js/core": "2.51.0",
65
+ "@scripts/build": "2.51.0",
66
+ "@scripts/jest-config": "2.51.0",
67
+ "@modern-js/types": "2.51.0"
68
68
  },
69
69
  "sideEffects": [
70
70
  "*.css",