umi 3.5.17 → 4.0.0-beta.1

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 (68) hide show
  1. package/README.md +1 -52
  2. package/client/client/plugin.d.ts +34 -0
  3. package/client/client/plugin.js +121 -0
  4. package/client/client/utils.d.ts +6 -0
  5. package/client/client/utils.js +14 -0
  6. package/{lib → dist/cli}/cli.d.ts +0 -0
  7. package/dist/cli/cli.js +51 -0
  8. package/dist/cli/dev.d.ts +1 -0
  9. package/dist/cli/dev.js +26 -0
  10. package/{lib/utils → dist/cli}/fork.d.ts +0 -0
  11. package/dist/cli/fork.js +40 -0
  12. package/{lib → dist/cli}/forkedDev.d.ts +0 -0
  13. package/dist/cli/forkedDev.js +51 -0
  14. package/dist/cli/node.d.ts +4 -0
  15. package/dist/cli/node.js +32 -0
  16. package/dist/client/plugin.d.ts +34 -0
  17. package/dist/client/plugin.js +125 -0
  18. package/dist/client/utils.d.ts +6 -0
  19. package/dist/client/utils.js +20 -0
  20. package/dist/constants.d.ts +5 -0
  21. package/dist/constants.js +13 -0
  22. package/dist/index.d.ts +3 -2
  23. package/dist/index.js +13 -0
  24. package/dist/service/cwd.d.ts +1 -0
  25. package/dist/service/cwd.js +13 -0
  26. package/dist/service/service.d.ts +8 -0
  27. package/dist/service/service.js +45 -0
  28. package/index.d.ts +3 -0
  29. package/index.esm.js +2 -0
  30. package/package.json +21 -27
  31. package/bin/umi.js +0 -15
  32. package/dist/index.esm.js +0 -2
  33. package/dist/src/ServiceWithBuiltIn.d.ts +0 -5
  34. package/dist/src/cjs.d.ts +0 -8
  35. package/dist/src/cli.d.ts +0 -1
  36. package/dist/src/defineConfig.d.ts +0 -3
  37. package/dist/src/defineConfig.test.d.ts +0 -1
  38. package/dist/src/forkedDev.d.ts +0 -1
  39. package/dist/src/index.d.ts +0 -3
  40. package/dist/src/initWebpack.d.ts +0 -2
  41. package/dist/src/plugins/umiAlias.d.ts +0 -3
  42. package/dist/src/plugins/umiAlias.test.d.ts +0 -1
  43. package/dist/src/utils/fork.d.ts +0 -6
  44. package/dist/src/utils/getCwd.d.ts +0 -2
  45. package/dist/src/utils/getCwd.test.d.ts +0 -1
  46. package/dist/src/utils/getPkg.d.ts +0 -2
  47. package/dist/src/utils/getPkg.test.d.ts +0 -1
  48. package/index.js +0 -6
  49. package/lib/ServiceWithBuiltIn.d.ts +0 -5
  50. package/lib/ServiceWithBuiltIn.js +0 -58
  51. package/lib/cjs.d.ts +0 -8
  52. package/lib/cjs.js +0 -88
  53. package/lib/cli.js +0 -133
  54. package/lib/defineConfig.d.ts +0 -4
  55. package/lib/defineConfig.js +0 -23
  56. package/lib/forkedDev.js +0 -78
  57. package/lib/index.d.ts +0 -3
  58. package/lib/index.js +0 -204
  59. package/lib/initWebpack.d.ts +0 -2
  60. package/lib/initWebpack.js +0 -109
  61. package/lib/plugins/umiAlias.d.ts +0 -3
  62. package/lib/plugins/umiAlias.js +0 -30
  63. package/lib/utils/fork.js +0 -86
  64. package/lib/utils/getCwd.d.ts +0 -2
  65. package/lib/utils/getCwd.js +0 -45
  66. package/lib/utils/getPkg.d.ts +0 -2
  67. package/lib/utils/getPkg.js +0 -44
  68. package/types.d.ts +0 -3
package/lib/forkedDev.js DELETED
@@ -1,78 +0,0 @@
1
- "use strict";
2
-
3
- function _react() {
4
- const data = _interopRequireDefault(require("react"));
5
-
6
- _react = function _react() {
7
- return data;
8
- };
9
-
10
- return data;
11
- }
12
-
13
- function _utils() {
14
- const data = require("@umijs/utils");
15
-
16
- _utils = function _utils() {
17
- return data;
18
- };
19
-
20
- return data;
21
- }
22
-
23
- var _initWebpack = _interopRequireDefault(require("./initWebpack"));
24
-
25
- var _ServiceWithBuiltIn = require("./ServiceWithBuiltIn");
26
-
27
- var _getCwd = _interopRequireDefault(require("./utils/getCwd"));
28
-
29
- var _getPkg = _interopRequireDefault(require("./utils/getPkg"));
30
-
31
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
32
-
33
- function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
34
-
35
- function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
36
-
37
- const args = (0, _utils().yParser)(process.argv.slice(2));
38
-
39
- _asyncToGenerator(function* () {
40
- try {
41
- process.env.NODE_ENV = 'development'; // Init webpack version determination and require hook
42
-
43
- (0, _initWebpack.default)();
44
- const service = new _ServiceWithBuiltIn.Service({
45
- cwd: (0, _getCwd.default)(),
46
- pkg: (0, _getPkg.default)(process.cwd())
47
- });
48
- yield service.run({
49
- name: 'dev',
50
- args
51
- });
52
- let closed = false; // kill(2) Ctrl-C
53
-
54
- process.once('SIGINT', () => onSignal('SIGINT')); // kill(3) Ctrl-\
55
-
56
- process.once('SIGQUIT', () => onSignal('SIGQUIT')); // kill(15) default
57
-
58
- process.once('SIGTERM', () => onSignal('SIGTERM'));
59
-
60
- function onSignal(signal) {
61
- if (closed) return;
62
- closed = true; // 退出时触发插件中的onExit事件
63
-
64
- service.applyPlugins({
65
- key: 'onExit',
66
- type: service.ApplyPluginsType.event,
67
- args: {
68
- signal
69
- }
70
- });
71
- process.exit(0);
72
- }
73
- } catch (e) {
74
- console.error(_utils().chalk.red(e.message));
75
- console.error(e.stack);
76
- process.exit(1);
77
- }
78
- })();
package/lib/index.d.ts DELETED
@@ -1,3 +0,0 @@
1
- export * from '@@/core/umiExports';
2
- export { ApplyPluginsType, createBrowserHistory, createHashHistory, createMemoryHistory, dynamic, isBrowser, Link, matchPath, MemoryRouter, NavLink, Plugin, Prompt, Redirect, Route, Router, StaticRouter, Switch, useHistory, useLocation, useParams, useRouteMatch, withRouter, __RouterContext, } from '@umijs/runtime';
3
- export type { MemoryHistory } from '@umijs/runtime';
package/lib/index.js DELETED
@@ -1,204 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- var _exportNames = {
7
- ApplyPluginsType: true,
8
- createBrowserHistory: true,
9
- createHashHistory: true,
10
- createMemoryHistory: true,
11
- dynamic: true,
12
- isBrowser: true,
13
- Link: true,
14
- matchPath: true,
15
- MemoryRouter: true,
16
- NavLink: true,
17
- Plugin: true,
18
- Prompt: true,
19
- Redirect: true,
20
- Route: true,
21
- Router: true,
22
- StaticRouter: true,
23
- Switch: true,
24
- useHistory: true,
25
- useLocation: true,
26
- useParams: true,
27
- useRouteMatch: true,
28
- withRouter: true,
29
- __RouterContext: true
30
- };
31
- Object.defineProperty(exports, "ApplyPluginsType", {
32
- enumerable: true,
33
- get: function get() {
34
- return _runtime().ApplyPluginsType;
35
- }
36
- });
37
- Object.defineProperty(exports, "createBrowserHistory", {
38
- enumerable: true,
39
- get: function get() {
40
- return _runtime().createBrowserHistory;
41
- }
42
- });
43
- Object.defineProperty(exports, "createHashHistory", {
44
- enumerable: true,
45
- get: function get() {
46
- return _runtime().createHashHistory;
47
- }
48
- });
49
- Object.defineProperty(exports, "createMemoryHistory", {
50
- enumerable: true,
51
- get: function get() {
52
- return _runtime().createMemoryHistory;
53
- }
54
- });
55
- Object.defineProperty(exports, "dynamic", {
56
- enumerable: true,
57
- get: function get() {
58
- return _runtime().dynamic;
59
- }
60
- });
61
- Object.defineProperty(exports, "isBrowser", {
62
- enumerable: true,
63
- get: function get() {
64
- return _runtime().isBrowser;
65
- }
66
- });
67
- Object.defineProperty(exports, "Link", {
68
- enumerable: true,
69
- get: function get() {
70
- return _runtime().Link;
71
- }
72
- });
73
- Object.defineProperty(exports, "matchPath", {
74
- enumerable: true,
75
- get: function get() {
76
- return _runtime().matchPath;
77
- }
78
- });
79
- Object.defineProperty(exports, "MemoryRouter", {
80
- enumerable: true,
81
- get: function get() {
82
- return _runtime().MemoryRouter;
83
- }
84
- });
85
- Object.defineProperty(exports, "NavLink", {
86
- enumerable: true,
87
- get: function get() {
88
- return _runtime().NavLink;
89
- }
90
- });
91
- Object.defineProperty(exports, "Plugin", {
92
- enumerable: true,
93
- get: function get() {
94
- return _runtime().Plugin;
95
- }
96
- });
97
- Object.defineProperty(exports, "Prompt", {
98
- enumerable: true,
99
- get: function get() {
100
- return _runtime().Prompt;
101
- }
102
- });
103
- Object.defineProperty(exports, "Redirect", {
104
- enumerable: true,
105
- get: function get() {
106
- return _runtime().Redirect;
107
- }
108
- });
109
- Object.defineProperty(exports, "Route", {
110
- enumerable: true,
111
- get: function get() {
112
- return _runtime().Route;
113
- }
114
- });
115
- Object.defineProperty(exports, "Router", {
116
- enumerable: true,
117
- get: function get() {
118
- return _runtime().Router;
119
- }
120
- });
121
- Object.defineProperty(exports, "StaticRouter", {
122
- enumerable: true,
123
- get: function get() {
124
- return _runtime().StaticRouter;
125
- }
126
- });
127
- Object.defineProperty(exports, "Switch", {
128
- enumerable: true,
129
- get: function get() {
130
- return _runtime().Switch;
131
- }
132
- });
133
- Object.defineProperty(exports, "useHistory", {
134
- enumerable: true,
135
- get: function get() {
136
- return _runtime().useHistory;
137
- }
138
- });
139
- Object.defineProperty(exports, "useLocation", {
140
- enumerable: true,
141
- get: function get() {
142
- return _runtime().useLocation;
143
- }
144
- });
145
- Object.defineProperty(exports, "useParams", {
146
- enumerable: true,
147
- get: function get() {
148
- return _runtime().useParams;
149
- }
150
- });
151
- Object.defineProperty(exports, "useRouteMatch", {
152
- enumerable: true,
153
- get: function get() {
154
- return _runtime().useRouteMatch;
155
- }
156
- });
157
- Object.defineProperty(exports, "withRouter", {
158
- enumerable: true,
159
- get: function get() {
160
- return _runtime().withRouter;
161
- }
162
- });
163
- Object.defineProperty(exports, "__RouterContext", {
164
- enumerable: true,
165
- get: function get() {
166
- return _runtime().__RouterContext;
167
- }
168
- });
169
-
170
- function _react() {
171
- const data = _interopRequireDefault(require("react"));
172
-
173
- _react = function _react() {
174
- return data;
175
- };
176
-
177
- return data;
178
- }
179
-
180
- var _umiExports = require("@@/core/umiExports");
181
-
182
- Object.keys(_umiExports).forEach(function (key) {
183
- if (key === "default" || key === "__esModule") return;
184
- if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
185
- if (key in exports && exports[key] === _umiExports[key]) return;
186
- Object.defineProperty(exports, key, {
187
- enumerable: true,
188
- get: function get() {
189
- return _umiExports[key];
190
- }
191
- });
192
- });
193
-
194
- function _runtime() {
195
- const data = require("@umijs/runtime");
196
-
197
- _runtime = function _runtime() {
198
- return data;
199
- };
200
-
201
- return data;
202
- }
203
-
204
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -1,2 +0,0 @@
1
- declare const _default: () => void;
2
- export default _default;
@@ -1,109 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- function _react() {
9
- const data = _interopRequireDefault(require("react"));
10
-
11
- _react = function _react() {
12
- return data;
13
- };
14
-
15
- return data;
16
- }
17
-
18
- function _requireHook() {
19
- const data = require("@umijs/bundler-webpack/lib/requireHook");
20
-
21
- _requireHook = function _requireHook() {
22
- return data;
23
- };
24
-
25
- return data;
26
- }
27
-
28
- function _webpack() {
29
- const data = require("@umijs/deps/compiled/webpack");
30
-
31
- _webpack = function _webpack() {
32
- return data;
33
- };
34
-
35
- return data;
36
- }
37
-
38
- function _utils() {
39
- const data = require("@umijs/utils");
40
-
41
- _utils = function _utils() {
42
- return data;
43
- };
44
-
45
- return data;
46
- }
47
-
48
- function _fs() {
49
- const data = require("fs");
50
-
51
- _fs = function _fs() {
52
- return data;
53
- };
54
-
55
- return data;
56
- }
57
-
58
- function _path() {
59
- const data = require("path");
60
-
61
- _path = function _path() {
62
- return data;
63
- };
64
-
65
- return data;
66
- }
67
-
68
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
69
-
70
- const debug = (0, _utils().createDebug)('umi:cli:initWebpack');
71
- const DEFAULT_CONFIG_FILES = ['.umirc.ts', '.umirc.js', 'config/config.ts', 'config/config.js'];
72
-
73
- function getConfigFile(opts) {
74
- const configFile = DEFAULT_CONFIG_FILES.filter(file => {
75
- return (0, _fs().existsSync)((0, _path().join)(opts.cwd, file));
76
- })[0];
77
- return configFile ? (0, _path().join)(opts.cwd, configFile) : null;
78
- }
79
-
80
- var _default = () => {
81
- // 1. read user config
82
- // 2. if have webpack5:
83
- // 3. init webpack with webpack5 flag
84
- let cwd = process.cwd();
85
-
86
- if (process.env.APP_ROOT) {
87
- cwd = (0, _path().join)(cwd, process.env.APP_ROOT);
88
- }
89
-
90
- const configFile = getConfigFile({
91
- cwd
92
- });
93
- const configContent = configFile ? (0, _fs().readFileSync)(configFile, 'utf-8') : ''; // TODO: detect with ast
94
-
95
- const haveWebpack5 = configContent.includes('webpack5:') && !configContent.includes('// webpack5:') && !configContent.includes('//webpack5:') || configContent.includes('mfsu:') && !configContent.includes('// mfsu:') && !configContent.includes('//mfsu:');
96
- debug(`haveWebpack5: ${haveWebpack5}`);
97
- debug(`process.env.USE_WEBPACK_5: ${process.env.USE_WEBPACK_5}`);
98
-
99
- if (haveWebpack5 || process.env.USE_WEBPACK_5) {
100
- process.env.USE_WEBPACK_5 = '1';
101
- (0, _webpack().init)(true);
102
- } else {
103
- (0, _webpack().init)();
104
- }
105
-
106
- (0, _requireHook().init)();
107
- };
108
-
109
- exports.default = _default;
@@ -1,3 +0,0 @@
1
- import { IApi } from '@umijs/types';
2
- declare const _default: (api: IApi) => void;
3
- export default _default;
@@ -1,30 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- function _react() {
9
- const data = _interopRequireDefault(require("react"));
10
-
11
- _react = function _react() {
12
- return data;
13
- };
14
-
15
- return data;
16
- }
17
-
18
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
-
20
- var _default = api => {
21
- api.chainWebpack(memo => {
22
- if (process.env.UMI_DIR) {
23
- memo.resolve.alias.set('umi', process.env.UMI_DIR);
24
- }
25
-
26
- return memo;
27
- });
28
- };
29
-
30
- exports.default = _default;
package/lib/utils/fork.js DELETED
@@ -1,86 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = start;
7
-
8
- function _react() {
9
- const data = _interopRequireDefault(require("react"));
10
-
11
- _react = function _react() {
12
- return data;
13
- };
14
-
15
- return data;
16
- }
17
-
18
- function _child_process() {
19
- const data = require("child_process");
20
-
21
- _child_process = function _child_process() {
22
- return data;
23
- };
24
-
25
- return data;
26
- }
27
-
28
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
29
-
30
- const usedPorts = [];
31
- let CURRENT_PORT;
32
-
33
- function start({
34
- scriptPath
35
- }) {
36
- const execArgv = process.execArgv.slice(0);
37
- const inspectArgvIndex = execArgv.findIndex(argv => argv.includes('--inspect-brk'));
38
-
39
- if (inspectArgvIndex > -1) {
40
- const inspectArgv = execArgv[inspectArgvIndex];
41
- execArgv.splice(inspectArgvIndex, 1, inspectArgv.replace(/--inspect-brk=(.*)/, (match, s1) => {
42
- let port;
43
-
44
- try {
45
- port = parseInt(s1) + 1;
46
- } catch (e) {
47
- port = 9230; // node default inspect port plus 1.
48
- }
49
-
50
- if (usedPorts.includes(port)) {
51
- port += 1;
52
- }
53
-
54
- usedPorts.push(port);
55
- return `--inspect-brk=${port}`;
56
- }));
57
- } // set port to env when current port has value
58
-
59
-
60
- if (CURRENT_PORT) {
61
- // @ts-ignore
62
- process.env.PORT = CURRENT_PORT;
63
- }
64
-
65
- const child = (0, _child_process().fork)(scriptPath, process.argv.slice(2), {
66
- execArgv
67
- });
68
- child.on('message', data => {
69
- var _process$send, _process;
70
-
71
- const type = data && data.type || null;
72
-
73
- if (type === 'RESTART') {
74
- child.kill();
75
- start({
76
- scriptPath
77
- });
78
- } else if (type === 'UPDATE_PORT') {
79
- // set current used port
80
- CURRENT_PORT = data.port;
81
- }
82
-
83
- (_process$send = (_process = process).send) === null || _process$send === void 0 ? void 0 : _process$send.call(_process, data);
84
- });
85
- return child;
86
- }
@@ -1,2 +0,0 @@
1
- declare const _default: () => string;
2
- export default _default;
@@ -1,45 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- function _react() {
9
- const data = _interopRequireDefault(require("react"));
10
-
11
- _react = function _react() {
12
- return data;
13
- };
14
-
15
- return data;
16
- }
17
-
18
- function _path() {
19
- const data = require("path");
20
-
21
- _path = function _path() {
22
- return data;
23
- };
24
-
25
- return data;
26
- }
27
-
28
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
29
-
30
- var _default = () => {
31
- let cwd = process.cwd();
32
-
33
- if (process.env.APP_ROOT) {
34
- // avoid repeat cwd path
35
- if (!(0, _path().isAbsolute)(process.env.APP_ROOT)) {
36
- return (0, _path().join)(cwd, process.env.APP_ROOT);
37
- }
38
-
39
- return process.env.APP_ROOT;
40
- }
41
-
42
- return cwd;
43
- };
44
-
45
- exports.default = _default;
@@ -1,2 +0,0 @@
1
- declare const _default: (dir: string) => any;
2
- export default _default;
@@ -1,44 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- function _react() {
9
- const data = _interopRequireDefault(require("react"));
10
-
11
- _react = function _react() {
12
- return data;
13
- };
14
-
15
- return data;
16
- }
17
-
18
- function _path() {
19
- const data = require("path");
20
-
21
- _path = function _path() {
22
- return data;
23
- };
24
-
25
- return data;
26
- }
27
-
28
- var _getCwd = _interopRequireDefault(require("./getCwd"));
29
-
30
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
31
-
32
- var _default = dir => {
33
- try {
34
- return require((0, _path().join)((0, _getCwd.default)(), 'package.json'));
35
- } catch (error) {
36
- try {
37
- return require((0, _path().join)(dir, 'package.json'));
38
- } catch (error) {
39
- return null;
40
- }
41
- }
42
- };
43
-
44
- exports.default = _default;
package/types.d.ts DELETED
@@ -1,3 +0,0 @@
1
- // @ts-ignore
2
- export * from '@@/core/umiExports';
3
- export * from './lib/cjs';