@modern-js/plugin-server 2.0.0-beta.4 → 2.0.0-beta.7

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 (9) hide show
  1. package/CHANGELOG.md +54 -0
  2. package/dist/js/modern/cli.js +6 -0
  3. package/dist/js/modern/server.js +7 -1
  4. package/dist/js/node/cli.js +17 -9
  5. package/dist/js/node/server.js +26 -19
  6. package/dist/js/treeshaking/cli.js +9 -0
  7. package/dist/js/treeshaking/server.js +7 -1
  8. package/dist/types/cli.d.ts +2 -5
  9. package/package.json +15 -18
package/CHANGELOG.md CHANGED
@@ -1,5 +1,59 @@
1
1
  # @modern-js/plugin-server
2
2
 
3
+ ## 2.0.0-beta.7
4
+
5
+ ### Major Changes
6
+
7
+ - dda38c9c3e: chore: v2
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [edd1cfb1af]
12
+ - Updated dependencies [dda38c9c3e]
13
+ - Updated dependencies [bbe4c4ab64]
14
+ - @modern-js/utils@2.0.0-beta.7
15
+ - @modern-js/server-utils@2.0.0-beta.7
16
+ - @modern-js/babel-compiler@2.0.0-beta.7
17
+
18
+ ## 2.0.0-beta.6
19
+
20
+ ### Major Changes
21
+
22
+ - dda38c9c3e: chore: v2
23
+
24
+ ### Patch Changes
25
+
26
+ - 3bbea92b2a: feat: support Hook、Middleware new API
27
+ feat: 支持 Hook、Middleware 的新 API
28
+ - Updated dependencies [9b915e0c10]
29
+ - Updated dependencies [7879e8f711]
30
+ - Updated dependencies [d4e8e6fb90]
31
+ - Updated dependencies [6aca875011]
32
+ - Updated dependencies [2e6031955e]
33
+ - Updated dependencies [7b7d12cf8f]
34
+ - Updated dependencies [7efeed4]
35
+ - Updated dependencies [92f0eade39]
36
+ - Updated dependencies [edd1cfb1af]
37
+ - Updated dependencies [cc971eabfc]
38
+ - Updated dependencies [5b9049f2e9]
39
+ - Updated dependencies [a8642da58f]
40
+ - Updated dependencies [92004d1906]
41
+ - Updated dependencies [b8bbe036c7]
42
+ - Updated dependencies [c2bb0f1745]
43
+ - Updated dependencies [d5a31df781]
44
+ - Updated dependencies [dda38c9c3e]
45
+ - Updated dependencies [3bbea92b2a]
46
+ - Updated dependencies [b710adb843]
47
+ - Updated dependencies [ea7cf06257]
48
+ - Updated dependencies [bbe4c4ab64]
49
+ - Updated dependencies [e4558a0bc4]
50
+ - Updated dependencies [abf3421a75]
51
+ - Updated dependencies [543be9558e]
52
+ - Updated dependencies [14b712da84]
53
+ - @modern-js/server-utils@2.0.0-beta.6
54
+ - @modern-js/utils@2.0.0-beta.6
55
+ - @modern-js/babel-compiler@2.0.0-beta.6
56
+
3
57
  ## 2.0.0-beta.4
4
58
 
5
59
  ### Major Changes
package/dist/js/modern/cli.js CHANGED
@@ -64,6 +64,12 @@ var cli_default = () => ({
64
64
  );
65
65
  }
66
66
  });
67
+ },
68
+ collectServerPlugins({ plugins }) {
69
+ plugins.push({
70
+ "@modern-js/plugin-server": "@modern-js/plugin-server/server"
71
+ });
72
+ return { plugins };
67
73
  }
68
74
  })
69
75
  });
package/dist/js/modern/server.js CHANGED
@@ -74,11 +74,16 @@ var server_default = () => ({
74
74
  const transformAPI = createTransformAPI(storage);
75
75
  const pwd = isProd() ? distDirectory : appDirectory;
76
76
  const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
77
+ const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
77
78
  const loadMod = () => {
78
79
  const mod = requireExistModule(webAppPath, {
79
80
  interop: false
80
81
  });
81
- const _a = mod, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
82
+ const middlewareMode = requireExistModule(middlewarePath, {
83
+ interop: false
84
+ });
85
+ const _a = mod || {}, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
86
+ const { middleware: unstableMiddleware = [] } = middlewareMode || {};
82
87
  if (defaultExports) {
83
88
  defaultExports(transformAPI);
84
89
  }
@@ -91,6 +96,7 @@ var server_default = () => ({
91
96
  if (middleware) {
92
97
  storage.middlewares = [].concat(middleware);
93
98
  }
99
+ storage.middlewares = storage.middlewares.concat(unstableMiddleware);
94
100
  };
95
101
  return {
96
102
  prepare() {
package/dist/js/node/cli.js CHANGED
@@ -21,15 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
21
  mod
22
22
  ));
23
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
26
- default: () => cli_default
27
- });
28
- module.exports = __toCommonJS(stdin_exports);
29
- var import_fs = __toESM(require("fs"));
30
- var import_path = __toESM(require("path"));
31
- var import_server_utils = require("@modern-js/server-utils");
32
- var import_utils = require("@modern-js/utils");
33
24
  var __async = (__this, __arguments, generator) => {
34
25
  return new Promise((resolve, reject) => {
35
26
  var fulfilled = (value) => {
@@ -50,6 +41,15 @@ var __async = (__this, __arguments, generator) => {
50
41
  step((generator = generator.apply(__this, __arguments)).next());
51
42
  });
52
43
  };
44
+ var cli_exports = {};
45
+ __export(cli_exports, {
46
+ default: () => cli_default
47
+ });
48
+ module.exports = __toCommonJS(cli_exports);
49
+ var import_fs = __toESM(require("fs"));
50
+ var import_path = __toESM(require("path"));
51
+ var import_server_utils = require("@modern-js/server-utils");
52
+ var import_utils = require("@modern-js/utils");
53
53
  const TS_CONFIG_FILENAME = "tsconfig.json";
54
54
  var cli_default = () => ({
55
55
  name: "@modern-js/plugin-server",
@@ -92,6 +92,14 @@ var cli_default = () => ({
92
92
  );
93
93
  }
94
94
  });
95
+ },
96
+ collectServerPlugins({ plugins }) {
97
+ plugins.push({
98
+ "@modern-js/plugin-server": "@modern-js/plugin-server/server"
99
+ });
100
+ return { plugins };
95
101
  }
96
102
  })
97
103
  });
104
+ // Annotate the CommonJS export names for ESM import in node:
105
+ 0 && (module.exports = {});
package/dist/js/node/server.js CHANGED
@@ -2,8 +2,22 @@ var __create = Object.create;
2
2
  var __defProp = Object.defineProperty;
3
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
4
  var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
6
  var __getProtoOf = Object.getPrototypeOf;
6
7
  var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
9
+ var __objRest = (source, exclude) => {
10
+ var target = {};
11
+ for (var prop in source)
12
+ if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
13
+ target[prop] = source[prop];
14
+ if (source != null && __getOwnPropSymbols)
15
+ for (var prop of __getOwnPropSymbols(source)) {
16
+ if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
17
+ target[prop] = source[prop];
18
+ }
19
+ return target;
20
+ };
7
21
  var __export = (target, all) => {
8
22
  for (var name in all)
9
23
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,28 +35,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
35
  mod
22
36
  ));
23
37
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
38
+ var server_exports = {};
39
+ __export(server_exports, {
26
40
  default: () => server_default
27
41
  });
28
- module.exports = __toCommonJS(stdin_exports);
42
+ module.exports = __toCommonJS(server_exports);
29
43
  var import_path = __toESM(require("path"));
30
44
  var import_utils = require("@modern-js/utils");
31
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
32
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
33
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
34
- var __objRest = (source, exclude) => {
35
- var target = {};
36
- for (var prop in source)
37
- if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
38
- target[prop] = source[prop];
39
- if (source != null && __getOwnPropSymbols)
40
- for (var prop of __getOwnPropSymbols(source)) {
41
- if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
42
- target[prop] = source[prop];
43
- }
44
- return target;
45
- };
46
45
  const WEB_APP_NAME = "index";
47
46
  var HOOKS = /* @__PURE__ */ ((HOOKS2) => {
48
47
  HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -97,11 +96,16 @@ var server_default = () => ({
97
96
  const transformAPI = createTransformAPI(storage);
98
97
  const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
99
98
  const webAppPath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, WEB_APP_NAME);
99
+ const middlewarePath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, "_middleware");
100
100
  const loadMod = () => {
101
101
  const mod = (0, import_utils.requireExistModule)(webAppPath, {
102
102
  interop: false
103
103
  });
104
- const _a = mod, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
104
+ const middlewareMode = (0, import_utils.requireExistModule)(middlewarePath, {
105
+ interop: false
106
+ });
107
+ const _a = mod || {}, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
108
+ const { middleware: unstableMiddleware = [] } = middlewareMode || {};
105
109
  if (defaultExports) {
106
110
  defaultExports(transformAPI);
107
111
  }
@@ -114,6 +118,7 @@ var server_default = () => ({
114
118
  if (middleware) {
115
119
  storage.middlewares = [].concat(middleware);
116
120
  }
121
+ storage.middlewares = storage.middlewares.concat(unstableMiddleware);
117
122
  };
118
123
  return {
119
124
  prepare() {
@@ -162,3 +167,5 @@ var server_default = () => ({
162
167
  };
163
168
  }
164
169
  });
170
+ // Annotate the CommonJS export names for ESM import in node:
171
+ 0 && (module.exports = {});
package/dist/js/treeshaking/cli.js CHANGED
@@ -184,6 +184,15 @@ var cli_default = function() {
184
184
  }
185
185
  });
186
186
  })();
187
+ },
188
+ collectServerPlugins: function collectServerPlugins(param) {
189
+ var plugins = param.plugins;
190
+ plugins.push({
191
+ "@modern-js/plugin-server": "@modern-js/plugin-server/server"
192
+ });
193
+ return {
194
+ plugins: plugins
195
+ };
187
196
  }
188
197
  };
189
198
  }
package/dist/js/treeshaking/server.js CHANGED
@@ -121,14 +121,19 @@ var server_default = function() {
121
121
  var transformAPI = createTransformAPI(storage);
122
122
  var pwd = isProd() ? distDirectory : appDirectory;
123
123
  var webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
124
+ var middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
124
125
  var loadMod = function() {
125
126
  var mod = requireExistModule(webAppPath, {
126
127
  interop: false
127
128
  });
128
- var defaultExports = mod.default, middleware = mod.middleware, hooks = _objectWithoutProperties(mod, [
129
+ var middlewareMode = requireExistModule(middlewarePath, {
130
+ interop: false
131
+ });
132
+ var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _objectWithoutProperties(_ref, [
129
133
  "default",
130
134
  "middleware"
131
135
  ]);
136
+ var ref = middlewareMode || {}, tmp = ref.middleware, unstableMiddleware = tmp === void 0 ? [] : tmp;
132
137
  if (defaultExports) {
133
138
  defaultExports(transformAPI);
134
139
  }
@@ -141,6 +146,7 @@ var server_default = function() {
141
146
  if (middleware) {
142
147
  storage.middlewares = [].concat(middleware);
143
148
  }
149
+ storage.middlewares = storage.middlewares.concat(unstableMiddleware);
144
150
  };
145
151
  return {
146
152
  prepare: function prepare() {
package/dist/types/cli.d.ts CHANGED
@@ -1,9 +1,6 @@
1
1
  import type { CliPlugin } from '@modern-js/core';
2
- import { UserConfig } from '@modern-js/server-core';
2
+ import type { AppTools } from '@modern-js/app-tools';
3
3
 
4
- declare const _default: () => CliPlugin<{
5
- userConfig: UserConfig;
6
- normalizedConfig: Required<UserConfig>;
7
- }>;
4
+ declare const _default: () => CliPlugin<AppTools>;
8
5
 
9
6
  export default _default;
package/package.json CHANGED
@@ -11,18 +11,14 @@
11
11
  "modern",
12
12
  "modern.js"
13
13
  ],
14
- "version": "2.0.0-beta.4",
15
- "types": "./dist/types/server.d.ts",
16
- "jsnext:source": "./src/server.ts",
17
- "main": "./dist/js/node/server.js",
14
+ "version": "2.0.0-beta.7",
15
+ "types": "./dist/types/cli.d.ts",
16
+ "jsnext:source": "./src/cli",
17
+ "main": "./dist/js/node/cli.js",
18
18
  "exports": {
19
19
  ".": {
20
- "node": {
21
- "jsnext:source": "./src/server.ts",
22
- "import": "./dist/js/modern/server.js",
23
- "require": "./dist/js/node/server.js"
24
- },
25
- "default": "./dist/js/treeshaking/server.js"
20
+ "jsnext:source": "./src/cli.ts",
21
+ "default": "./dist/js/node/cli.js"
26
22
  },
27
23
  "./cli": {
28
24
  "jsnext:source": "./src/cli.ts",
@@ -48,20 +44,21 @@
48
44
  },
49
45
  "dependencies": {
50
46
  "@babel/runtime": "^7.18.0",
51
- "@modern-js/babel-compiler": "2.0.0-beta.4",
52
- "@modern-js/server-utils": "2.0.0-beta.4",
53
- "@modern-js/utils": "2.0.0-beta.4"
47
+ "@modern-js/babel-compiler": "2.0.0-beta.7",
48
+ "@modern-js/server-utils": "2.0.0-beta.7",
49
+ "@modern-js/utils": "2.0.0-beta.7"
54
50
  },
55
51
  "devDependencies": {
56
52
  "typescript": "^4",
57
53
  "@types/jest": "^27",
58
54
  "@types/node": "^14",
59
55
  "jest": "^27",
60
- "@modern-js/server-core": "2.0.0-beta.4",
61
- "@modern-js/core": "2.0.0-beta.4",
62
- "@scripts/build": "2.0.0-beta.4",
63
- "@modern-js/types": "2.0.0-beta.4",
64
- "@scripts/jest-config": "2.0.0-beta.4"
56
+ "@modern-js/server-core": "2.0.0-beta.7",
57
+ "@modern-js/app-tools": "2.0.0-beta.7",
58
+ "@modern-js/core": "2.0.0-beta.7",
59
+ "@scripts/build": "2.0.0-beta.7",
60
+ "@modern-js/types": "2.0.0-beta.7",
61
+ "@scripts/jest-config": "2.0.0-beta.7"
65
62
  },
66
63
  "sideEffects": [
67
64
  "*.css",