@modern-js/runtime 2.0.0-beta.4 → 2.0.0-beta.6

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 (115) hide show
  1. package/CHANGELOG.md +133 -0
  2. package/dist/js/modern/document/Body.js +2 -2
  3. package/dist/js/modern/document/DocumentStructrueContext.js +2 -1
  4. package/dist/js/modern/document/Head.js +3 -1
  5. package/dist/js/modern/document/Html.js +2 -0
  6. package/dist/js/modern/document/Links.js +10 -0
  7. package/dist/js/modern/document/Root.js +1 -1
  8. package/dist/js/modern/document/cli/index.js +8 -2
  9. package/dist/js/modern/document/constants.js +4 -0
  10. package/dist/js/modern/document/index.js +1 -0
  11. package/dist/js/modern/router/cli/index.js +7 -9
  12. package/dist/js/modern/router/runtime/index.js +1 -0
  13. package/dist/js/modern/router/runtime/plugin.node.js +3 -3
  14. package/dist/js/modern/router/runtime/utils.js +8 -4
  15. package/dist/js/modern/ssr/cli/index.js +2 -2
  16. package/dist/js/node/cli/index.js +13 -11
  17. package/dist/js/node/common.js +7 -3
  18. package/dist/js/node/core/app-config.js +8 -3
  19. package/dist/js/node/core/compatible.js +41 -37
  20. package/dist/js/node/core/index.js +17 -6
  21. package/dist/js/node/core/loader/index.js +7 -3
  22. package/dist/js/node/core/loader/loaderManager.js +19 -14
  23. package/dist/js/node/core/loader/useLoader.js +22 -22
  24. package/dist/js/node/core/plugin.js +17 -10
  25. package/dist/js/node/document/Body.js +8 -4
  26. package/dist/js/node/document/DocumentContext.js +7 -3
  27. package/dist/js/node/document/DocumentStructrueContext.js +9 -4
  28. package/dist/js/node/document/Head.js +11 -4
  29. package/dist/js/node/document/Html.js +9 -3
  30. package/dist/js/node/document/Links.js +33 -0
  31. package/dist/js/node/document/Root.js +9 -4
  32. package/dist/js/node/document/Script.js +7 -3
  33. package/dist/js/node/document/Scripts.js +7 -3
  34. package/dist/js/node/document/cli/index.js +35 -30
  35. package/dist/js/node/document/constants.js +25 -3
  36. package/dist/js/node/document/index.js +12 -11
  37. package/dist/js/node/exports/head.js +6 -4
  38. package/dist/js/node/exports/loadable.js +6 -4
  39. package/dist/js/node/exports/server.js +7 -3
  40. package/dist/js/node/exports/styled.js +6 -4
  41. package/dist/js/node/index.js +15 -3
  42. package/dist/js/node/router/cli/index.js +29 -31
  43. package/dist/js/node/router/index.js +8 -4
  44. package/dist/js/node/router/runtime/DefaultNotFound.js +7 -3
  45. package/dist/js/node/router/runtime/index.js +10 -5
  46. package/dist/js/node/router/runtime/plugin.js +27 -22
  47. package/dist/js/node/router/runtime/plugin.node.js +40 -37
  48. package/dist/js/node/router/runtime/root/index.js +7 -3
  49. package/dist/js/node/router/runtime/root/load.js +14 -8
  50. package/dist/js/node/router/runtime/server.js +3 -3
  51. package/dist/js/node/router/runtime/types.js +15 -0
  52. package/dist/js/node/router/runtime/utils.js +48 -38
  53. package/dist/js/node/router/runtime/withRouter.js +24 -22
  54. package/dist/js/node/runtime-context.js +8 -3
  55. package/dist/js/node/ssr/cli/babel-plugin-ssr-loader-id.js +109 -128
  56. package/dist/js/node/ssr/cli/index.js +21 -21
  57. package/dist/js/node/ssr/index.js +34 -32
  58. package/dist/js/node/ssr/index.node.js +30 -28
  59. package/dist/js/node/ssr/prefetch.js +11 -9
  60. package/dist/js/node/ssr/react/index.js +8 -3
  61. package/dist/js/node/ssr/react/nossr/index.js +7 -3
  62. package/dist/js/node/ssr/react/prerender/index.js +24 -22
  63. package/dist/js/node/ssr/react/prerender/type.js +15 -0
  64. package/dist/js/node/ssr/react/prerender/util.js +11 -3
  65. package/dist/js/node/ssr/react/withCallback/index.js +7 -3
  66. package/dist/js/node/ssr/serverRender/helmet.js +5 -3
  67. package/dist/js/node/ssr/serverRender/index.js +8 -6
  68. package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.after.js +7 -3
  69. package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.share.js +8 -3
  70. package/dist/js/node/ssr/serverRender/renderToStream/bulidTemplate.before.js +7 -3
  71. package/dist/js/node/ssr/serverRender/renderToStream/index.js +14 -10
  72. package/dist/js/node/ssr/serverRender/renderToStream/loadable.js +7 -3
  73. package/dist/js/node/ssr/serverRender/renderToStream/renderToPipe.js +22 -22
  74. package/dist/js/node/ssr/serverRender/renderToStream/styledComponent.js +7 -3
  75. package/dist/js/node/ssr/serverRender/renderToStream/template.js +7 -3
  76. package/dist/js/node/ssr/serverRender/renderToStream/type.js +15 -0
  77. package/dist/js/node/ssr/serverRender/renderToString/entry.js +19 -17
  78. package/dist/js/node/ssr/serverRender/renderToString/index.js +13 -9
  79. package/dist/js/node/ssr/serverRender/renderToString/loadable.js +7 -3
  80. package/dist/js/node/ssr/serverRender/renderToString/reduce.js +7 -3
  81. package/dist/js/node/ssr/serverRender/renderToString/styledComponent.js +7 -3
  82. package/dist/js/node/ssr/serverRender/renderToString/template.js +8 -3
  83. package/dist/js/node/ssr/serverRender/renderToString/type.js +7 -3
  84. package/dist/js/node/ssr/serverRender/types.js +7 -3
  85. package/dist/js/node/ssr/serverRender/utils.js +8 -3
  86. package/dist/js/node/ssr/utils.js +25 -19
  87. package/dist/js/node/state/cli/index.js +5 -3
  88. package/dist/js/node/state/index.js +8 -4
  89. package/dist/js/node/state/plugins.js +10 -3
  90. package/dist/js/node/state/runtime/index.js +10 -5
  91. package/dist/js/node/state/runtime/plugin.js +23 -23
  92. package/dist/js/node/state/types.js +15 -0
  93. package/dist/js/treeshaking/document/Body.js +2 -2
  94. package/dist/js/treeshaking/document/DocumentStructrueContext.js +2 -1
  95. package/dist/js/treeshaking/document/Head.js +3 -1
  96. package/dist/js/treeshaking/document/Html.js +2 -0
  97. package/dist/js/treeshaking/document/Links.js +8 -0
  98. package/dist/js/treeshaking/document/Root.js +1 -1
  99. package/dist/js/treeshaking/document/cli/index.js +9 -4
  100. package/dist/js/treeshaking/document/constants.js +2 -1
  101. package/dist/js/treeshaking/document/index.js +1 -0
  102. package/dist/js/treeshaking/router/cli/index.js +7 -9
  103. package/dist/js/treeshaking/router/runtime/index.js +1 -0
  104. package/dist/js/treeshaking/router/runtime/plugin.node.js +2 -2
  105. package/dist/js/treeshaking/router/runtime/utils.js +8 -4
  106. package/dist/js/treeshaking/ssr/cli/index.js +2 -2
  107. package/dist/types/document/DocumentStructrueContext.d.ts +1 -0
  108. package/dist/types/document/Links.d.ts +2 -0
  109. package/dist/types/document/constants.d.ts +1 -0
  110. package/dist/types/document/index.d.ts +1 -0
  111. package/dist/types/router/runtime/index.d.ts +1 -0
  112. package/dist/types/router/runtime/types.d.ts +1 -1
  113. package/package.json +18 -15
  114. package/types/index.d.ts +2 -2
  115. package/types/router.d.ts +2 -2
@@ -1,7 +1,36 @@
1
1
  var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
2
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
3
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
4
7
  var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
9
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
10
+ var __spreadValues = (a, b) => {
11
+ for (var prop in b || (b = {}))
12
+ if (__hasOwnProp.call(b, prop))
13
+ __defNormalProp(a, prop, b[prop]);
14
+ if (__getOwnPropSymbols)
15
+ for (var prop of __getOwnPropSymbols(b)) {
16
+ if (__propIsEnum.call(b, prop))
17
+ __defNormalProp(a, prop, b[prop]);
18
+ }
19
+ return a;
20
+ };
21
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
22
+ var __objRest = (source, exclude) => {
23
+ var target = {};
24
+ for (var prop in source)
25
+ if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
26
+ target[prop] = source[prop];
27
+ if (source != null && __getOwnPropSymbols)
28
+ for (var prop of __getOwnPropSymbols(source)) {
29
+ if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
30
+ target[prop] = source[prop];
31
+ }
32
+ return target;
33
+ };
5
34
  var __export = (target, all) => {
6
35
  for (var name in all)
7
36
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,56 +44,22 @@ var __copyProps = (to, from, except, desc) => {
15
44
  return to;
16
45
  };
17
46
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
47
+ var utils_exports = {};
48
+ __export(utils_exports, {
20
49
  getLocation: () => getLocation,
21
50
  getRouteComponents: () => getRouteComponents,
22
51
  renderRoutes: () => renderRoutes,
23
52
  standardSlash: () => standardSlash,
24
53
  urlJoin: () => urlJoin
25
54
  });
26
- module.exports = __toCommonJS(stdin_exports);
55
+ module.exports = __toCommonJS(utils_exports);
27
56
  var import_jsx_runtime = require("react/jsx-runtime");
28
57
  var import_react = require("react");
29
58
  var import_react_router_dom = require("react-router-dom");
30
59
  var import_DefaultNotFound = require("./DefaultNotFound");
31
60
  var import_root = require("./root");
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
- var __objRest = (source, exclude) => {
52
- var target = {};
53
- for (var prop in source)
54
- if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
55
- target[prop] = source[prop];
56
- if (source != null && __getOwnPropSymbols)
57
- for (var prop of __getOwnPropSymbols(source)) {
58
- if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
59
- target[prop] = source[prop];
60
- }
61
- return target;
62
- };
63
61
  const renderNestedRoute = (nestedRoute, parent) => {
64
62
  const { children, index, id, component: Component } = nestedRoute;
65
- const childElements = children == null ? void 0 : children.map((childRoute) => {
66
- return renderNestedRoute(childRoute, nestedRoute);
67
- });
68
63
  const routeProps = {
69
64
  caseSensitive: nestedRoute.caseSensitive,
70
65
  path: nestedRoute.path,
@@ -90,11 +85,15 @@ const renderNestedRoute = (nestedRoute, parent) => {
90
85
  fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}),
91
86
  children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
92
87
  });
93
- } else {
88
+ } else if (!(parent == null ? void 0 : parent.index)) {
94
89
  element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
95
90
  children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
96
91
  });
92
+ } else {
93
+ element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
97
94
  }
95
+ } else {
96
+ nestedRoute.loading = parent == null ? void 0 : parent.loading;
98
97
  }
99
98
  if (!parent && element) {
100
99
  element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_root.RootLayout, {
@@ -105,6 +104,9 @@ const renderNestedRoute = (nestedRoute, parent) => {
105
104
  if (element) {
106
105
  routeProps.element = element;
107
106
  }
107
+ const childElements = children == null ? void 0 : children.map((childRoute) => {
108
+ return renderNestedRoute(childRoute, nestedRoute);
109
+ });
108
110
  const routeElement = index ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
109
111
  index: true
110
112
  }), id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
@@ -187,3 +189,11 @@ function standardSlash(str) {
187
189
  }
188
190
  return addr;
189
191
  }
192
+ // Annotate the CommonJS export names for ESM import in node:
193
+ 0 && (module.exports = {
194
+ getLocation,
195
+ getRouteComponents,
196
+ renderRoutes,
197
+ standardSlash,
198
+ urlJoin
199
+ });
@@ -1,7 +1,24 @@
1
1
  var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
2
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
3
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
4
7
  var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
9
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
10
+ var __spreadValues = (a, b) => {
11
+ for (var prop in b || (b = {}))
12
+ if (__hasOwnProp.call(b, prop))
13
+ __defNormalProp(a, prop, b[prop]);
14
+ if (__getOwnPropSymbols)
15
+ for (var prop of __getOwnPropSymbols(b)) {
16
+ if (__propIsEnum.call(b, prop))
17
+ __defNormalProp(a, prop, b[prop]);
18
+ }
19
+ return a;
20
+ };
21
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
5
22
  var __export = (target, all) => {
6
23
  for (var name in all)
7
24
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,32 +32,13 @@ var __copyProps = (to, from, except, desc) => {
15
32
  return to;
16
33
  };
17
34
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
35
+ var withRouter_exports = {};
36
+ __export(withRouter_exports, {
20
37
  withRouter: () => withRouter
21
38
  });
22
- module.exports = __toCommonJS(stdin_exports);
39
+ module.exports = __toCommonJS(withRouter_exports);
23
40
  var import_jsx_runtime = require("react/jsx-runtime");
24
41
  var import_react_router_dom = require("react-router-dom");
25
- var __defProp2 = Object.defineProperty;
26
- var __defProps = Object.defineProperties;
27
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
28
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
29
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
30
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
31
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
32
- var __spreadValues = (a, b) => {
33
- for (var prop in b || (b = {}))
34
- if (__hasOwnProp2.call(b, prop))
35
- __defNormalProp(a, prop, b[prop]);
36
- if (__getOwnPropSymbols)
37
- for (var prop of __getOwnPropSymbols(b)) {
38
- if (__propIsEnum.call(b, prop))
39
- __defNormalProp(a, prop, b[prop]);
40
- }
41
- return a;
42
- };
43
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
44
42
  const withRouter = (Component) => {
45
43
  return (props) => {
46
44
  const location = (0, import_react_router_dom.useLocation)();
@@ -53,3 +51,7 @@ const withRouter = (Component) => {
53
51
  }));
54
52
  };
55
53
  };
54
+ // Annotate the CommonJS export names for ESM import in node:
55
+ 0 && (module.exports = {
56
+ withRouter
57
+ });
@@ -15,12 +15,17 @@ 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 runtime_context_exports = {};
19
+ __export(runtime_context_exports, {
20
20
  RuntimeReactContext: () => RuntimeReactContext,
21
21
  ServerRouterContext: () => ServerRouterContext
22
22
  });
23
- module.exports = __toCommonJS(stdin_exports);
23
+ module.exports = __toCommonJS(runtime_context_exports);
24
24
  var import_react = require("react");
25
25
  const RuntimeReactContext = (0, import_react.createContext)({});
26
26
  const ServerRouterContext = (0, import_react.createContext)({});
27
+ // Annotate the CommonJS export names for ESM import in node:
28
+ 0 && (module.exports = {
29
+ RuntimeReactContext,
30
+ ServerRouterContext
31
+ });
@@ -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,139 +16,124 @@ 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
19
  var import_crypto = __toESM(require("crypto"));
30
20
  var import_buffer = require("buffer");
31
21
  var t = __toESM(require("@babel/types"));
32
22
  var import_lodash = require("@modern-js/utils/lodash");
33
- var __getOwnPropNames2 = Object.getOwnPropertyNames;
34
- var __commonJS = (cb, mod) => function __require() {
35
- return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
36
- };
37
- var require_babel_plugin_ssr_loader_id = __commonJS({
38
- "src/ssr/cli/babel-plugin-ssr-loader-id.ts"(exports, module2) {
39
- const RUNTIME_PACKAGE_NAMES = ["@modern-js/runtime"];
40
- const FUNCTION_USE_LOADER_NAME = "useLoader";
41
- function getHash(filepath) {
42
- const cwd = process.cwd();
43
- const point = filepath.indexOf(cwd);
44
- let relativePath = filepath;
45
- if (point !== -1) {
46
- relativePath = filepath.substring(point + cwd.length);
47
- }
48
- const fileBuf = import_buffer.Buffer.from(relativePath);
49
- const fsHash = import_crypto.default.createHash("md5");
50
- const md5 = fsHash.update(fileBuf).digest("hex");
51
- return md5;
23
+ const RUNTIME_PACKAGE_NAMES = ["@modern-js/runtime"];
24
+ const FUNCTION_USE_LOADER_NAME = "useLoader";
25
+ function getHash(filepath) {
26
+ const cwd = process.cwd();
27
+ const point = filepath.indexOf(cwd);
28
+ let relativePath = filepath;
29
+ if (point !== -1) {
30
+ relativePath = filepath.substring(point + cwd.length);
31
+ }
32
+ const fileBuf = import_buffer.Buffer.from(relativePath);
33
+ const fsHash = import_crypto.default.createHash("md5");
34
+ const md5 = fsHash.update(fileBuf).digest("hex");
35
+ return md5;
36
+ }
37
+ function getUseLoaderPath(path, calleeName) {
38
+ const { node } = path;
39
+ if (!calleeName || node.callee.name !== calleeName) {
40
+ return false;
41
+ }
42
+ const arg1 = (0, import_lodash.get)(node, "arguments.0");
43
+ if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
44
+ const loaderPath = path.get("arguments.0");
45
+ if (isDuplicateInnerLoader(loaderPath)) {
46
+ return false;
47
+ } else {
48
+ return loaderPath;
52
49
  }
53
- function getUseLoaderPath(path, calleeName) {
54
- const { node } = path;
55
- if (!calleeName || node.callee.name !== calleeName) {
56
- return false;
57
- }
58
- const arg1 = (0, import_lodash.get)(node, "arguments.0");
59
- if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
60
- const loaderPath = path.get("arguments.0");
61
- if (isDuplicateInnerLoader(loaderPath)) {
62
- return false;
63
- } else {
64
- return loaderPath;
65
- }
66
- }
67
- console.warn("useLoader 中 loaderId 生成失败,请检查 useLoader");
68
- throw path.buildCodeFrameError(`
50
+ }
51
+ console.warn("useLoader loaderId 生成失败,请检查 useLoader");
52
+ throw path.buildCodeFrameError(`
69
53
  please check the usage of ${path.node.name}
70
54
  `);
71
- }
72
- function isDuplicateInnerLoader(path) {
73
- const { node } = path;
74
- if (t.isFunctionExpression(node.callee)) {
75
- if (t.isBlockStatement(node.callee.body)) {
76
- if ((0, import_lodash.get)(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && (0, import_lodash.get)(node.callee.body, "body.2.argument.name") === "innerLoader") {
77
- return true;
78
- }
79
- }
55
+ }
56
+ function isDuplicateInnerLoader(path) {
57
+ const { node } = path;
58
+ if (t.isFunctionExpression(node.callee)) {
59
+ if (t.isBlockStatement(node.callee.body)) {
60
+ if ((0, import_lodash.get)(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && (0, import_lodash.get)(node.callee.body, "body.2.argument.name") === "innerLoader") {
61
+ return true;
80
62
  }
81
- return false;
82
63
  }
83
- function getSelfRunLoaderExpression(loaderExpression, id) {
84
- return t.callExpression(
85
- t.functionExpression(
86
- null,
87
- [],
88
- t.blockStatement([
89
- t.variableDeclaration("var", [
90
- t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
91
- ]),
92
- t.expressionStatement(
93
- t.assignmentExpression(
94
- "=",
95
- t.memberExpression(t.identifier("innerLoader"), t.identifier("id")),
96
- t.stringLiteral(id)
97
- )
98
- ),
99
- t.returnStatement(t.identifier("innerLoader"))
100
- ])
64
+ }
65
+ return false;
66
+ }
67
+ function getSelfRunLoaderExpression(loaderExpression, id) {
68
+ return t.callExpression(
69
+ t.functionExpression(
70
+ null,
71
+ [],
72
+ t.blockStatement([
73
+ t.variableDeclaration("var", [
74
+ t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
75
+ ]),
76
+ t.expressionStatement(
77
+ t.assignmentExpression(
78
+ "=",
79
+ t.memberExpression(t.identifier("innerLoader"), t.identifier("id")),
80
+ t.stringLiteral(id)
81
+ )
101
82
  ),
102
- []
103
- );
104
- }
105
- module2.exports = function() {
106
- let useLoader = null;
107
- let hash = "";
108
- let index = 0;
109
- function genId() {
110
- return `${hash}_${index++}`;
111
- }
112
- return {
113
- name: "babel-plugin-ssr-loader-id",
114
- pre() {
115
- index = 0;
116
- useLoader = null;
117
- hash = "";
118
- },
119
- visitor: {
120
- ImportDeclaration(path, state) {
121
- if (useLoader) {
122
- return false;
123
- }
124
- if (!RUNTIME_PACKAGE_NAMES.includes((0, import_lodash.get)(path, "node.source.value"))) {
125
- return false;
126
- }
127
- hash = getHash(state.file.opts.filename);
128
- (0, import_lodash.get)(path, "node.specifiers", []).forEach(({ imported, local }) => {
129
- if (!imported) {
130
- throw path.buildCodeFrameError(
131
- `please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``
132
- );
133
- }
134
- if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
135
- useLoader = local.name;
136
- }
137
- });
138
- return false;
139
- },
140
- CallExpression(path) {
141
- let loaderPath = getUseLoaderPath(path, useLoader);
142
- if (loaderPath) {
143
- if (!Array.isArray(loaderPath)) {
144
- loaderPath = [loaderPath];
145
- }
146
- loaderPath.forEach((p) => {
147
- p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
148
- });
149
- return false;
150
- }
151
- return false;
83
+ t.returnStatement(t.identifier("innerLoader"))
84
+ ])
85
+ ),
86
+ []
87
+ );
88
+ }
89
+ module.exports = function() {
90
+ let useLoader = null;
91
+ let hash = "";
92
+ let index = 0;
93
+ function genId() {
94
+ return `${hash}_${index++}`;
95
+ }
96
+ return {
97
+ name: "babel-plugin-ssr-loader-id",
98
+ pre() {
99
+ index = 0;
100
+ useLoader = null;
101
+ hash = "";
102
+ },
103
+ visitor: {
104
+ ImportDeclaration(path, state) {
105
+ if (useLoader) {
106
+ return false;
107
+ }
108
+ if (!RUNTIME_PACKAGE_NAMES.includes((0, import_lodash.get)(path, "node.source.value"))) {
109
+ return false;
110
+ }
111
+ hash = getHash(state.file.opts.filename);
112
+ (0, import_lodash.get)(path, "node.specifiers", []).forEach(({ imported, local }) => {
113
+ if (!imported) {
114
+ throw path.buildCodeFrameError(
115
+ `please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``
116
+ );
117
+ }
118
+ if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
119
+ useLoader = local.name;
152
120
  }
121
+ });
122
+ return false;
123
+ },
124
+ CallExpression(path) {
125
+ let loaderPath = getUseLoaderPath(path, useLoader);
126
+ if (loaderPath) {
127
+ if (!Array.isArray(loaderPath)) {
128
+ loaderPath = [loaderPath];
129
+ }
130
+ loaderPath.forEach((p) => {
131
+ p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
132
+ });
133
+ return false;
153
134
  }
154
- };
155
- };
156
- }
157
- });
158
- var stdin_default = require_babel_plugin_ssr_loader_id();
135
+ return false;
136
+ }
137
+ }
138
+ };
139
+ };
@@ -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 __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
10
+ var __spreadValues = (a, b) => {
11
+ for (var prop in b || (b = {}))
12
+ if (__hasOwnProp.call(b, prop))
13
+ __defNormalProp(a, prop, b[prop]);
14
+ if (__getOwnPropSymbols)
15
+ for (var prop of __getOwnPropSymbols(b)) {
16
+ if (__propIsEnum.call(b, prop))
17
+ __defNormalProp(a, prop, b[prop]);
18
+ }
19
+ return a;
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,29 +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 cli_exports = {};
39
+ __export(cli_exports, {
26
40
  default: () => cli_default
27
41
  });
28
- module.exports = __toCommonJS(stdin_exports);
42
+ module.exports = __toCommonJS(cli_exports);
29
43
  var import_path = __toESM(require("path"));
30
44
  var import_utils = require("@modern-js/utils");
31
- var __defProp2 = Object.defineProperty;
32
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
33
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
34
- 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;
36
- var __spreadValues = (a, b) => {
37
- for (var prop in b || (b = {}))
38
- if (__hasOwnProp2.call(b, prop))
39
- __defNormalProp(a, prop, b[prop]);
40
- if (__getOwnPropSymbols)
41
- for (var prop of __getOwnPropSymbols(b)) {
42
- if (__propIsEnum.call(b, prop))
43
- __defNormalProp(a, prop, b[prop]);
44
- }
45
- return a;
46
- };
47
45
  const PLUGIN_IDENTIFIER = "ssr";
48
46
  const hasStringSSREntry = (userConfig) => {
49
47
  const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
@@ -135,9 +133,9 @@ var cli_default = () => ({
135
133
  userConfig.runtimeByEntries,
136
134
  packageName
137
135
  );
138
- if ((_a = runtimeConfig == null ? void 0 : runtimeConfig.router) == null ? void 0 : _a.legacy) {
136
+ if (((_a = runtimeConfig == null ? void 0 : runtimeConfig.router) == null ? void 0 : _a.mode) === "react-router-5") {
139
137
  throw new Error(
140
- `Legacy router plugin doesn't support streaming SSR, check your config 'runtime.router'`
138
+ `router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`
141
139
  );
142
140
  }
143
141
  if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
@@ -189,3 +187,5 @@ var cli_default = () => ({
189
187
  };
190
188
  }
191
189
  });
190
+ // Annotate the CommonJS export names for ESM import in node:
191
+ 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 });
@@ -22,38 +39,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
22
39
  mod
23
40
  ));
24
41
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
25
- var stdin_exports = {};
26
- __export(stdin_exports, {
27
- default: () => ssr_default,
28
- ssr: () => ssr
29
- });
30
- module.exports = __toCommonJS(stdin_exports);
31
- var import_jsx_runtime = require("react/jsx-runtime");
32
- var import_component = require("@loadable/component");
33
- var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
34
- var import_types = require("./serverRender/types");
35
- var import_withCallback = require("./react/withCallback");
36
- var import_utils = require("./utils");
37
- __reExport(stdin_exports, require("./react"), module.exports);
38
- var __defProp2 = Object.defineProperty;
39
- var __defProps = Object.defineProperties;
40
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
41
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
42
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
43
- var __propIsEnum = Object.prototype.propertyIsEnumerable;
44
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
45
- var __spreadValues = (a, b) => {
46
- for (var prop in b || (b = {}))
47
- if (__hasOwnProp2.call(b, prop))
48
- __defNormalProp(a, prop, b[prop]);
49
- if (__getOwnPropSymbols)
50
- for (var prop of __getOwnPropSymbols(b)) {
51
- if (__propIsEnum.call(b, prop))
52
- __defNormalProp(a, prop, b[prop]);
53
- }
54
- return a;
55
- };
56
- var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
57
42
  var __async = (__this, __arguments, generator) => {
58
43
  return new Promise((resolve, reject) => {
59
44
  var fulfilled = (value) => {
@@ -74,6 +59,19 @@ var __async = (__this, __arguments, generator) => {
74
59
  step((generator = generator.apply(__this, __arguments)).next());
75
60
  });
76
61
  };
62
+ var ssr_exports = {};
63
+ __export(ssr_exports, {
64
+ default: () => ssr_default,
65
+ ssr: () => ssr
66
+ });
67
+ module.exports = __toCommonJS(ssr_exports);
68
+ var import_jsx_runtime = require("react/jsx-runtime");
69
+ var import_component = require("@loadable/component");
70
+ var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
71
+ var import_types = require("./serverRender/types");
72
+ var import_withCallback = require("./react/withCallback");
73
+ var import_utils = require("./utils");
74
+ __reExport(ssr_exports, require("./react"), module.exports);
77
75
  const ssr = (config) => ({
78
76
  name: "@modern-js/plugin-ssr",
79
77
  setup: () => {
@@ -181,3 +179,7 @@ const ssr = (config) => ({
181
179
  }
182
180
  });
183
181
  var ssr_default = ssr;
182
+ // Annotate the CommonJS export names for ESM import in node:
183
+ 0 && (module.exports = {
184
+ ssr
185
+ });