swico 1.1.0-beta.1 → 1.1.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/command/start.js +33 -8
package/package.json
CHANGED
package/src/command/start.js
CHANGED
|
@@ -57,18 +57,15 @@ var tools_1 = require("../utils/tools");
|
|
|
57
57
|
var config_1 = require("../utils/config");
|
|
58
58
|
var chokidar_1 = __importDefault(require("chokidar"));
|
|
59
59
|
var path_1 = __importDefault(require("path"));
|
|
60
|
-
var ora_1 = __importDefault(require("ora"));
|
|
61
60
|
var cross_spawn_1 = __importDefault(require("cross-spawn"));
|
|
62
61
|
var _a = process.env, envPort = _a.PORT, RESTART = _a.RESTART;
|
|
63
62
|
var package_json_1 = __importDefault(require("../../package.json"));
|
|
64
63
|
var chalk_1 = __importDefault(require("chalk"));
|
|
65
|
-
var spinner = (0, ora_1.default)();
|
|
66
64
|
var handleWatch = function (projectPath, devServer) {
|
|
67
65
|
var configFilesWatcher = chokidar_1.default
|
|
68
66
|
.watch([
|
|
69
67
|
path_1.default.join(projectPath, '/config/*.ts'),
|
|
70
|
-
path_1.default.join(projectPath, '/.eslintrc')
|
|
71
|
-
path_1.default.join(projectPath, '/src/loading/index.tsx')
|
|
68
|
+
path_1.default.join(projectPath, '/.eslintrc')
|
|
72
69
|
], {
|
|
73
70
|
interval: 500,
|
|
74
71
|
binaryInterval: 500,
|
|
@@ -115,8 +112,34 @@ var handleWatch = function (projectPath, devServer) {
|
|
|
115
112
|
}
|
|
116
113
|
});
|
|
117
114
|
}); });
|
|
115
|
+
var otherWatcher = chokidar_1.default
|
|
116
|
+
.watch([
|
|
117
|
+
path_1.default.join(projectPath, '/src/loading/index.tsx'),
|
|
118
|
+
path_1.default.join(projectPath, '/src/global.css'),
|
|
119
|
+
path_1.default.join(projectPath, '/src/global.less'),
|
|
120
|
+
path_1.default.join(projectPath, '/src/global.scss')
|
|
121
|
+
], {
|
|
122
|
+
interval: 500,
|
|
123
|
+
binaryInterval: 500,
|
|
124
|
+
ignoreInitial: true
|
|
125
|
+
})
|
|
126
|
+
.on('add', function (eventName, path) { return __awaiter(void 0, void 0, void 0, function () {
|
|
127
|
+
return __generator(this, function (_a) {
|
|
128
|
+
switch (_a.label) {
|
|
129
|
+
case 0: return [4, devServer.stop()];
|
|
130
|
+
case 1:
|
|
131
|
+
_a.sent();
|
|
132
|
+
return [4, otherWatcher.close()];
|
|
133
|
+
case 2:
|
|
134
|
+
_a.sent();
|
|
135
|
+
restartServer();
|
|
136
|
+
return [2];
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
}); });
|
|
118
140
|
};
|
|
119
141
|
var availablePort;
|
|
142
|
+
var routerBase = '/';
|
|
120
143
|
var restartServer = function () {
|
|
121
144
|
var result = cross_spawn_1.default.sync('cross-env', ["PORT=".concat(availablePort), 'RESTART=true', 'swico', 'start'], {
|
|
122
145
|
stdio: 'inherit'
|
|
@@ -160,7 +183,7 @@ var createCompileListener = function (compiler) {
|
|
|
160
183
|
function start() {
|
|
161
184
|
var _a, _b, _c, _d, _e, _f;
|
|
162
185
|
return __awaiter(this, void 0, void 0, function () {
|
|
163
|
-
var _g, projectConfig, projectPath, customConfig,
|
|
186
|
+
var _g, projectConfig, projectPath, customConfig, newRouterBase, startConfig, compiler, oriLogger, devServer, e_1, strErr;
|
|
164
187
|
return __generator(this, function (_h) {
|
|
165
188
|
switch (_h.label) {
|
|
166
189
|
case 0:
|
|
@@ -185,7 +208,7 @@ function start() {
|
|
|
185
208
|
case 5:
|
|
186
209
|
projectConfig = _h.sent();
|
|
187
210
|
projectPath = projectConfig.projectPath, customConfig = projectConfig.customConfig;
|
|
188
|
-
|
|
211
|
+
newRouterBase = (_f = (_c = (_b = (_a = customConfig['dev']) === null || _a === void 0 ? void 0 : _a.router) === null || _b === void 0 ? void 0 : _b.base) !== null && _c !== void 0 ? _c : (_e = (_d = customConfig['base']) === null || _d === void 0 ? void 0 : _d.router) === null || _e === void 0 ? void 0 : _e.base) !== null && _f !== void 0 ? _f : '/';
|
|
189
212
|
return [4, (0, webpack_dev_1.default)(projectConfig)];
|
|
190
213
|
case 6:
|
|
191
214
|
startConfig = _h.sent();
|
|
@@ -193,6 +216,7 @@ function start() {
|
|
|
193
216
|
oriLogger = compiler.getInfrastructureLogger;
|
|
194
217
|
compiler.getInfrastructureLogger = getMockGetLogger(compiler);
|
|
195
218
|
devServer = new webpack_dev_server_1.default(__assign(__assign({}, startConfig.devServer), { port: availablePort }), compiler);
|
|
219
|
+
devServer.watchFiles([], {});
|
|
196
220
|
_h.label = 7;
|
|
197
221
|
case 7:
|
|
198
222
|
_h.trys.push([7, 9, , 10]);
|
|
@@ -202,9 +226,10 @@ function start() {
|
|
|
202
226
|
createCompileListener(compiler);
|
|
203
227
|
compiler.getInfrastructureLogger = oriLogger;
|
|
204
228
|
handleWatch(projectPath, devServer);
|
|
205
|
-
if (RESTART !== 'true') {
|
|
206
|
-
tools_1.toast.info("Project is running at\uFF1A".concat(chalk_1.default.hex('#29abe0')("".concat(startConfig.devServer.server, "://localhost:").concat(availablePort).concat(
|
|
229
|
+
if (RESTART !== 'true' || newRouterBase !== routerBase) {
|
|
230
|
+
tools_1.toast.info("Project is running at\uFF1A".concat(chalk_1.default.hex('#29abe0')("".concat(startConfig.devServer.server, "://localhost:").concat(availablePort).concat(newRouterBase))));
|
|
207
231
|
}
|
|
232
|
+
routerBase = newRouterBase;
|
|
208
233
|
return [3, 10];
|
|
209
234
|
case 9:
|
|
210
235
|
e_1 = _h.sent();
|