@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-canary.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 (231) hide show
  1. package/CHANGELOG.md +251 -0
  2. package/bin/modern.js +10 -1
  3. package/dist/js/modern/analyze/constants.js +38 -16
  4. package/dist/js/modern/analyze/generateCode.js +271 -211
  5. package/dist/js/modern/analyze/getBundleEntry.js +31 -32
  6. package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +93 -49
  7. package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +89 -47
  8. package/dist/js/modern/analyze/getClientRoutes/index.js +6 -2
  9. package/dist/js/modern/analyze/getClientRoutes/utils.js +23 -10
  10. package/dist/js/modern/analyze/getFileSystemEntry.js +43 -22
  11. package/dist/js/modern/analyze/getHtmlTemplate.js +89 -49
  12. package/dist/js/modern/analyze/getServerRoutes.js +122 -126
  13. package/dist/js/modern/analyze/index.js +193 -159
  14. package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -16
  15. package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -11
  16. package/dist/js/modern/analyze/nestedRoutes.js +110 -53
  17. package/dist/js/modern/analyze/templates.js +190 -77
  18. package/dist/js/modern/analyze/utils.js +98 -51
  19. package/dist/js/modern/builder/builderPlugins/compatModern.js +124 -107
  20. package/dist/js/modern/builder/index.js +123 -86
  21. package/dist/js/modern/builder/loaders/routerLoader.js +17 -0
  22. package/dist/js/modern/builder/loaders/serverModuleLoader.js +7 -0
  23. package/dist/js/modern/builder/share.js +22 -20
  24. package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +23 -22
  25. package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +31 -27
  26. package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +98 -84
  27. package/dist/js/modern/commands/build.js +67 -42
  28. package/dist/js/modern/commands/deploy.js +27 -4
  29. package/dist/js/modern/commands/dev.js +93 -47
  30. package/dist/js/modern/commands/index.js +1 -1
  31. package/dist/js/modern/commands/inspect.js +30 -5
  32. package/dist/js/modern/commands/start.js +37 -16
  33. package/dist/js/modern/config/default.js +103 -114
  34. package/dist/js/modern/config/index.js +8 -2
  35. package/dist/js/modern/config/initial/createHtmlConfig.js +5 -2
  36. package/dist/js/modern/config/initial/createOutputConfig.js +11 -9
  37. package/dist/js/modern/config/initial/createSourceConfig.js +5 -2
  38. package/dist/js/modern/config/initial/createToolsConfig.js +7 -6
  39. package/dist/js/modern/config/initial/index.js +9 -4
  40. package/dist/js/modern/config/initial/inits.js +109 -73
  41. package/dist/js/modern/config/initial/transformNormalizedConfig.js +6 -3
  42. package/dist/js/modern/defineConfig.js +26 -11
  43. package/dist/js/modern/exports/server.js +4 -1
  44. package/dist/js/modern/hooks.js +10 -3
  45. package/dist/js/modern/index.js +140 -89
  46. package/dist/js/modern/initialize/index.js +98 -51
  47. package/dist/js/modern/locale/en.js +20 -21
  48. package/dist/js/modern/locale/index.js +6 -6
  49. package/dist/js/modern/locale/zh.js +21 -22
  50. package/dist/js/modern/schema/Schema.js +6 -5
  51. package/dist/js/modern/schema/index.js +51 -100
  52. package/dist/js/modern/schema/legacy.js +96 -231
  53. package/dist/js/modern/types/config/index.js +0 -1
  54. package/dist/js/modern/types/index.js +0 -1
  55. package/dist/js/modern/types/legacyConfig/output.js +0 -1
  56. package/dist/js/modern/utils/commands.js +5 -2
  57. package/dist/js/modern/utils/config.js +102 -41
  58. package/dist/js/modern/utils/createFileWatcher.js +84 -51
  59. package/dist/js/modern/utils/createServer.js +63 -17
  60. package/dist/js/modern/utils/getSpecifiedEntries.js +46 -19
  61. package/dist/js/modern/utils/language.js +6 -3
  62. package/dist/js/modern/utils/printInstructions.js +27 -8
  63. package/dist/js/modern/utils/restart.js +43 -16
  64. package/dist/js/modern/utils/routes.js +29 -12
  65. package/dist/js/node/analyze/constants.js +54 -35
  66. package/dist/js/node/analyze/generateCode.js +290 -228
  67. package/dist/js/node/analyze/getBundleEntry.js +55 -44
  68. package/dist/js/node/analyze/getClientRoutes/getRoutes.js +132 -76
  69. package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +128 -74
  70. package/dist/js/node/analyze/getClientRoutes/index.js +23 -17
  71. package/dist/js/node/analyze/getClientRoutes/utils.js +44 -21
  72. package/dist/js/node/analyze/getFileSystemEntry.js +70 -39
  73. package/dist/js/node/analyze/getHtmlTemplate.js +116 -61
  74. package/dist/js/node/analyze/getServerRoutes.js +143 -137
  75. package/dist/js/node/analyze/index.js +240 -174
  76. package/dist/js/node/analyze/isDefaultExportFunction.js +55 -26
  77. package/dist/js/node/analyze/makeLegalIdentifier.js +27 -15
  78. package/dist/js/node/analyze/nestedRoutes.js +140 -67
  79. package/dist/js/node/analyze/templates.js +211 -84
  80. package/dist/js/node/analyze/utils.js +123 -62
  81. package/dist/js/node/builder/builderPlugins/compatModern.js +152 -120
  82. package/dist/js/node/builder/index.js +151 -95
  83. package/dist/js/node/builder/loaders/routerLoader.js +36 -0
  84. package/dist/js/node/builder/loaders/serverModuleLoader.js +26 -0
  85. package/dist/js/node/builder/share.js +45 -25
  86. package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +39 -26
  87. package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +47 -31
  88. package/dist/js/node/builder/webpackPlugins/routerPlugin.js +116 -90
  89. package/dist/js/node/commands/build.js +89 -52
  90. package/dist/js/node/commands/deploy.js +45 -10
  91. package/dist/js/node/commands/dev.js +115 -61
  92. package/dist/js/node/commands/index.js +19 -38
  93. package/dist/js/node/commands/inspect.js +48 -11
  94. package/dist/js/node/commands/start.js +65 -27
  95. package/dist/js/node/config/default.js +119 -118
  96. package/dist/js/node/config/index.js +25 -29
  97. package/dist/js/node/config/initial/createHtmlConfig.js +22 -6
  98. package/dist/js/node/config/initial/createOutputConfig.js +28 -13
  99. package/dist/js/node/config/initial/createSourceConfig.js +22 -6
  100. package/dist/js/node/config/initial/createToolsConfig.js +24 -10
  101. package/dist/js/node/config/initial/index.js +28 -17
  102. package/dist/js/node/config/initial/inits.js +126 -81
  103. package/dist/js/node/config/initial/transformNormalizedConfig.js +31 -15
  104. package/dist/js/node/defineConfig.js +43 -17
  105. package/dist/js/node/exports/server.js +21 -10
  106. package/dist/js/node/hooks.js +44 -29
  107. package/dist/js/node/index.js +190 -130
  108. package/dist/js/node/initialize/index.js +116 -61
  109. package/dist/js/node/locale/en.js +36 -25
  110. package/dist/js/node/locale/index.js +27 -15
  111. package/dist/js/node/locale/zh.js +37 -26
  112. package/dist/js/node/schema/Schema.js +23 -10
  113. package/dist/js/node/schema/index.js +77 -114
  114. package/dist/js/node/schema/legacy.js +117 -240
  115. package/dist/js/node/types/config/index.js +17 -16
  116. package/dist/js/node/types/index.js +19 -38
  117. package/dist/js/node/types/legacyConfig/output.js +0 -5
  118. package/dist/js/node/utils/commands.js +21 -6
  119. package/dist/js/node/utils/config.js +120 -51
  120. package/dist/js/node/utils/createFileWatcher.js +104 -60
  121. package/dist/js/node/utils/createServer.js +86 -25
  122. package/dist/js/node/utils/getSpecifiedEntries.js +64 -25
  123. package/dist/js/node/utils/language.js +24 -8
  124. package/dist/js/node/utils/printInstructions.js +47 -16
  125. package/dist/js/node/utils/restart.js +61 -21
  126. package/dist/js/node/utils/routes.js +53 -18
  127. package/dist/js/treeshaking/analyze/constants.js +28 -16
  128. package/dist/js/treeshaking/analyze/generateCode.js +604 -355
  129. package/dist/js/treeshaking/analyze/getBundleEntry.js +52 -63
  130. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +214 -168
  131. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +215 -169
  132. package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -2
  133. package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +19 -20
  134. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +89 -86
  135. package/dist/js/treeshaking/analyze/getHtmlTemplate.js +298 -125
  136. package/dist/js/treeshaking/analyze/getServerRoutes.js +210 -146
  137. package/dist/js/treeshaking/analyze/index.js +558 -303
  138. package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +45 -26
  139. package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -16
  140. package/dist/js/treeshaking/analyze/nestedRoutes.js +414 -160
  141. package/dist/js/treeshaking/analyze/templates.js +432 -161
  142. package/dist/js/treeshaking/analyze/utils.js +361 -80
  143. package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +281 -195
  144. package/dist/js/treeshaking/builder/index.js +371 -165
  145. package/dist/js/treeshaking/builder/loaders/routerLoader.js +13 -0
  146. package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +5 -0
  147. package/dist/js/treeshaking/builder/share.js +41 -44
  148. package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +108 -44
  149. package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +70 -39
  150. package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +332 -112
  151. package/dist/js/treeshaking/commands/build.js +286 -88
  152. package/dist/js/treeshaking/commands/deploy.js +153 -25
  153. package/dist/js/treeshaking/commands/dev.js +318 -132
  154. package/dist/js/treeshaking/commands/index.js +1 -1
  155. package/dist/js/treeshaking/commands/inspect.js +147 -32
  156. package/dist/js/treeshaking/commands/start.js +190 -68
  157. package/dist/js/treeshaking/config/default.js +210 -199
  158. package/dist/js/treeshaking/config/index.js +3 -2
  159. package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -31
  160. package/dist/js/treeshaking/config/initial/createOutputConfig.js +43 -67
  161. package/dist/js/treeshaking/config/initial/createSourceConfig.js +37 -40
  162. package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -38
  163. package/dist/js/treeshaking/config/initial/index.js +10 -9
  164. package/dist/js/treeshaking/config/initial/inits.js +205 -106
  165. package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +27 -34
  166. package/dist/js/treeshaking/defineConfig.js +60 -13
  167. package/dist/js/treeshaking/exports/server.js +2 -1
  168. package/dist/js/treeshaking/hooks.js +26 -25
  169. package/dist/js/treeshaking/index.js +465 -257
  170. package/dist/js/treeshaking/initialize/index.js +290 -112
  171. package/dist/js/treeshaking/locale/en.js +34 -33
  172. package/dist/js/treeshaking/locale/index.js +5 -5
  173. package/dist/js/treeshaking/locale/zh.js +34 -33
  174. package/dist/js/treeshaking/schema/Schema.js +267 -69
  175. package/dist/js/treeshaking/schema/index.js +165 -121
  176. package/dist/js/treeshaking/schema/legacy.js +323 -256
  177. package/dist/js/treeshaking/types/config/deploy.js +1 -0
  178. package/dist/js/treeshaking/types/config/dev.js +1 -0
  179. package/dist/js/treeshaking/types/config/experiments.js +1 -0
  180. package/dist/js/treeshaking/types/config/html.js +1 -0
  181. package/dist/js/treeshaking/types/config/index.js +0 -1
  182. package/dist/js/treeshaking/types/config/output.js +1 -0
  183. package/dist/js/treeshaking/types/config/performance.js +1 -0
  184. package/dist/js/treeshaking/types/config/security.js +1 -0
  185. package/dist/js/treeshaking/types/config/source.js +1 -0
  186. package/dist/js/treeshaking/types/config/tools.js +1 -0
  187. package/dist/js/treeshaking/types/hooks.js +1 -0
  188. package/dist/js/treeshaking/types/index.js +0 -1
  189. package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
  190. package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
  191. package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
  192. package/dist/js/treeshaking/types/legacyConfig/output.js +1 -1
  193. package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
  194. package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
  195. package/dist/js/treeshaking/utils/commands.js +6 -5
  196. package/dist/js/treeshaking/utils/config.js +295 -117
  197. package/dist/js/treeshaking/utils/createFileWatcher.js +278 -118
  198. package/dist/js/treeshaking/utils/createServer.js +252 -67
  199. package/dist/js/treeshaking/utils/getSpecifiedEntries.js +182 -55
  200. package/dist/js/treeshaking/utils/language.js +6 -5
  201. package/dist/js/treeshaking/utils/printInstructions.js +151 -29
  202. package/dist/js/treeshaking/utils/restart.js +184 -42
  203. package/dist/js/treeshaking/utils/routes.js +151 -27
  204. package/dist/js/treeshaking/utils/types.js +1 -0
  205. package/dist/types/analyze/constants.d.ts +2 -0
  206. package/dist/types/analyze/index.d.ts +2 -0
  207. package/dist/types/analyze/templates.d.ts +8 -7
  208. package/dist/types/analyze/utils.d.ts +9 -1
  209. package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
  210. package/dist/types/builder/index.d.ts +2 -2
  211. package/dist/types/builder/loaders/routerLoader.d.ts +3 -0
  212. package/dist/types/builder/loaders/serverModuleLoader.d.ts +3 -0
  213. package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +1 -7
  214. package/dist/types/defineConfig.d.ts +1 -0
  215. package/dist/types/index.d.ts +2 -0
  216. package/dist/types/initialize/index.d.ts +2 -0
  217. package/dist/types/types/config/index.d.ts +1 -0
  218. package/dist/types/types/config/output.d.ts +0 -1
  219. package/dist/types/types/config/source.d.ts +1 -0
  220. package/dist/types/types/config/tools.d.ts +10 -1
  221. package/dist/types/types/hooks.d.ts +2 -1
  222. package/dist/types/types/legacyConfig/dev.d.ts +1 -0
  223. package/dist/types/types/legacyConfig/output.d.ts +1 -1
  224. package/dist/types/types/legacyConfig/source.d.ts +1 -0
  225. package/dist/types/types/legacyConfig/tools.d.ts +1 -0
  226. package/dist/types/utils/config.d.ts +1 -0
  227. package/dist/types/utils/createFileWatcher.d.ts +2 -1
  228. package/dist/types/utils/createServer.d.ts +1 -0
  229. package/dist/types/utils/restart.d.ts +1 -1
  230. package/lib/types.d.ts +1 -1
  231. package/package.json +27 -23
@@ -1,67 +1,128 @@
1
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
2
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
3
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
4
- import * as path from 'path';
5
- import { bundle } from '@modern-js/node-bundle-require';
6
- import { CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
7
- export const defineServerConfig = config => config;
8
- export const buildServerConfig = async ({
1
+ var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
3
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
7
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
8
+ var __spreadValues = (a, b) => {
9
+ for (var prop in b || (b = {}))
10
+ if (__hasOwnProp.call(b, prop))
11
+ __defNormalProp(a, prop, b[prop]);
12
+ if (__getOwnPropSymbols)
13
+ for (var prop of __getOwnPropSymbols(b)) {
14
+ if (__propIsEnum.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ }
17
+ return a;
18
+ };
19
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
20
+ var __async = (__this, __arguments, generator) => {
21
+ return new Promise((resolve, reject) => {
22
+ var fulfilled = (value) => {
23
+ try {
24
+ step(generator.next(value));
25
+ } catch (e) {
26
+ reject(e);
27
+ }
28
+ };
29
+ var rejected = (value) => {
30
+ try {
31
+ step(generator.throw(value));
32
+ } catch (e) {
33
+ reject(e);
34
+ }
35
+ };
36
+ var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
37
+ step((generator = generator.apply(__this, __arguments)).next());
38
+ });
39
+ };
40
+ import * as path from "path";
41
+ import { bundle } from "@modern-js/node-bundle-require";
42
+ import {
43
+ CONFIG_FILE_EXTENSIONS,
44
+ fs,
45
+ getServerConfig,
46
+ OUTPUT_CONFIG_FILE
47
+ } from "@modern-js/utils";
48
+ const defineServerConfig = (config) => config;
49
+ const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
9
50
  appDirectory,
10
51
  distDirectory,
11
52
  configFile,
12
53
  options
13
- }) => {
14
- const configFilePath = await getServerConfig(appDirectory, configFile);
15
- const getOutputFile = async filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
54
+ }) {
55
+ const configFilePath = yield getServerConfig(appDirectory, configFile);
56
+ const getOutputFile = (filepath) => __async(void 0, null, function* () {
57
+ return path.resolve(
58
+ distDirectory,
59
+ `${filepath.replace(
60
+ new RegExp(CONFIG_FILE_EXTENSIONS.join("|")),
61
+ ""
62
+ )}.js`
63
+ );
64
+ });
16
65
  if (configFilePath) {
17
- const configHelperFilePath = path.normalize(path.join(distDirectory, './config-helper.js'));
66
+ const configHelperFilePath = path.normalize(
67
+ path.join(distDirectory, "./config-helper.js")
68
+ );
18
69
  const helperCode = `
19
70
  export const defineConfig = (config) => config;
20
71
  `;
21
- await fs.ensureDir(distDirectory);
22
- await fs.writeFile(configHelperFilePath, helperCode);
23
- await bundle(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
72
+ yield fs.ensureDir(distDirectory);
73
+ yield fs.writeFile(configHelperFilePath, helperCode);
74
+ yield bundle(configFilePath, __spreadProps(__spreadValues({}, options), {
24
75
  getOutputFile,
25
- esbuildPlugins: [{
26
- name: 'native-build-config',
27
- setup(ctx) {
28
- ctx.onResolve({
29
- filter: /app-tools\/server/
30
- }, () => {
31
- return {
32
- path: configHelperFilePath
33
- };
34
- });
76
+ esbuildPlugins: [
77
+ {
78
+ name: "native-build-config",
79
+ setup(ctx) {
80
+ ctx.onResolve(
81
+ {
82
+ filter: /app-tools\/server/
83
+ },
84
+ () => {
85
+ return {
86
+ path: configHelperFilePath
87
+ };
88
+ }
89
+ );
90
+ }
35
91
  }
36
- }]
92
+ ]
37
93
  }));
38
94
  }
39
- };
40
-
41
- /**
42
- *
43
- * 处理循环引用的 replacer
44
- */
45
- export const safeReplacer = () => {
95
+ });
96
+ const safeReplacer = () => {
46
97
  const cache = [];
47
98
  const keyCache = [];
48
- return function (key, value) {
49
- if (typeof value === 'object' && value !== null) {
99
+ return function(key, value) {
100
+ if (typeof value === "object" && value !== null) {
50
101
  const index = cache.indexOf(value);
51
102
  if (index !== -1) {
52
103
  return `[Circular ${keyCache[index]}]`;
53
104
  }
54
105
  cache.push(value);
55
- keyCache.push(key || 'root');
106
+ keyCache.push(key || "root");
56
107
  }
57
108
  return value;
58
109
  };
59
110
  };
60
- export const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
61
- var _resolvedConfig$outpu;
62
- const outputPath = path.join(appDirectory, ((_resolvedConfig$outpu = resolvedConfig.output.distPath) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.root) || './dist', OUTPUT_CONFIG_FILE);
63
- await fs.writeJSON(outputPath, resolvedConfig, {
111
+ const emitResolvedConfig = (appDirectory, resolvedConfig) => __async(void 0, null, function* () {
112
+ var _a;
113
+ const outputPath = path.join(
114
+ appDirectory,
115
+ ((_a = resolvedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
116
+ OUTPUT_CONFIG_FILE
117
+ );
118
+ yield fs.writeJSON(outputPath, resolvedConfig, {
64
119
  spaces: 2,
65
120
  replacer: safeReplacer()
66
121
  });
67
- };
122
+ });
123
+ export {
124
+ buildServerConfig,
125
+ defineServerConfig,
126
+ emitResolvedConfig,
127
+ safeReplacer
128
+ };
@@ -1,82 +1,115 @@
1
- import crypto from 'crypto';
2
- import fs from 'fs';
3
- import path from 'path';
4
- import { isDev, chokidar, createDebugger, isTest, getServerConfig } from '@modern-js/utils';
5
- /**
6
- * Get user config from package.json.
7
- * @param appDirectory - App root directory.
8
- * @returns modernConfig or undefined
9
- */
10
- // FIXME: read package.json again;
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 crypto from "crypto";
22
+ import fs from "fs";
23
+ import path from "path";
24
+ import {
25
+ isDev,
26
+ chokidar,
27
+ createDebugger,
28
+ isTest,
29
+ getServerConfig
30
+ } from "@modern-js/utils";
11
31
  const getPackageConfig = (appDirectory, packageJsonConfig) => {
12
- const PACKAGE_JSON_CONFIG_NAME = 'modernConfig';
13
- const json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, './package.json'), 'utf8'));
14
- return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
32
+ const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
33
+ const json = JSON.parse(
34
+ fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8")
35
+ );
36
+ return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
15
37
  };
16
- const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
17
- const serverConfig = await getServerConfig(appDirectory, serverConfigFile);
38
+ const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __async(void 0, null, function* () {
39
+ const serverConfig = yield getServerConfig(appDirectory, serverConfigFile);
18
40
  if (serverConfig) {
19
41
  dependencies.push(serverConfig);
20
42
  }
21
- };
22
- const debug = createDebugger('watch-files');
23
- const md5 = data => crypto.createHash('md5').update(data).digest('hex');
24
- const hashMap = new Map();
25
- export const createFileWatcher = async (appContext, configDir, hooksRunner) => {
26
- // only add fs watcher on dev mode.
43
+ });
44
+ const debug = createDebugger("watch-files");
45
+ const md5 = (data) => crypto.createHash("md5").update(data).digest("hex");
46
+ const hashMap = /* @__PURE__ */ new Map();
47
+ const createFileWatcher = (appContext, configDir, hooksRunner) => __async(void 0, null, function* () {
27
48
  if (isDev() || isTest()) {
28
- const {
29
- appDirectory,
30
- configFile
31
- } = appContext;
32
- const extraFiles = await hooksRunner.watchFiles();
49
+ const { appDirectory, configFile } = appContext;
50
+ const extraFiles = yield hooksRunner.watchFiles();
33
51
  const configPath = path.join(appDirectory, configDir);
34
- const dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [path.resolve(appDirectory, './package.json')] : [];
35
-
36
- // 将 server.config 加入到 loaded.dependencies,以便对文件监听做热更新
37
- await addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile);
38
- const watched = [`${configPath}/html`, ...extraFiles, ...dependencies, configFile].filter(Boolean);
52
+ const dependencies = getPackageConfig(
53
+ appContext.appDirectory,
54
+ appContext.packageName
55
+ ) ? [path.resolve(appDirectory, "./package.json")] : [];
56
+ yield addServerConfigToDeps(
57
+ dependencies,
58
+ appContext.appDirectory,
59
+ appContext.serverConfigFile
60
+ );
61
+ const watched = [
62
+ `${configPath}/html`,
63
+ ...extraFiles,
64
+ ...dependencies,
65
+ configFile
66
+ ].filter(Boolean);
39
67
  debug(`watched: %o`, watched);
40
68
  const watcher = chokidar.watch(watched, {
41
69
  cwd: appDirectory,
42
70
  ignoreInitial: true,
43
71
  ignorePermissionErrors: true,
44
- ignored: [/node_modules/, '**/__test__/**', '**/*.test.(js|jsx|ts|tsx)', '**/*.spec.(js|jsx|ts|tsx)', '**/*.stories.(js|jsx|ts|tsx)']
72
+ ignored: [
73
+ /node_modules/,
74
+ "**/__test__/**",
75
+ "**/*.test.(js|jsx|ts|tsx)",
76
+ "**/*.spec.(js|jsx|ts|tsx)",
77
+ "**/*.stories.(js|jsx|ts|tsx)"
78
+ ]
45
79
  });
46
- watcher.on('change', changed => {
80
+ watcher.on("change", (changed) => {
47
81
  const lastHash = hashMap.get(changed);
48
- const currentHash = md5(fs.readFileSync(path.join(appDirectory, changed), 'utf8'));
82
+ const currentHash = md5(
83
+ fs.readFileSync(path.join(appDirectory, changed), "utf8")
84
+ );
49
85
  if (currentHash !== lastHash) {
50
86
  debug(`file change: %s`, changed);
51
87
  hashMap.set(changed, currentHash);
52
- hooksRunner.fileChange({
53
- filename: changed,
54
- eventType: 'change'
55
- });
88
+ hooksRunner.fileChange({ filename: changed, eventType: "change" });
56
89
  }
57
90
  });
58
- watcher.on('add', name => {
91
+ watcher.on("add", (name) => {
59
92
  debug(`add file: %s`, name);
60
- const currentHash = md5(fs.readFileSync(path.join(appDirectory, name), 'utf8'));
93
+ const currentHash = md5(
94
+ fs.readFileSync(path.join(appDirectory, name), "utf8")
95
+ );
61
96
  hashMap.set(name, currentHash);
62
- hooksRunner.fileChange({
63
- filename: name,
64
- eventType: 'add'
65
- });
97
+ hooksRunner.fileChange({ filename: name, eventType: "add" });
66
98
  });
67
- watcher.on('unlink', name => {
99
+ watcher.on("unlink", (name) => {
68
100
  debug(`remove file: %s`, name);
69
101
  if (hashMap.has(name)) {
70
102
  hashMap.delete(name);
71
103
  }
72
- hooksRunner.fileChange({
73
- filename: name,
74
- eventType: 'unlink'
75
- });
104
+ hooksRunner.fileChange({ filename: name, eventType: "unlink" });
76
105
  });
77
- watcher.on('error', err => {
106
+ watcher.on("error", (err) => {
78
107
  throw err;
79
108
  });
80
109
  return watcher;
81
110
  }
82
- };
111
+ });
112
+ export {
113
+ addServerConfigToDeps,
114
+ createFileWatcher
115
+ };
@@ -1,29 +1,75 @@
1
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
2
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
3
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
4
- import { Server } from '@modern-js/server';
1
+ var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
3
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
7
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
8
+ var __spreadValues = (a, b) => {
9
+ for (var prop in b || (b = {}))
10
+ if (__hasOwnProp.call(b, prop))
11
+ __defNormalProp(a, prop, b[prop]);
12
+ if (__getOwnPropSymbols)
13
+ for (var prop of __getOwnPropSymbols(b)) {
14
+ if (__propIsEnum.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ }
17
+ return a;
18
+ };
19
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
20
+ var __async = (__this, __arguments, generator) => {
21
+ return new Promise((resolve, reject) => {
22
+ var fulfilled = (value) => {
23
+ try {
24
+ step(generator.next(value));
25
+ } catch (e) {
26
+ reject(e);
27
+ }
28
+ };
29
+ var rejected = (value) => {
30
+ try {
31
+ step(generator.throw(value));
32
+ } catch (e) {
33
+ reject(e);
34
+ }
35
+ };
36
+ var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
37
+ step((generator = generator.apply(__this, __arguments)).next());
38
+ });
39
+ };
40
+ import { Server } from "@modern-js/server";
5
41
  let server = null;
6
- export const getServer = () => server;
7
- export const closeServer = async () => {
42
+ const getServer = () => server;
43
+ const setServer = (newServer) => {
44
+ server = newServer;
45
+ };
46
+ const closeServer = () => __async(void 0, null, function* () {
8
47
  if (server) {
9
- await server.close();
48
+ yield server.close();
10
49
  server = null;
11
50
  }
12
- };
13
- export const createServer = async options => {
51
+ });
52
+ const createServer = (options) => __async(void 0, null, function* () {
14
53
  if (server) {
15
- await server.close();
54
+ yield server.close();
16
55
  }
17
56
  server = new Server(options);
18
- const app = await server.init();
57
+ const app = yield server.init();
19
58
  return app;
20
- };
21
- export const injectDataLoaderPlugin = internalPlugins => {
22
- const DataLoaderPlugin = require.resolve('@modern-js/plugin-data-loader/server');
23
- return _objectSpread(_objectSpread({}, internalPlugins), {}, {
24
- '@modern-js/plugin-data-loader': {
59
+ });
60
+ const injectDataLoaderPlugin = (internalPlugins) => {
61
+ const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
62
+ return __spreadProps(__spreadValues({}, internalPlugins), {
63
+ "@modern-js/plugin-data-loader": {
25
64
  path: DataLoaderPlugin,
26
65
  forced: true
27
66
  }
28
67
  });
29
- };
68
+ };
69
+ export {
70
+ closeServer,
71
+ createServer,
72
+ getServer,
73
+ injectDataLoaderPlugin,
74
+ setServer
75
+ };
@@ -1,30 +1,57 @@
1
- import { inquirer } from '@modern-js/utils';
2
- export const getSpecifiedEntries = async (entry, entrypoints) => {
3
- const entryNames = entrypoints.map(e => e.entryName);
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 { inquirer } from "@modern-js/utils";
22
+ const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
23
+ const entryNames = entrypoints.map((e) => e.entryName);
4
24
  if (!entry) {
5
25
  return entryNames;
6
26
  }
7
- if (typeof entry === 'boolean') {
8
- const {
9
- selected
10
- } = await inquirer.prompt([{
11
- type: 'checkbox',
12
- name: 'selected',
13
- choices: entryNames,
14
- message: '请选择需要构建的入口',
15
- validate(answer) {
16
- if (answer.length < 1) {
17
- return 'You must choose at least one topping.';
27
+ if (typeof entry === "boolean") {
28
+ const { selected } = yield inquirer.prompt([
29
+ {
30
+ type: "checkbox",
31
+ name: "selected",
32
+ choices: entryNames,
33
+ message: "请选择需要构建的入口",
34
+ validate(answer) {
35
+ if (answer.length < 1) {
36
+ return "You must choose at least one topping.";
37
+ }
38
+ return true;
18
39
  }
19
- return true;
20
40
  }
21
- }]);
41
+ ]);
22
42
  return selected;
23
43
  }
24
- entry.forEach(name => {
44
+ entry.forEach((name) => {
25
45
  if (!entryNames.includes(name)) {
26
- throw new Error(`can not found entry ${name}, compiler entry should in ${entryNames.join(', ')}`);
46
+ throw new Error(
47
+ `can not found entry ${name}, compiler entry should in ${entryNames.join(
48
+ ", "
49
+ )}`
50
+ );
27
51
  }
28
52
  });
29
53
  return entry;
30
- };
54
+ });
55
+ export {
56
+ getSpecifiedEntries
57
+ };
@@ -1,5 +1,8 @@
1
- import { I18CLILanguageDetector } from '@modern-js/plugin-i18n/language-detector';
2
- export function getLocaleLanguage() {
1
+ import { I18CLILanguageDetector } from "@modern-js/plugin-i18n/language-detector";
2
+ function getLocaleLanguage() {
3
3
  const detector = new I18CLILanguageDetector();
4
4
  return detector.detect();
5
- }
5
+ }
6
+ export {
7
+ getLocaleLanguage
8
+ };
@@ -1,12 +1,31 @@
1
- import { prettyInstructions, logger } from '@modern-js/utils';
2
- export const printInstructions = async (hookRunners, appContext, config) => {
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 { prettyInstructions, logger } from "@modern-js/utils";
22
+ const printInstructions = (hookRunners, appContext, config) => __async(void 0, null, function* () {
3
23
  const message = prettyInstructions(appContext, config);
4
-
5
- // call beforePrintInstructions hook.
6
- const {
7
- instructions
8
- } = await hookRunners.beforePrintInstructions({
24
+ const { instructions } = yield hookRunners.beforePrintInstructions({
9
25
  instructions: message
10
26
  });
11
27
  logger.info(instructions);
12
- };
28
+ });
29
+ export {
30
+ printInstructions
31
+ };
@@ -1,17 +1,44 @@
1
- import { cli } from '@modern-js/core';
2
- import { logger, program } from '@modern-js/utils';
3
- export async function restart(hooksRunner) {
4
- logger.info('Restart...\n');
5
- let hasGetError = false;
6
- await hooksRunner.beforeRestart();
7
- try {
8
- await cli.init(cli.initOptions);
9
- } catch (err) {
10
- console.error(err);
11
- hasGetError = true;
12
- } finally {
13
- if (!hasGetError) {
14
- program.parse(process.argv);
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 { cli } from "@modern-js/core";
22
+ import { chalk, clearConsole, logger, program } from "@modern-js/utils";
23
+ function restart(hooksRunner, filename) {
24
+ return __async(this, null, function* () {
25
+ clearConsole();
26
+ logger.info(`Restart because ${chalk.yellow(filename)} is changed...
27
+ `);
28
+ let hasGetError = false;
29
+ yield hooksRunner.beforeRestart();
30
+ try {
31
+ yield cli.init(cli.getPrevInitOptions());
32
+ } catch (err) {
33
+ console.error(err);
34
+ hasGetError = true;
35
+ } finally {
36
+ if (!hasGetError) {
37
+ program.parse(process.argv);
38
+ }
15
39
  }
16
- }
17
- }
40
+ });
41
+ }
42
+ export {
43
+ restart
44
+ };
@@ -1,13 +1,30 @@
1
- import path from 'path';
2
- import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
3
- const generateRoutes = async appContext => {
4
- const {
5
- serverRoutes,
6
- distDirectory
7
- } = appContext;
8
- const output = JSON.stringify({
9
- routes: serverRoutes
10
- }, null, 2);
11
- await fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
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 path from "path";
22
+ import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
23
+ const generateRoutes = (appContext) => __async(void 0, null, function* () {
24
+ const { serverRoutes, distDirectory } = appContext;
25
+ const output = JSON.stringify({ routes: serverRoutes }, null, 2);
26
+ yield fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
27
+ });
28
+ export {
29
+ generateRoutes
12
30
  };
13
- export { generateRoutes };