swico 1.1.0-beta.4 → 1.1.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.
- package/package.json +3 -3
- package/src/command/start.js +22 -11
- package/src/config/webpack.base.vue.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "swico",
|
|
3
|
-
"version": "1.1.0-beta.
|
|
3
|
+
"version": "1.1.0-beta.6",
|
|
4
4
|
"description": "Simple, efficient, and practical front-end framework",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"types": "./src/index.d.ts",
|
|
@@ -73,8 +73,8 @@
|
|
|
73
73
|
"postcss-loader": "8.1.0",
|
|
74
74
|
"postcss-preset-env": "9.3.0",
|
|
75
75
|
"prettier": "3.2.5",
|
|
76
|
-
"sass": "
|
|
77
|
-
"sass-loader": "
|
|
76
|
+
"sass": "1.77.5",
|
|
77
|
+
"sass-loader": "14.2.1",
|
|
78
78
|
"style-loader": "3.3.0",
|
|
79
79
|
"swc-loader": "0.2.6",
|
|
80
80
|
"ts-node": "10.9.1",
|
package/src/command/start.js
CHANGED
|
@@ -56,16 +56,15 @@ var webpack_dev_1 = __importDefault(require("../config/webpack.dev"));
|
|
|
56
56
|
var tools_1 = require("../utils/tools");
|
|
57
57
|
var config_1 = require("../utils/config");
|
|
58
58
|
var chokidar_1 = __importDefault(require("chokidar"));
|
|
59
|
+
var cross_spawn_1 = __importDefault(require("cross-spawn"));
|
|
59
60
|
var path_1 = __importDefault(require("path"));
|
|
60
61
|
var _a = process.env, SWICO_PORT = _a.SWICO_PORT, SWICO_RESTART = _a.SWICO_RESTART, SWICO_ROUTER_BASE = _a.SWICO_ROUTER_BASE;
|
|
61
62
|
var package_json_1 = __importDefault(require("../../package.json"));
|
|
62
63
|
var chalk_1 = __importDefault(require("chalk"));
|
|
64
|
+
var currentPort, currentRouterBase = '/';
|
|
63
65
|
var handleWatch = function (projectPath, devServer) {
|
|
64
66
|
var configFilesWatcher = chokidar_1.default
|
|
65
|
-
.watch([
|
|
66
|
-
path_1.default.join(projectPath, '/config/*.ts'),
|
|
67
|
-
path_1.default.join(projectPath, '/.eslintrc')
|
|
68
|
-
], {
|
|
67
|
+
.watch([path_1.default.join(projectPath, '/config/*.ts'), path_1.default.join(projectPath, '/.eslintrc')], {
|
|
69
68
|
interval: 500,
|
|
70
69
|
binaryInterval: 500,
|
|
71
70
|
ignoreInitial: true
|
|
@@ -83,8 +82,7 @@ var handleWatch = function (projectPath, devServer) {
|
|
|
83
82
|
return [4, configFilesWatcher.close()];
|
|
84
83
|
case 2:
|
|
85
84
|
_a.sent();
|
|
86
|
-
|
|
87
|
-
start();
|
|
85
|
+
restartServer();
|
|
88
86
|
return [2];
|
|
89
87
|
}
|
|
90
88
|
});
|
|
@@ -112,14 +110,28 @@ var handleWatch = function (projectPath, devServer) {
|
|
|
112
110
|
return [4, tsTypingsWatcher.close()];
|
|
113
111
|
case 2:
|
|
114
112
|
_a.sent();
|
|
115
|
-
|
|
116
|
-
start();
|
|
113
|
+
restartServer();
|
|
117
114
|
_a.label = 3;
|
|
118
115
|
case 3: return [2];
|
|
119
116
|
}
|
|
120
117
|
});
|
|
121
118
|
}); });
|
|
122
119
|
};
|
|
120
|
+
var restartServer = function () {
|
|
121
|
+
var result = cross_spawn_1.default.sync('cross-env', [
|
|
122
|
+
'SWICO_RESTART=true',
|
|
123
|
+
"SWICO_PORT=".concat(currentPort),
|
|
124
|
+
"SWICO_ROUTER_BASE=".concat(currentRouterBase),
|
|
125
|
+
'swico',
|
|
126
|
+
'start'
|
|
127
|
+
], {
|
|
128
|
+
stdio: 'inherit'
|
|
129
|
+
});
|
|
130
|
+
if (result.error) {
|
|
131
|
+
tools_1.toast.error(result.error.message());
|
|
132
|
+
process.exit(1);
|
|
133
|
+
}
|
|
134
|
+
};
|
|
123
135
|
var getMockGetLogger = function (compiler) {
|
|
124
136
|
var logger = compiler.getInfrastructureLogger('name');
|
|
125
137
|
var log = logger.log, debug = logger.debug, error = logger.error, warn = logger.warn;
|
|
@@ -158,7 +170,6 @@ function start() {
|
|
|
158
170
|
return __generator(this, function (_h) {
|
|
159
171
|
switch (_h.label) {
|
|
160
172
|
case 0:
|
|
161
|
-
console.log('env', SWICO_RESTART, SWICO_PORT, SWICO_ROUTER_BASE);
|
|
162
173
|
process.env.SWICO_ENV = 'dev';
|
|
163
174
|
if (SWICO_RESTART !== 'true') {
|
|
164
175
|
tools_1.toast.info("Swico v".concat(package_json_1.default.version));
|
|
@@ -188,7 +199,6 @@ function start() {
|
|
|
188
199
|
oriLogger = compiler.getInfrastructureLogger;
|
|
189
200
|
compiler.getInfrastructureLogger = getMockGetLogger(compiler);
|
|
190
201
|
devServer = new webpack_dev_server_1.default(__assign(__assign({}, startConfig.devServer), { port: availablePort }), compiler);
|
|
191
|
-
devServer.watchFiles([], {});
|
|
192
202
|
_h.label = 7;
|
|
193
203
|
case 7:
|
|
194
204
|
_h.trys.push([7, 9, , 10]);
|
|
@@ -203,7 +213,8 @@ function start() {
|
|
|
203
213
|
(SWICO_RESTART === 'true' && newRouterBase !== SWICO_ROUTER_BASE)) {
|
|
204
214
|
tools_1.toast.info("Project is running at\uFF1A".concat(chalk_1.default.hex('#29abe0')("".concat(startConfig.devServer.server, "://localhost:").concat(availablePort).concat(newRouterBase))));
|
|
205
215
|
}
|
|
206
|
-
|
|
216
|
+
currentRouterBase = newRouterBase;
|
|
217
|
+
currentPort = availablePort;
|
|
207
218
|
return [3, 10];
|
|
208
219
|
case 9:
|
|
209
220
|
e_1 = _h.sent();
|