@modern-js/plugin-server 0.0.0-next-20221207072952 → 0.0.0-next-20221207092640

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.
package/CHANGELOG.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # @modern-js/plugin-server
2
2
 
3
- ## 0.0.0-next-20221207072952
3
+ ## 0.0.0-next-20221207092640
4
4
 
5
5
  ### Major Changes
6
6
 
@@ -31,9 +31,9 @@
31
31
  - Updated dependencies [abf3421a7]
32
32
  - Updated dependencies [543be9558]
33
33
  - Updated dependencies [14b712da8]
34
- - @modern-js/server-utils@0.0.0-next-20221207072952
35
- - @modern-js/utils@0.0.0-next-20221207072952
36
- - @modern-js/babel-compiler@0.0.0-next-20221207072952
34
+ - @modern-js/server-utils@0.0.0-next-20221207092640
35
+ - @modern-js/utils@0.0.0-next-20221207092640
36
+ - @modern-js/babel-compiler@0.0.0-next-20221207092640
37
37
 
38
38
  ## 2.0.0-beta.2
39
39
 
@@ -1,72 +1,53 @@
1
- var __async = (__this, __arguments, generator) => {
2
- return new Promise((resolve, reject) => {
3
- var fulfilled = (value) => {
4
- try {
5
- step(generator.next(value));
6
- } catch (e) {
7
- reject(e);
8
- }
9
- };
10
- var rejected = (value) => {
11
- try {
12
- step(generator.throw(value));
13
- } catch (e) {
14
- reject(e);
15
- }
16
- };
17
- var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
18
- step((generator = generator.apply(__this, __arguments)).next());
19
- });
20
- };
21
- import fs from "fs";
22
- import path from "path";
23
- import { compile } from "@modern-js/server-utils";
24
- import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
25
- const TS_CONFIG_FILENAME = "tsconfig.json";
26
- var cli_default = () => ({
27
- name: "@modern-js/plugin-server",
28
- setup: (api) => ({
1
+ import fs from 'fs';
2
+ import path from 'path';
3
+ import { compile } from '@modern-js/server-utils';
4
+ import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
5
+ const TS_CONFIG_FILENAME = 'tsconfig.json';
6
+ export default (() => ({
7
+ name: '@modern-js/plugin-server',
8
+ setup: api => ({
29
9
  config() {
30
10
  return {};
31
11
  },
32
- afterBuild() {
33
- return __async(this, null, function* () {
34
- const { appDirectory, distDirectory } = api.useAppContext();
35
- const modernConfig = api.useResolvedConfigContext();
36
- const distDir = path.resolve(distDirectory);
37
- const serverDir = path.resolve(appDirectory, SERVER_DIR);
38
- const sharedDir = path.resolve(appDirectory, SHARED_DIR);
39
- const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
40
- const sourceDirs = [];
41
- if (fs.existsSync(serverDir)) {
42
- sourceDirs.push(serverDir);
43
- }
44
- if (fs.existsSync(sharedDir)) {
45
- sourceDirs.push(sharedDir);
46
- }
47
- const { server } = modernConfig;
48
- const { alias, globalVars } = modernConfig.source;
49
- const { babel } = modernConfig.tools;
50
- if (sourceDirs.length > 0) {
51
- yield compile(
52
- appDirectory,
53
- {
54
- server,
55
- alias,
56
- globalVars,
57
- babelConfig: babel
58
- },
59
- {
60
- sourceDirs,
61
- distDir,
62
- tsconfigPath
63
- }
64
- );
65
- }
66
- });
12
+ async afterBuild() {
13
+ const {
14
+ appDirectory,
15
+ distDirectory
16
+ } = api.useAppContext();
17
+ const modernConfig = api.useResolvedConfigContext();
18
+ const distDir = path.resolve(distDirectory);
19
+ const serverDir = path.resolve(appDirectory, SERVER_DIR);
20
+ const sharedDir = path.resolve(appDirectory, SHARED_DIR);
21
+ const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
22
+ const sourceDirs = [];
23
+ if (fs.existsSync(serverDir)) {
24
+ sourceDirs.push(serverDir);
25
+ }
26
+ if (fs.existsSync(sharedDir)) {
27
+ sourceDirs.push(sharedDir);
28
+ }
29
+ const {
30
+ server
31
+ } = modernConfig;
32
+ const {
33
+ alias,
34
+ globalVars
35
+ } = modernConfig.source;
36
+ const {
37
+ babel
38
+ } = modernConfig.tools;
39
+ if (sourceDirs.length > 0) {
40
+ await compile(appDirectory, {
41
+ server,
42
+ alias,
43
+ globalVars,
44
+ babelConfig: babel
45
+ }, {
46
+ sourceDirs,
47
+ distDir,
48
+ tsconfigPath
49
+ });
50
+ }
67
51
  }
68
52
  })
69
- });
70
- export {
71
- cli_default as default
72
- };
53
+ }));
@@ -1,75 +1,59 @@
1
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
2
- var __hasOwnProp = Object.prototype.hasOwnProperty;
3
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
4
- var __objRest = (source, exclude) => {
5
- var target = {};
6
- for (var prop in source)
7
- if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
8
- target[prop] = source[prop];
9
- if (source != null && __getOwnPropSymbols)
10
- for (var prop of __getOwnPropSymbols(source)) {
11
- if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
12
- target[prop] = source[prop];
13
- }
14
- return target;
15
- };
16
- import path from "path";
17
- import {
18
- isProd,
19
- logger,
20
- requireExistModule,
21
- SERVER_DIR
22
- } from "@modern-js/utils";
23
- const WEB_APP_NAME = "index";
24
- var HOOKS = /* @__PURE__ */ ((HOOKS2) => {
25
- HOOKS2["AFTER_MATCH"] = "afterMatch";
26
- HOOKS2["AFTER_RENDER"] = "afterRender";
27
- return HOOKS2;
28
- })(HOOKS || {});
1
+ const _excluded = ["default", "middleware"];
2
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
3
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
4
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
6
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
7
+ import path from 'path';
8
+ import { isProd, logger, requireExistModule, SERVER_DIR } from '@modern-js/utils';
9
+ const WEB_APP_NAME = 'index';
10
+ var HOOKS;
11
+ (function (HOOKS) {
12
+ HOOKS["AFTER_MATCH"] = "afterMatch";
13
+ HOOKS["AFTER_RENDER"] = "afterRender";
14
+ })(HOOKS || (HOOKS = {}));
29
15
  class Storage {
30
16
  constructor() {
31
- this.middlewares = [];
32
- this.hooks = {};
17
+ _defineProperty(this, "middlewares", []);
18
+ _defineProperty(this, "hooks", {});
33
19
  }
34
20
  reset() {
35
21
  this.middlewares = [];
36
22
  this.hooks = {};
37
23
  }
38
24
  }
39
- const createTransformAPI = (storage) => new Proxy(
40
- {},
41
- {
42
- get(target, name) {
43
- if (name === "addMiddleware") {
44
- return (fn) => storage.middlewares.push(fn);
45
- }
46
- return (fn) => {
47
- logger.warn(
48
- "declare hook in default export is to be deprecated, use named export instead"
49
- );
50
- storage.hooks[name] = fn;
51
- };
25
+ const createTransformAPI = storage => new Proxy({}, {
26
+ get(target, name) {
27
+ if (name === 'addMiddleware') {
28
+ return fn => storage.middlewares.push(fn);
52
29
  }
30
+ return fn => {
31
+ logger.warn('declare hook in default export is to be deprecated, use named export instead');
32
+ storage.hooks[name] = fn;
33
+ };
53
34
  }
54
- );
55
- const compose = (middlewares) => {
35
+ });
36
+ const compose = middlewares => {
56
37
  return (ctx, resolve, reject) => {
57
38
  let i = 0;
58
39
  const dispatch = () => {
59
- var _a, _b;
40
+ var _handler, _handler$catch;
60
41
  const handler = middlewares[i++];
61
42
  if (!handler) {
62
43
  return resolve();
63
44
  }
64
- return (_b = (_a = handler(ctx, dispatch)) == null ? void 0 : _a.catch) == null ? void 0 : _b.call(_a, reject);
45
+ return (_handler = handler(ctx, dispatch)) === null || _handler === void 0 ? void 0 : (_handler$catch = _handler.catch) === null || _handler$catch === void 0 ? void 0 : _handler$catch.call(_handler, reject);
65
46
  };
66
47
  return dispatch;
67
48
  };
68
49
  };
69
- var server_default = () => ({
70
- name: "@modern-js/plugin-server",
71
- setup: (api) => {
72
- const { appDirectory, distDirectory } = api.useAppContext();
50
+ export default (() => ({
51
+ name: '@modern-js/plugin-server',
52
+ setup: api => {
53
+ const {
54
+ appDirectory,
55
+ distDirectory
56
+ } = api.useAppContext();
73
57
  const storage = new Storage();
74
58
  const transformAPI = createTransformAPI(storage);
75
59
  const pwd = isProd() ? distDirectory : appDirectory;
@@ -78,11 +62,17 @@ var server_default = () => ({
78
62
  const mod = requireExistModule(webAppPath, {
79
63
  interop: false
80
64
  });
81
- const _a = mod, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
65
+ const {
66
+ default: defaultExports,
67
+ middleware
68
+ } = mod,
69
+ hooks = _objectWithoutProperties(mod, _excluded);
82
70
  if (defaultExports) {
83
71
  defaultExports(transformAPI);
84
72
  }
85
- Object.values(HOOKS).forEach((key) => {
73
+
74
+ // named export hooks will overrides hooks in default export function
75
+ Object.values(HOOKS).forEach(key => {
86
76
  const fn = hooks[key];
87
77
  if (fn) {
88
78
  storage.hooks[key] = fn;
@@ -100,8 +90,10 @@ var server_default = () => ({
100
90
  storage.reset();
101
91
  loadMod();
102
92
  },
103
- gather({ addWebMiddleware }) {
104
- storage.middlewares.forEach((mid) => {
93
+ gather({
94
+ addWebMiddleware
95
+ }) {
96
+ storage.middlewares.forEach(mid => {
105
97
  addWebMiddleware(mid);
106
98
  });
107
99
  },
@@ -117,15 +109,21 @@ var server_default = () => ({
117
109
  }
118
110
  return storage.hooks.afterRender(context, next);
119
111
  },
120
- prepareWebServer({ config }) {
121
- const { middleware } = config;
112
+ prepareWebServer({
113
+ config
114
+ }) {
115
+ const {
116
+ middleware
117
+ } = config;
122
118
  const factory = compose(middleware);
123
- return (ctx) => {
119
+ return ctx => {
124
120
  const {
125
- source: { res }
121
+ source: {
122
+ res
123
+ }
126
124
  } = ctx;
127
125
  return new Promise((resolve, reject) => {
128
- res.on("finish", (err) => {
126
+ res.on('finish', err => {
129
127
  if (err) {
130
128
  return reject(err);
131
129
  }
@@ -138,7 +136,4 @@ var server_default = () => ({
138
136
  }
139
137
  };
140
138
  }
141
- });
142
- export {
143
- server_default as default
144
- };
139
+ }));
@@ -1,97 +1,61 @@
1
- var __create = Object.create;
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
- var __hasOwnProp = Object.prototype.hasOwnProperty;
7
- var __export = (target, all) => {
8
- for (var name in all)
9
- __defProp(target, name, { get: all[name], enumerable: true });
10
- };
11
- var __copyProps = (to, from, except, desc) => {
12
- if (from && typeof from === "object" || typeof from === "function") {
13
- for (let key of __getOwnPropNames(from))
14
- if (!__hasOwnProp.call(to, key) && key !== except)
15
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
- }
17
- return to;
18
- };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
- mod
22
- ));
23
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
26
- default: () => cli_default
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
27
5
  });
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
- var __async = (__this, __arguments, generator) => {
34
- return new Promise((resolve, reject) => {
35
- var fulfilled = (value) => {
36
- try {
37
- step(generator.next(value));
38
- } catch (e) {
39
- reject(e);
40
- }
41
- };
42
- var rejected = (value) => {
43
- try {
44
- step(generator.throw(value));
45
- } catch (e) {
46
- reject(e);
47
- }
48
- };
49
- var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
50
- step((generator = generator.apply(__this, __arguments)).next());
51
- });
52
- };
53
- const TS_CONFIG_FILENAME = "tsconfig.json";
54
- var cli_default = () => ({
55
- name: "@modern-js/plugin-server",
56
- setup: (api) => ({
6
+ exports.default = void 0;
7
+ var _fs = _interopRequireDefault(require("fs"));
8
+ var _path = _interopRequireDefault(require("path"));
9
+ var _serverUtils = require("@modern-js/server-utils");
10
+ var _utils = require("@modern-js/utils");
11
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
+ const TS_CONFIG_FILENAME = 'tsconfig.json';
13
+ var _default = () => ({
14
+ name: '@modern-js/plugin-server',
15
+ setup: api => ({
57
16
  config() {
58
17
  return {};
59
18
  },
60
- afterBuild() {
61
- return __async(this, null, function* () {
62
- const { appDirectory, distDirectory } = api.useAppContext();
63
- const modernConfig = api.useResolvedConfigContext();
64
- const distDir = import_path.default.resolve(distDirectory);
65
- const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
66
- const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
67
- const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
68
- const sourceDirs = [];
69
- if (import_fs.default.existsSync(serverDir)) {
70
- sourceDirs.push(serverDir);
71
- }
72
- if (import_fs.default.existsSync(sharedDir)) {
73
- sourceDirs.push(sharedDir);
74
- }
75
- const { server } = modernConfig;
76
- const { alias, globalVars } = modernConfig.source;
77
- const { babel } = modernConfig.tools;
78
- if (sourceDirs.length > 0) {
79
- yield (0, import_server_utils.compile)(
80
- appDirectory,
81
- {
82
- server,
83
- alias,
84
- globalVars,
85
- babelConfig: babel
86
- },
87
- {
88
- sourceDirs,
89
- distDir,
90
- tsconfigPath
91
- }
92
- );
93
- }
94
- });
19
+ async afterBuild() {
20
+ const {
21
+ appDirectory,
22
+ distDirectory
23
+ } = api.useAppContext();
24
+ const modernConfig = api.useResolvedConfigContext();
25
+ const distDir = _path.default.resolve(distDirectory);
26
+ const serverDir = _path.default.resolve(appDirectory, _utils.SERVER_DIR);
27
+ const sharedDir = _path.default.resolve(appDirectory, _utils.SHARED_DIR);
28
+ const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
29
+ const sourceDirs = [];
30
+ if (_fs.default.existsSync(serverDir)) {
31
+ sourceDirs.push(serverDir);
32
+ }
33
+ if (_fs.default.existsSync(sharedDir)) {
34
+ sourceDirs.push(sharedDir);
35
+ }
36
+ const {
37
+ server
38
+ } = modernConfig;
39
+ const {
40
+ alias,
41
+ globalVars
42
+ } = modernConfig.source;
43
+ const {
44
+ babel
45
+ } = modernConfig.tools;
46
+ if (sourceDirs.length > 0) {
47
+ await (0, _serverUtils.compile)(appDirectory, {
48
+ server,
49
+ alias,
50
+ globalVars,
51
+ babelConfig: babel
52
+ }, {
53
+ sourceDirs,
54
+ distDir,
55
+ tsconfigPath
56
+ });
57
+ }
95
58
  }
96
59
  })
97
60
  });
61
+ exports.default = _default;