@modern-js/plugin-server 2.33.1 → 2.34.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 (9) hide show
  1. package/dist/cjs/server.js +29 -22
  2. package/dist/cjs/utils.js +45 -0
  3. package/dist/esm/server.js +14 -24
  4. package/dist/esm/utils.js +31 -0
  5. package/dist/esm-node/server.js +14 -20
  6. package/dist/esm-node/utils.js +25 -0
  7. package/dist/types/server.d.ts +5 -0
  8. package/dist/types/utils.d.ts +20 -0
  9. package/package.json +9 -9
package/dist/cjs/server.js CHANGED
@@ -2,17 +2,30 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- Object.defineProperty(exports, "default", {
6
- enumerable: true,
7
- get: function() {
5
+ function _export(target, all) {
6
+ for (var name in all)
7
+ Object.defineProperty(target, name, {
8
+ enumerable: true,
9
+ get: all[name]
10
+ });
11
+ }
12
+ _export(exports, {
13
+ loadMiddleware: function() {
14
+ return _utils1.loadMiddleware;
15
+ },
16
+ loadServerMod: function() {
17
+ return _utils1.loadServerMod;
18
+ },
19
+ compose: function() {
20
+ return compose;
21
+ },
22
+ default: function() {
8
23
  return _default;
9
24
  }
10
25
  });
11
26
  const _define_property = require("@swc/helpers/_/_define_property");
12
- const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
13
- const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
14
27
  const _utils = require("@modern-js/utils");
15
- const WEB_APP_NAME = "index";
28
+ const _utils1 = require("./utils");
16
29
  var HOOKS;
17
30
  (function(HOOKS2) {
18
31
  HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -60,26 +73,20 @@ const _default = () => ({
60
73
  const storage = new Storage();
61
74
  const transformAPI = createTransformAPI(storage);
62
75
  const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
63
- const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
64
- const middlewarePath = _path.default.resolve(pwd, _utils.SERVER_DIR, "_middleware");
65
76
  const loadMod = () => {
66
- const mod = (0, _utils.requireExistModule)(webAppPath, {
67
- interop: false
68
- });
69
- const middlewareMode = (0, _utils.requireExistModule)(middlewarePath, {
70
- interop: false
71
- });
72
- const { default: defaultExports, middleware, ...hooks } = mod || {};
73
- const { middleware: unstableMiddleware = [] } = middlewareMode || {};
77
+ const { middleware: unstableMiddleware } = (0, _utils1.loadMiddleware)(pwd);
78
+ const { defaultExports, hooks, middleware } = (0, _utils1.loadServerMod)(pwd);
74
79
  if (defaultExports) {
75
80
  defaultExports(transformAPI);
76
81
  }
77
- Object.values(HOOKS).forEach((key) => {
78
- const fn = hooks[key];
79
- if (fn) {
80
- storage.hooks[key] = fn;
81
- }
82
- });
82
+ if (hooks) {
83
+ Object.values(HOOKS).forEach((key) => {
84
+ const fn = hooks[key];
85
+ if (fn) {
86
+ storage.hooks[key] = fn;
87
+ }
88
+ });
89
+ }
83
90
  if (middleware) {
84
91
  storage.middlewares = [].concat(middleware);
85
92
  }
package/dist/cjs/utils.js ADDED
@@ -0,0 +1,45 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ function _export(target, all) {
6
+ for (var name in all)
7
+ Object.defineProperty(target, name, {
8
+ enumerable: true,
9
+ get: all[name]
10
+ });
11
+ }
12
+ _export(exports, {
13
+ loadMiddleware: function() {
14
+ return loadMiddleware;
15
+ },
16
+ loadServerMod: function() {
17
+ return loadServerMod;
18
+ }
19
+ });
20
+ const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
21
+ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
22
+ const _utils = require("@modern-js/utils");
23
+ const WEB_APP_NAME = "index";
24
+ const loadMiddleware = (pwd = process.cwd()) => {
25
+ const middlewarePath = _path.default.resolve(pwd, _utils.SERVER_DIR, "_middleware");
26
+ const middlewareMode = (0, _utils.requireExistModule)(middlewarePath, {
27
+ interop: false
28
+ });
29
+ const { middleware = [] } = middlewareMode || {};
30
+ return {
31
+ middleware
32
+ };
33
+ };
34
+ const loadServerMod = (pwd = process.cwd()) => {
35
+ const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
36
+ const mod = (0, _utils.requireExistModule)(webAppPath, {
37
+ interop: false
38
+ });
39
+ const { default: defaultExports, middleware, ...hooks } = mod || {};
40
+ return {
41
+ defaultExports,
42
+ hooks,
43
+ middleware
44
+ };
45
+ };
package/dist/esm/server.js CHANGED
@@ -1,10 +1,9 @@
1
1
  import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
2
2
  import { _ as _create_class } from "@swc/helpers/_/_create_class";
3
3
  import { _ as _define_property } from "@swc/helpers/_/_define_property";
4
- import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
5
- import path from "path";
6
- import { isProd, logger, requireExistModule, SERVER_DIR } from "@modern-js/utils";
7
- var WEB_APP_NAME = "index";
4
+ import { isProd, logger } from "@modern-js/utils";
5
+ import { loadMiddleware, loadServerMod } from "./utils";
6
+ export { loadMiddleware, loadServerMod };
8
7
  var HOOKS;
9
8
  (function(HOOKS2) {
10
9
  HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -43,7 +42,7 @@ var createTransformAPI = function(storage) {
43
42
  }
44
43
  });
45
44
  };
46
- var compose = function(middlewares) {
45
+ export var compose = function(middlewares) {
47
46
  return function(ctx, resolve, reject) {
48
47
  var i = 0;
49
48
  var dispatch = function() {
@@ -65,29 +64,20 @@ export default function() {
65
64
  var storage = new Storage();
66
65
  var transformAPI = createTransformAPI(storage);
67
66
  var pwd = isProd() ? distDirectory : appDirectory;
68
- var webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
69
- var middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
70
67
  var loadMod = function() {
71
- var mod = requireExistModule(webAppPath, {
72
- interop: false
73
- });
74
- var middlewareMode = requireExistModule(middlewarePath, {
75
- interop: false
76
- });
77
- var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _object_without_properties(_ref, [
78
- "default",
79
- "middleware"
80
- ]);
81
- var _ref1 = middlewareMode || {}, tmp = _ref1.middleware, unstableMiddleware = tmp === void 0 ? [] : tmp;
68
+ var _loadMiddleware = loadMiddleware(pwd), unstableMiddleware = _loadMiddleware.middleware;
69
+ var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware;
82
70
  if (defaultExports) {
83
71
  defaultExports(transformAPI);
84
72
  }
85
- Object.values(HOOKS).forEach(function(key) {
86
- var fn = hooks[key];
87
- if (fn) {
88
- storage.hooks[key] = fn;
89
- }
90
- });
73
+ if (hooks) {
74
+ Object.values(HOOKS).forEach(function(key) {
75
+ var fn = hooks[key];
76
+ if (fn) {
77
+ storage.hooks[key] = fn;
78
+ }
79
+ });
80
+ }
91
81
  if (middleware) {
92
82
  storage.middlewares = [].concat(middleware);
93
83
  }
package/dist/esm/utils.js ADDED
@@ -0,0 +1,31 @@
1
+ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
2
+ import path from "path";
3
+ import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
4
+ var WEB_APP_NAME = "index";
5
+ export var loadMiddleware = function() {
6
+ var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.cwd();
7
+ var middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
8
+ var middlewareMode = requireExistModule(middlewarePath, {
9
+ interop: false
10
+ });
11
+ var _ref = middlewareMode || {}, _ref_middleware = _ref.middleware, middleware = _ref_middleware === void 0 ? [] : _ref_middleware;
12
+ return {
13
+ middleware: middleware
14
+ };
15
+ };
16
+ export var loadServerMod = function() {
17
+ var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.cwd();
18
+ var webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
19
+ var mod = requireExistModule(webAppPath, {
20
+ interop: false
21
+ });
22
+ var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _object_without_properties(_ref, [
23
+ "default",
24
+ "middleware"
25
+ ]);
26
+ return {
27
+ defaultExports: defaultExports,
28
+ hooks: hooks,
29
+ middleware: middleware
30
+ };
31
+ };
package/dist/esm-node/server.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { _ as _define_property } from "@swc/helpers/_/_define_property";
2
- import path from "path";
3
- import { isProd, logger, requireExistModule, SERVER_DIR } from "@modern-js/utils";
4
- const WEB_APP_NAME = "index";
2
+ import { isProd, logger } from "@modern-js/utils";
3
+ import { loadMiddleware, loadServerMod } from "./utils";
4
+ export { loadMiddleware, loadServerMod };
5
5
  var HOOKS;
6
6
  (function(HOOKS2) {
7
7
  HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -28,7 +28,7 @@ const createTransformAPI = (storage) => new Proxy({}, {
28
28
  };
29
29
  }
30
30
  });
31
- const compose = (middlewares) => {
31
+ export const compose = (middlewares) => {
32
32
  return (ctx, resolve, reject) => {
33
33
  let i = 0;
34
34
  const dispatch = () => {
@@ -49,26 +49,20 @@ export default () => ({
49
49
  const storage = new Storage();
50
50
  const transformAPI = createTransformAPI(storage);
51
51
  const pwd = isProd() ? distDirectory : appDirectory;
52
- const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
53
- const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
54
52
  const loadMod = () => {
55
- const mod = requireExistModule(webAppPath, {
56
- interop: false
57
- });
58
- const middlewareMode = requireExistModule(middlewarePath, {
59
- interop: false
60
- });
61
- const { default: defaultExports, middleware, ...hooks } = mod || {};
62
- const { middleware: unstableMiddleware = [] } = middlewareMode || {};
53
+ const { middleware: unstableMiddleware } = loadMiddleware(pwd);
54
+ const { defaultExports, hooks, middleware } = loadServerMod(pwd);
63
55
  if (defaultExports) {
64
56
  defaultExports(transformAPI);
65
57
  }
66
- Object.values(HOOKS).forEach((key) => {
67
- const fn = hooks[key];
68
- if (fn) {
69
- storage.hooks[key] = fn;
70
- }
71
- });
58
+ if (hooks) {
59
+ Object.values(HOOKS).forEach((key) => {
60
+ const fn = hooks[key];
61
+ if (fn) {
62
+ storage.hooks[key] = fn;
63
+ }
64
+ });
65
+ }
72
66
  if (middleware) {
73
67
  storage.middlewares = [].concat(middleware);
74
68
  }
package/dist/esm-node/utils.js ADDED
@@ -0,0 +1,25 @@
1
+ import path from "path";
2
+ import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
3
+ const WEB_APP_NAME = "index";
4
+ export const loadMiddleware = (pwd = process.cwd()) => {
5
+ const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
6
+ const middlewareMode = requireExistModule(middlewarePath, {
7
+ interop: false
8
+ });
9
+ const { middleware = [] } = middlewareMode || {};
10
+ return {
11
+ middleware
12
+ };
13
+ };
14
+ export const loadServerMod = (pwd = process.cwd()) => {
15
+ const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
16
+ const mod = requireExistModule(webAppPath, {
17
+ interop: false
18
+ });
19
+ const { default: defaultExports, middleware, ...hooks } = mod || {};
20
+ return {
21
+ defaultExports,
22
+ hooks,
23
+ middleware
24
+ };
25
+ };
package/dist/types/server.d.ts CHANGED
@@ -1,3 +1,8 @@
1
1
  import type { ServerPlugin } from '@modern-js/server-core';
2
+ import type { MiddlewareContext, NextFunction } from '@modern-js/types';
3
+ import { Hook, Middleware, loadMiddleware, loadServerMod } from './utils';
4
+ export { loadMiddleware, loadServerMod };
5
+ export type { Hook, Middleware };
6
+ export declare const compose: (middlewares: Middleware[]) => (ctx: MiddlewareContext, resolve: (value: void | PromiseLike<void>) => void, reject: (reason?: any) => void) => NextFunction;
2
7
  declare const _default: () => ServerPlugin;
3
8
  export default _default;
package/dist/types/utils.d.ts ADDED
@@ -0,0 +1,20 @@
1
+ import type { HookContext, MiddlewareContext, NextFunction } from '@modern-js/types';
2
+ export type Hook = (ctx: HookContext, next: NextFunction) => void;
3
+ export type Middleware = (ctx: MiddlewareContext, next: NextFunction) => void;
4
+ export type ServerMod = {
5
+ default: (args: any) => void;
6
+ middleware: Middleware | Middleware[];
7
+ afterMatch: Hook;
8
+ afterRender: Hook;
9
+ };
10
+ export declare const loadMiddleware: (pwd?: string) => {
11
+ middleware: any;
12
+ };
13
+ export declare const loadServerMod: (pwd?: string) => {
14
+ defaultExports: (args: any) => void;
15
+ hooks: {
16
+ afterMatch: Hook;
17
+ afterRender: Hook;
18
+ };
19
+ middleware: Middleware | Middleware[];
20
+ };
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.33.1",
18
+ "version": "2.34.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.1",
54
- "@modern-js/server-utils": "2.33.1",
55
- "@modern-js/utils": "2.33.1"
54
+ "@modern-js/server-utils": "2.34.0",
55
+ "@modern-js/utils": "2.34.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/core": "2.33.1",
63
- "@modern-js/server-core": "2.33.1",
64
- "@modern-js/types": "2.33.1",
65
- "@modern-js/app-tools": "2.33.1",
66
- "@scripts/build": "2.33.1",
67
- "@scripts/jest-config": "2.33.1"
62
+ "@modern-js/app-tools": "2.34.0",
63
+ "@modern-js/core": "2.34.0",
64
+ "@modern-js/types": "2.34.0",
65
+ "@modern-js/server-core": "2.34.0",
66
+ "@scripts/build": "2.34.0",
67
+ "@scripts/jest-config": "2.34.0"
68
68
  },
69
69
  "sideEffects": [
70
70
  "*.css",