@modern-js/plugin-server 0.0.0-nightly-20240515170634 → 0.0.0-nightly-20240517170615

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 +7 -2
  2. package/dist/cjs/utils.js +2 -1
  3. package/dist/esm/server.js +9 -2
  4. package/dist/esm/utils.js +4 -2
  5. package/dist/esm-node/server.js +7 -2
  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
@@ -38,6 +38,7 @@ class Storage {
38
38
  }
39
39
  constructor() {
40
40
  this.middlewares = [];
41
+ this.unstableMiddlewares = [];
41
42
  this.hooks = {};
42
43
  }
43
44
  }
@@ -75,7 +76,7 @@ var server_default = () => ({
75
76
  const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
76
77
  const loadMod = () => {
77
78
  const { middleware: unstableMiddleware } = (0, import_utils2.loadMiddleware)(pwd);
78
- const { defaultExports, hooks, middleware } = (0, import_utils2.loadServerMod)(pwd);
79
+ const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = (0, import_utils2.loadServerMod)(pwd);
79
80
  if (defaultExports) {
80
81
  defaultExports(transformAPI);
81
82
  }
@@ -91,6 +92,7 @@ var server_default = () => ({
91
92
  storage.middlewares = [].concat(middleware);
92
93
  }
93
94
  storage.middlewares = storage.middlewares.concat(unstableMiddleware);
95
+ storage.unstableMiddlewares.push(...unstableMiddlewares || []);
94
96
  };
95
97
  return {
96
98
  prepare() {
@@ -113,7 +115,10 @@ var server_default = () => ({
113
115
  return storage.hooks.afterRender(context, next);
114
116
  },
115
117
  prepareWebServer() {
116
- const { middlewares } = storage;
118
+ const { middlewares, unstableMiddlewares } = storage;
119
+ if (unstableMiddlewares.length > 0) {
120
+ return unstableMiddlewares;
121
+ }
117
122
  const factory = compose(middlewares);
118
123
  return (ctx) => {
119
124
  const { source: { res } } = ctx;
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,6 +12,7 @@ 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;
@@ -58,8 +60,9 @@ function server_default() {
58
60
  var transformAPI = createTransformAPI(storage);
59
61
  var pwd = isProd() ? distDirectory : appDirectory;
60
62
  var loadMod = function() {
63
+ var _storage_unstableMiddlewares;
61
64
  var _loadMiddleware = loadMiddleware(pwd), unstableMiddleware = _loadMiddleware.middleware;
62
- var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware;
65
+ var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware, unstableMiddlewares = _loadServerMod.unstableMiddleware;
63
66
  if (defaultExports) {
64
67
  defaultExports(transformAPI);
65
68
  }
@@ -75,6 +78,7 @@ function server_default() {
75
78
  storage.middlewares = [].concat(middleware);
76
79
  }
77
80
  storage.middlewares = storage.middlewares.concat(unstableMiddleware);
81
+ (_storage_unstableMiddlewares = storage.unstableMiddlewares).push.apply(_storage_unstableMiddlewares, _to_consumable_array(unstableMiddlewares || []));
78
82
  };
79
83
  return {
80
84
  prepare: function prepare() {
@@ -97,7 +101,10 @@ function server_default() {
97
101
  return storage.hooks.afterRender(context, next);
98
102
  },
99
103
  prepareWebServer: function prepareWebServer() {
100
- var middlewares = storage.middlewares;
104
+ var middlewares = storage.middlewares, unstableMiddlewares = storage.unstableMiddlewares;
105
+ if (unstableMiddlewares.length > 0) {
106
+ return unstableMiddlewares;
107
+ }
101
108
  var factory = compose(middlewares);
102
109
  return function(ctx) {
103
110
  var res = ctx.source.res;
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
@@ -12,6 +12,7 @@ class Storage {
12
12
  }
13
13
  constructor() {
14
14
  this.middlewares = [];
15
+ this.unstableMiddlewares = [];
15
16
  this.hooks = {};
16
17
  }
17
18
  }
@@ -49,7 +50,7 @@ var server_default = () => ({
49
50
  const pwd = isProd() ? distDirectory : appDirectory;
50
51
  const loadMod = () => {
51
52
  const { middleware: unstableMiddleware } = loadMiddleware(pwd);
52
- const { defaultExports, hooks, middleware } = loadServerMod(pwd);
53
+ const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = loadServerMod(pwd);
53
54
  if (defaultExports) {
54
55
  defaultExports(transformAPI);
55
56
  }
@@ -65,6 +66,7 @@ var server_default = () => ({
65
66
  storage.middlewares = [].concat(middleware);
66
67
  }
67
68
  storage.middlewares = storage.middlewares.concat(unstableMiddleware);
69
+ storage.unstableMiddlewares.push(...unstableMiddlewares || []);
68
70
  };
69
71
  return {
70
72
  prepare() {
@@ -87,7 +89,10 @@ var server_default = () => ({
87
89
  return storage.hooks.afterRender(context, next);
88
90
  },
89
91
  prepareWebServer() {
90
- const { middlewares } = storage;
92
+ const { middlewares, unstableMiddlewares } = storage;
93
+ if (unstableMiddlewares.length > 0) {
94
+ return unstableMiddlewares;
95
+ }
91
96
  const factory = compose(middlewares);
92
97
  return (ctx) => {
93
98
  const { source: { res } } = ctx;
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": "0.0.0-nightly-20240515170634",
18
+ "version": "0.0.0-nightly-20240517170615",
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": "0.0.0-nightly-20240515170634",
55
- "@modern-js/server-utils": "0.0.0-nightly-20240515170634"
54
+ "@modern-js/utils": "0.0.0-nightly-20240517170615",
55
+ "@modern-js/server-utils": "0.0.0-nightly-20240517170615"
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/app-tools": "0.0.0-nightly-20240515170634",
63
- "@modern-js/server-core": "0.0.0-nightly-20240515170634",
64
- "@scripts/build": "0.0.0-nightly-20240515170634",
65
- "@modern-js/types": "0.0.0-nightly-20240515170634",
66
- "@modern-js/core": "0.0.0-nightly-20240515170634",
67
- "@scripts/jest-config": "0.0.0-nightly-20240515170634"
62
+ "@modern-js/server-core": "0.0.0-nightly-20240517170615",
63
+ "@modern-js/app-tools": "0.0.0-nightly-20240517170615",
64
+ "@scripts/build": "0.0.0-nightly-20240517170615",
65
+ "@modern-js/types": "0.0.0-nightly-20240517170615",
66
+ "@modern-js/core": "0.0.0-nightly-20240517170615",
67
+ "@scripts/jest-config": "0.0.0-nightly-20240517170615"
68
68
  },
69
69
  "sideEffects": [
70
70
  "*.css",