@modern-js/plugin-ssg 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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,57 @@
1
1
  # @modern-js/plugin-ssg
2
2
 
3
+ ## 2.0.0-beta.7
4
+
5
+ ### Major Changes
6
+
7
+ - dda38c9c3e: chore: v2
8
+
9
+ ### Patch Changes
10
+
11
+ - 8b8e1bb571: feat: support nested routes
12
+ feat: 支持嵌套路由
13
+ - Updated dependencies [edd1cfb1af]
14
+ - Updated dependencies [dda38c9c3e]
15
+ - Updated dependencies [bbe4c4ab64]
16
+ - @modern-js/utils@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
+ - 6604f1b8b3: feat: support router basename
27
+ feat: router 插件支持设置 basename
28
+ - cc971eabfc: refactor: move server plugin load logic in `@modern-js/core`
29
+ refactor:移除在 `@modern-js/core` 中的 server 插件加载逻辑
30
+ - 8b8e1bb571: feat: support nested routes
31
+ feat: 支持嵌套路由
32
+ - Updated dependencies [7879e8f711]
33
+ - Updated dependencies [6aca875011]
34
+ - Updated dependencies [2e6031955e]
35
+ - Updated dependencies [7b7d12cf8f]
36
+ - Updated dependencies [7efeed4]
37
+ - Updated dependencies [92f0eade39]
38
+ - Updated dependencies [edd1cfb1af]
39
+ - Updated dependencies [cc971eabfc]
40
+ - Updated dependencies [5b9049f2e9]
41
+ - Updated dependencies [92004d1906]
42
+ - Updated dependencies [b8bbe036c7]
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/utils@2.0.0-beta.6
54
+
3
55
  ## 2.0.0-beta.4
4
56
 
5
57
  ### Major Changes
@@ -74,10 +74,7 @@ var src_default = () => ({
74
74
  const { appDirectory, entrypoints } = appContext;
75
75
  const { output, server } = resolvedConfig;
76
76
  const { ssg, distPath: { root: outputPath } = {} } = output;
77
- const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg;
78
- if (!ssgOptions) {
79
- return;
80
- }
77
+ const ssgOptions = (Array.isArray(ssg) ? ssg.pop() : ssg) || true;
81
78
  const buildDir = path.join(appDirectory, outputPath);
82
79
  const routes = readJSONSpec(buildDir);
83
80
  const pageRoutes = routes.filter((route) => !route.isApi);
@@ -1,9 +1,26 @@
1
1
  var __create = Object.create;
2
2
  var __defProp = Object.defineProperty;
3
+ var __defProps = Object.defineProperties;
3
4
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
6
  var __getOwnPropNames = Object.getOwnPropertyNames;
7
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
8
  var __getProtoOf = Object.getPrototypeOf;
6
9
  var __hasOwnProp = Object.prototype.hasOwnProperty;
10
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
11
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
12
+ var __spreadValues = (a, b) => {
13
+ for (var prop in b || (b = {}))
14
+ if (__hasOwnProp.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ if (__getOwnPropSymbols)
17
+ for (var prop of __getOwnPropSymbols(b)) {
18
+ if (__propIsEnum.call(b, prop))
19
+ __defNormalProp(a, prop, b[prop]);
20
+ }
21
+ return a;
22
+ };
23
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
7
24
  var __export = (target, all) => {
8
25
  for (var name in all)
9
26
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,38 +38,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
38
  mod
22
39
  ));
23
40
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
26
- default: () => src_default
27
- });
28
- module.exports = __toCommonJS(stdin_exports);
29
- var import_path = __toESM(require("path"));
30
- var import_utils = require("@modern-js/utils");
31
- var import_react_router_dom = require("react-router-dom");
32
- var import_util = require("./libs/util");
33
- var import_server = require("./server");
34
- var import_output = require("./libs/output");
35
- var import_replace = require("./libs/replace");
36
- var import_make = require("./libs/make");
37
- var __defProp2 = Object.defineProperty;
38
- var __defProps = Object.defineProperties;
39
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
40
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
41
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
42
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
43
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
44
- var __spreadValues = (a, b) => {
45
- for (var prop in b || (b = {}))
46
- if (__hasOwnProp2.call(b, prop))
47
- __defNormalProp(a, prop, b[prop]);
48
- if (__getOwnPropSymbols)
49
- for (var prop of __getOwnPropSymbols(b)) {
50
- if (__propIsEnum.call(b, prop))
51
- __defNormalProp(a, prop, b[prop]);
52
- }
53
- return a;
54
- };
55
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
56
41
  var __async = (__this, __arguments, generator) => {
57
42
  return new Promise((resolve, reject) => {
58
43
  var fulfilled = (value) => {
@@ -73,6 +58,19 @@ var __async = (__this, __arguments, generator) => {
73
58
  step((generator = generator.apply(__this, __arguments)).next());
74
59
  });
75
60
  };
61
+ var src_exports = {};
62
+ __export(src_exports, {
63
+ default: () => src_default
64
+ });
65
+ module.exports = __toCommonJS(src_exports);
66
+ var import_path = __toESM(require("path"));
67
+ var import_utils = require("@modern-js/utils");
68
+ var import_react_router_dom = require("react-router-dom");
69
+ var import_util = require("./libs/util");
70
+ var import_server = require("./server");
71
+ var import_output = require("./libs/output");
72
+ var import_replace = require("./libs/replace");
73
+ var import_make = require("./libs/make");
76
74
  var src_default = () => ({
77
75
  name: "@modern-js/plugin-ssg",
78
76
  pre: ["@modern-js/plugin-server", "@modern-js/plugin-bff"],
@@ -95,10 +93,7 @@ var src_default = () => ({
95
93
  const { appDirectory, entrypoints } = appContext;
96
94
  const { output, server } = resolvedConfig;
97
95
  const { ssg, distPath: { root: outputPath } = {} } = output;
98
- const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg;
99
- if (!ssgOptions) {
100
- return;
101
- }
96
+ const ssgOptions = (Array.isArray(ssg) ? ssg.pop() : ssg) || true;
102
97
  const buildDir = import_path.default.join(appDirectory, outputPath);
103
98
  const routes = (0, import_util.readJSONSpec)(buildDir);
104
99
  const pageRoutes = routes.filter((route) => !route.isApi);
@@ -208,3 +203,5 @@ var src_default = () => ({
208
203
  };
209
204
  }
210
205
  });
206
+ // Annotate the CommonJS export names for ESM import in node:
207
+ 0 && (module.exports = {});
@@ -1,9 +1,26 @@
1
1
  var __create = Object.create;
2
2
  var __defProp = Object.defineProperty;
3
+ var __defProps = Object.defineProperties;
3
4
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
6
  var __getOwnPropNames = Object.getOwnPropertyNames;
7
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
8
  var __getProtoOf = Object.getPrototypeOf;
6
9
  var __hasOwnProp = Object.prototype.hasOwnProperty;
10
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
11
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
12
+ var __spreadValues = (a, b) => {
13
+ for (var prop in b || (b = {}))
14
+ if (__hasOwnProp.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ if (__getOwnPropSymbols)
17
+ for (var prop of __getOwnPropSymbols(b)) {
18
+ if (__propIsEnum.call(b, prop))
19
+ __defNormalProp(a, prop, b[prop]);
20
+ }
21
+ return a;
22
+ };
23
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
7
24
  var __export = (target, all) => {
8
25
  for (var name in all)
9
26
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,33 +38,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
38
  mod
22
39
  ));
23
40
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
41
+ var make_exports = {};
42
+ __export(make_exports, {
26
43
  makeRender: () => makeRender,
27
44
  makeRoute: () => makeRoute
28
45
  });
29
- module.exports = __toCommonJS(stdin_exports);
46
+ module.exports = __toCommonJS(make_exports);
30
47
  var import_path = __toESM(require("path"));
31
48
  var import_normalize_path = __toESM(require("normalize-path"));
32
- var __defProp2 = Object.defineProperty;
33
- var __defProps = Object.defineProperties;
34
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
35
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
36
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
37
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
38
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
39
- var __spreadValues = (a, b) => {
40
- for (var prop in b || (b = {}))
41
- if (__hasOwnProp2.call(b, prop))
42
- __defNormalProp(a, prop, b[prop]);
43
- if (__getOwnPropSymbols)
44
- for (var prop of __getOwnPropSymbols(b)) {
45
- if (__propIsEnum.call(b, prop))
46
- __defNormalProp(a, prop, b[prop]);
47
- }
48
- return a;
49
- };
50
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
51
49
  function makeRender(ssgRoutes, render, port) {
52
50
  return ssgRoutes.map(
53
51
  (ssgRoute) => render({
@@ -73,3 +71,8 @@ function makeRoute(baseRoute, route, headers = {}) {
73
71
  });
74
72
  }
75
73
  }
74
+ // Annotate the CommonJS export names for ESM import in node:
75
+ 0 && (module.exports = {
76
+ makeRender,
77
+ makeRoute
78
+ });
@@ -21,11 +21,11 @@ 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, {
24
+ var output_exports = {};
25
+ __export(output_exports, {
26
26
  writeHtmlFile: () => writeHtmlFile
27
27
  });
28
- module.exports = __toCommonJS(stdin_exports);
28
+ module.exports = __toCommonJS(output_exports);
29
29
  var import_path = __toESM(require("path"));
30
30
  var import_utils = require("@modern-js/utils");
31
31
  function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
@@ -38,3 +38,7 @@ function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
38
38
  import_utils.fs.writeFileSync(filepath, html);
39
39
  });
40
40
  }
41
+ // Annotate the CommonJS export names for ESM import in node:
42
+ 0 && (module.exports = {
43
+ writeHtmlFile
44
+ });
@@ -2,40 +2,14 @@ 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;
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
- exist: () => exist,
27
- replaceRoute: () => replaceRoute
28
- });
29
- module.exports = __toCommonJS(stdin_exports);
30
- var import_normalize_path = __toESM(require("normalize-path"));
31
- var __defProp2 = Object.defineProperty;
32
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
33
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
34
8
  var __propIsEnum = Object.prototype.propertyIsEnumerable;
35
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
9
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
36
10
  var __spreadValues = (a, b) => {
37
11
  for (var prop in b || (b = {}))
38
- if (__hasOwnProp2.call(b, prop))
12
+ if (__hasOwnProp.call(b, prop))
39
13
  __defNormalProp(a, prop, b[prop]);
40
14
  if (__getOwnPropSymbols)
41
15
  for (var prop of __getOwnPropSymbols(b)) {
@@ -47,7 +21,7 @@ var __spreadValues = (a, b) => {
47
21
  var __objRest = (source, exclude) => {
48
22
  var target = {};
49
23
  for (var prop in source)
50
- if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
24
+ if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
51
25
  target[prop] = source[prop];
52
26
  if (source != null && __getOwnPropSymbols)
53
27
  for (var prop of __getOwnPropSymbols(source)) {
@@ -56,6 +30,30 @@ var __objRest = (source, exclude) => {
56
30
  }
57
31
  return target;
58
32
  };
33
+ var __export = (target, all) => {
34
+ for (var name in all)
35
+ __defProp(target, name, { get: all[name], enumerable: true });
36
+ };
37
+ var __copyProps = (to, from, except, desc) => {
38
+ if (from && typeof from === "object" || typeof from === "function") {
39
+ for (let key of __getOwnPropNames(from))
40
+ if (!__hasOwnProp.call(to, key) && key !== except)
41
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
42
+ }
43
+ return to;
44
+ };
45
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
46
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
47
+ mod
48
+ ));
49
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
50
+ var replace_exports = {};
51
+ __export(replace_exports, {
52
+ exist: () => exist,
53
+ replaceRoute: () => replaceRoute
54
+ });
55
+ module.exports = __toCommonJS(replace_exports);
56
+ var import_normalize_path = __toESM(require("normalize-path"));
59
57
  function exist(route, pageRoutes) {
60
58
  return pageRoutes.slice().findIndex((pageRoute) => {
61
59
  const urlEqual = (0, import_normalize_path.default)(pageRoute.urlPath) === (0, import_normalize_path.default)(route.urlPath);
@@ -86,3 +84,8 @@ function replaceRoute(ssgRoutes, pageRoutes) {
86
84
  pageRoutes.push(...freshRoutes);
87
85
  return pageRoutes;
88
86
  }
87
+ // Annotate the CommonJS export names for ESM import in node:
88
+ 0 && (module.exports = {
89
+ exist,
90
+ replaceRoute
91
+ });
@@ -1,9 +1,26 @@
1
1
  var __create = Object.create;
2
2
  var __defProp = Object.defineProperty;
3
+ var __defProps = Object.defineProperties;
3
4
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
6
  var __getOwnPropNames = Object.getOwnPropertyNames;
7
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
8
  var __getProtoOf = Object.getPrototypeOf;
6
9
  var __hasOwnProp = Object.prototype.hasOwnProperty;
10
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
11
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
12
+ var __spreadValues = (a, b) => {
13
+ for (var prop in b || (b = {}))
14
+ if (__hasOwnProp.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ if (__getOwnPropSymbols)
17
+ for (var prop of __getOwnPropSymbols(b)) {
18
+ if (__propIsEnum.call(b, prop))
19
+ __defNormalProp(a, prop, b[prop]);
20
+ }
21
+ return a;
22
+ };
23
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
7
24
  var __export = (target, all) => {
8
25
  for (var name in all)
9
26
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,8 +38,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
38
  mod
22
39
  ));
23
40
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
41
+ var util_exports = {};
42
+ __export(util_exports, {
26
43
  flattenRoutes: () => flattenRoutes,
27
44
  formatOutput: () => formatOutput,
28
45
  formatPath: () => formatPath,
@@ -35,28 +52,9 @@ __export(stdin_exports, {
35
52
  standardOptions: () => standardOptions,
36
53
  writeJSONSpec: () => writeJSONSpec
37
54
  });
38
- module.exports = __toCommonJS(stdin_exports);
55
+ module.exports = __toCommonJS(util_exports);
39
56
  var import_path = __toESM(require("path"));
40
57
  var import_utils = require("@modern-js/utils");
41
- var __defProp2 = Object.defineProperty;
42
- var __defProps = Object.defineProperties;
43
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
44
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
45
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
46
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
47
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
48
- var __spreadValues = (a, b) => {
49
- for (var prop in b || (b = {}))
50
- if (__hasOwnProp2.call(b, prop))
51
- __defNormalProp(a, prop, b[prop]);
52
- if (__getOwnPropSymbols)
53
- for (var prop of __getOwnPropSymbols(b)) {
54
- if (__propIsEnum.call(b, prop))
55
- __defNormalProp(a, prop, b[prop]);
56
- }
57
- return a;
58
- };
59
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
60
58
  function formatOutput(filename) {
61
59
  const outputPath = import_path.default.extname(filename) ? filename : `${filename}/index.html`;
62
60
  return outputPath;
@@ -189,3 +187,17 @@ const flattenRoutes = (routes) => {
189
187
  routes.forEach(traverseRoute);
190
188
  return newRoutes;
191
189
  };
190
+ // Annotate the CommonJS export names for ESM import in node:
191
+ 0 && (module.exports = {
192
+ flattenRoutes,
193
+ formatOutput,
194
+ formatPath,
195
+ getOutput,
196
+ getUrlPrefix,
197
+ isDynamicUrl,
198
+ openRouteSSR,
199
+ readJSONSpec,
200
+ replaceWithAlias,
201
+ standardOptions,
202
+ writeJSONSpec
203
+ });
@@ -15,9 +15,13 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
18
+ var consts_exports = {};
19
+ __export(consts_exports, {
20
20
  CLOSE_SIGN: () => CLOSE_SIGN
21
21
  });
22
- module.exports = __toCommonJS(stdin_exports);
22
+ module.exports = __toCommonJS(consts_exports);
23
23
  const CLOSE_SIGN = "modern_close_server";
24
+ // Annotate the CommonJS export names for ESM import in node:
25
+ 0 && (module.exports = {
26
+ CLOSE_SIGN
27
+ });
@@ -21,11 +21,11 @@ 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, {
24
+ var server_exports = {};
25
+ __export(server_exports, {
26
26
  createServer: () => createServer
27
27
  });
28
- module.exports = __toCommonJS(stdin_exports);
28
+ module.exports = __toCommonJS(server_exports);
29
29
  var import_child_process = __toESM(require("child_process"));
30
30
  var import_path = __toESM(require("path"));
31
31
  var import_utils = require("@modern-js/utils");
@@ -86,3 +86,7 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
86
86
  }
87
87
  });
88
88
  });
89
+ // Annotate the CommonJS export names for ESM import in node:
90
+ 0 && (module.exports = {
91
+ createServer
92
+ });
@@ -1,9 +1,26 @@
1
1
  var __create = Object.create;
2
2
  var __defProp = Object.defineProperty;
3
+ var __defProps = Object.defineProperties;
3
4
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
6
  var __getOwnPropNames = Object.getOwnPropertyNames;
7
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
8
  var __getProtoOf = Object.getPrototypeOf;
6
9
  var __hasOwnProp = Object.prototype.hasOwnProperty;
10
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
11
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
12
+ var __spreadValues = (a, b) => {
13
+ for (var prop in b || (b = {}))
14
+ if (__hasOwnProp.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ if (__getOwnPropSymbols)
17
+ for (var prop of __getOwnPropSymbols(b)) {
18
+ if (__propIsEnum.call(b, prop))
19
+ __defNormalProp(a, prop, b[prop]);
20
+ }
21
+ return a;
22
+ };
23
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
7
24
  var __export = (target, all) => {
8
25
  for (var name in all)
9
26
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,33 +38,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
38
  mod
22
39
  ));
23
40
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
41
+ var prerender_exports = {};
42
+ __export(prerender_exports, {
26
43
  compile: () => compile
27
44
  });
28
- module.exports = __toCommonJS(stdin_exports);
45
+ module.exports = __toCommonJS(prerender_exports);
29
46
  var import_events = __toESM(require("events"));
30
47
  var import_stream = require("stream");
31
48
  var import_node_mocks_http = __toESM(require("node-mocks-http"));
32
- var __defProp2 = Object.defineProperty;
33
- var __defProps = Object.defineProperties;
34
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
35
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
36
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
37
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
38
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
39
- var __spreadValues = (a, b) => {
40
- for (var prop in b || (b = {}))
41
- if (__hasOwnProp2.call(b, prop))
42
- __defNormalProp(a, prop, b[prop]);
43
- if (__getOwnPropSymbols)
44
- for (var prop of __getOwnPropSymbols(b)) {
45
- if (__propIsEnum.call(b, prop))
46
- __defNormalProp(a, prop, b[prop]);
47
- }
48
- return a;
49
- };
50
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
51
49
  const compile = (requestHandler) => (options, extend = {}) => new Promise((resolve, reject) => {
52
50
  const req = import_node_mocks_http.default.createRequest(__spreadProps(__spreadValues({}, options), {
53
51
  eventEmitter: import_stream.Readable
@@ -76,3 +74,7 @@ const compile = (requestHandler) => (options, extend = {}) => new Promise((resol
76
74
  reject(e);
77
75
  }
78
76
  });
77
+ // Annotate the CommonJS export names for ESM import in node:
78
+ 0 && (module.exports = {
79
+ compile
80
+ });
@@ -4,10 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
4
  var __getOwnPropNames = Object.getOwnPropertyNames;
5
5
  var __getProtoOf = Object.getPrototypeOf;
6
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
7
  var __copyProps = (to, from, except, desc) => {
12
8
  if (from && typeof from === "object" || typeof from === "function") {
13
9
  for (let key of __getOwnPropNames(from))
@@ -20,21 +16,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
20
16
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
17
  mod
22
18
  ));
23
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
26
- default: () => stdin_default
27
- });
28
- module.exports = __toCommonJS(stdin_exports);
29
- var import_prod_server = __toESM(require("@modern-js/prod-server"));
30
- var import_portfinder = __toESM(require("portfinder"));
31
- var import_make = require("../libs/make");
32
- var import_prerender = require("./prerender");
33
- var import_consts = require("./consts");
34
- var __getOwnPropNames2 = Object.getOwnPropertyNames;
35
- var __commonJS = (cb, mod) => function __require() {
36
- return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
37
- };
38
19
  var __async = (__this, __arguments, generator) => {
39
20
  return new Promise((resolve, reject) => {
40
21
  var fulfilled = (value) => {
@@ -55,58 +36,58 @@ var __async = (__this, __arguments, generator) => {
55
36
  step((generator = generator.apply(__this, __arguments)).next());
56
37
  });
57
38
  };
58
- var require_process = __commonJS({
59
- "src/server/process.ts"(exports) {
60
- process.on("message", (chunk) => __async(exports, null, function* () {
61
- if (chunk === import_consts.CLOSE_SIGN) {
62
- process.exit();
39
+ var import_prod_server = __toESM(require("@modern-js/prod-server"));
40
+ var import_portfinder = __toESM(require("portfinder"));
41
+ var import_make = require("../libs/make");
42
+ var import_prerender = require("./prerender");
43
+ var import_consts = require("./consts");
44
+ process.on("message", (chunk) => __async(exports, null, function* () {
45
+ if (chunk === import_consts.CLOSE_SIGN) {
46
+ process.exit();
47
+ }
48
+ const context = JSON.parse(chunk);
49
+ const {
50
+ routes,
51
+ renderRoutes,
52
+ options,
53
+ appDirectory,
54
+ plugins
55
+ } = context;
56
+ let modernServer = null;
57
+ try {
58
+ const { server: serverOptions } = options;
59
+ const defaultPort = Number(process.env.PORT) || serverOptions.port;
60
+ import_portfinder.default.basePort = defaultPort;
61
+ const port = yield import_portfinder.default.getPortPromise();
62
+ modernServer = yield (0, import_prod_server.default)({
63
+ pwd: appDirectory,
64
+ config: options,
65
+ routes,
66
+ staticGenerate: true,
67
+ internalPlugins: plugins
68
+ });
69
+ modernServer.listen(port, (err) => __async(exports, null, function* () {
70
+ if (err) {
71
+ throw err;
63
72
  }
64
- const context = JSON.parse(chunk);
65
- const {
66
- routes,
67
- renderRoutes,
68
- options,
69
- appDirectory,
70
- plugins
71
- } = context;
72
- let modernServer = null;
73
- try {
74
- const { server: serverOptions } = options;
75
- const defaultPort = Number(process.env.PORT) || serverOptions.port;
76
- import_portfinder.default.basePort = defaultPort;
77
- const port = yield import_portfinder.default.getPortPromise();
78
- modernServer = yield (0, import_prod_server.default)({
79
- pwd: appDirectory,
80
- config: options,
81
- routes,
82
- staticGenerate: true,
83
- internalPlugins: plugins
84
- });
85
- modernServer.listen(port, (err) => __async(exports, null, function* () {
86
- if (err) {
87
- throw err;
88
- }
89
- if (!modernServer) {
90
- return;
91
- }
92
- const render = (0, import_prerender.compile)(modernServer.getRequestHandler());
93
- const renderPromiseAry = (0, import_make.makeRender)(
94
- renderRoutes,
95
- render,
96
- port
97
- );
98
- const htmlAry = yield Promise.all(renderPromiseAry);
99
- htmlAry.forEach((html) => {
100
- process.send(html);
101
- process.send(null);
102
- });
103
- modernServer.close();
104
- }));
105
- } catch (e) {
106
- modernServer == null ? void 0 : modernServer.close();
107
- throw e;
73
+ if (!modernServer) {
74
+ return;
108
75
  }
76
+ const render = (0, import_prerender.compile)(modernServer.getRequestHandler());
77
+ const renderPromiseAry = (0, import_make.makeRender)(
78
+ renderRoutes,
79
+ render,
80
+ port
81
+ );
82
+ const htmlAry = yield Promise.all(renderPromiseAry);
83
+ htmlAry.forEach((html) => {
84
+ process.send(html);
85
+ process.send(null);
86
+ });
87
+ modernServer.close();
109
88
  }));
89
+ } catch (e) {
90
+ modernServer == null ? void 0 : modernServer.close();
91
+ throw e;
110
92
  }
111
- });
112
- var stdin_default = require_process();
93
+ }));
@@ -0,0 +1,15 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
+ var __getOwnPropNames = Object.getOwnPropertyNames;
4
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
5
+ var __copyProps = (to, from, except, desc) => {
6
+ if (from && typeof from === "object" || typeof from === "function") {
7
+ for (let key of __getOwnPropNames(from))
8
+ if (!__hasOwnProp.call(to, key) && key !== except)
9
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
10
+ }
11
+ return to;
12
+ };
13
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
14
+ var types_exports = {};
15
+ module.exports = __toCommonJS(types_exports);
@@ -216,12 +216,7 @@ var src_default = function() {
216
216
  appDirectory = appContext.appDirectory, entrypoints = appContext.entrypoints;
217
217
  output = resolvedConfig.output, server = resolvedConfig.server;
218
218
  ssg = output.ssg, tmp = output.distPath, ref = tmp === void 0 ? {} : tmp, outputPath = ref.root;
219
- ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg;
220
- if (!ssgOptions) {
221
- return [
222
- 2
223
- ];
224
- }
219
+ ssgOptions = (Array.isArray(ssg) ? ssg.pop() : ssg) || true;
225
220
  buildDir = path.join(appDirectory, outputPath);
226
221
  routes = readJSONSpec(buildDir);
227
222
  pageRoutes = routes.filter(function(route) {
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "modern",
12
12
  "modern.js"
13
13
  ],
14
- "version": "2.0.0-beta.4",
14
+ "version": "2.0.0-beta.7",
15
15
  "jsnext:source": "./src/index.ts",
16
16
  "types": "./dist/types/index.d.ts",
17
17
  "main": "./dist/js/node/index.js",
@@ -58,7 +58,7 @@
58
58
  "node-mocks-http": "^1.10.1",
59
59
  "normalize-path": "^3.0.0",
60
60
  "portfinder": "^1.0.28",
61
- "@modern-js/utils": "2.0.0-beta.4"
61
+ "@modern-js/utils": "2.0.0-beta.7"
62
62
  },
63
63
  "peerDependencies": {
64
64
  "react-router-dom": ">=5.1.2"
@@ -71,15 +71,15 @@
71
71
  "devDependencies": {
72
72
  "@types/jest": "^27",
73
73
  "@types/node": "^14",
74
- "react-router-dom": "^6.4.4",
74
+ "jest": "^27",
75
75
  "react": "^18",
76
+ "react-router-dom": "^6.6.0",
76
77
  "typescript": "^4",
77
- "jest": "^27",
78
- "@modern-js/types": "2.0.0-beta.4",
79
- "@modern-js/prod-server": "2.0.0-beta.4",
80
- "@scripts/build": "2.0.0-beta.4",
81
- "@modern-js/app-tools": "2.0.0-beta.4",
82
- "@scripts/jest-config": "2.0.0-beta.4"
78
+ "@modern-js/app-tools": "2.0.0-beta.7",
79
+ "@modern-js/prod-server": "2.0.0-beta.7",
80
+ "@modern-js/types": "2.0.0-beta.7",
81
+ "@scripts/build": "2.0.0-beta.7",
82
+ "@scripts/jest-config": "2.0.0-beta.7"
83
83
  },
84
84
  "sideEffects": false,
85
85
  "publishConfig": {