swico 1.1.0-beta.3 → 1.1.0-beta.5

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "swico",
3
- "version": "1.1.0-beta.3",
3
+ "version": "1.1.0-beta.5",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -56,11 +56,12 @@ 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 path_1 = __importDefault(require("path"));
60
59
  var cross_spawn_1 = __importDefault(require("cross-spawn"));
61
- var _a = process.env, envPort = _a.PORT, RESTART = _a.RESTART;
60
+ var path_1 = __importDefault(require("path"));
61
+ var _a = process.env, SWICO_PORT = _a.SWICO_PORT, SWICO_RESTART = _a.SWICO_RESTART, SWICO_ROUTER_BASE = _a.SWICO_ROUTER_BASE;
62
62
  var package_json_1 = __importDefault(require("../../package.json"));
63
63
  var chalk_1 = __importDefault(require("chalk"));
64
+ var currentPort, currentRouterBase = '/';
64
65
  var handleWatch = function (projectPath, devServer) {
65
66
  var configFilesWatcher = chokidar_1.default
66
67
  .watch([
@@ -119,10 +120,14 @@ var handleWatch = function (projectPath, devServer) {
119
120
  });
120
121
  }); });
121
122
  };
122
- var availablePort;
123
- var routerBase = '/';
124
123
  var restartServer = function () {
125
- var result = cross_spawn_1.default.sync('cross-env', ["PORT=".concat(availablePort), 'RESTART=true', 'swico', 'start'], {
124
+ var result = cross_spawn_1.default.sync('cross-env', [
125
+ 'SWICO_RESTART=true',
126
+ "SWICO_PORT=".concat(currentPort),
127
+ "SWICO_ROUTER_BASE=".concat(currentRouterBase),
128
+ 'swico',
129
+ 'start'
130
+ ], {
126
131
  stdio: 'inherit'
127
132
  });
128
133
  if (result.error) {
@@ -164,25 +169,25 @@ var createCompileListener = function (compiler) {
164
169
  function start() {
165
170
  var _a, _b, _c, _d, _e, _f;
166
171
  return __awaiter(this, void 0, void 0, function () {
167
- var _g, projectConfig, projectPath, customConfig, newRouterBase, startConfig, compiler, oriLogger, devServer, e_1, strErr;
172
+ var availablePort, _g, projectConfig, projectPath, customConfig, newRouterBase, startConfig, compiler, oriLogger, devServer, e_1, strErr;
168
173
  return __generator(this, function (_h) {
169
174
  switch (_h.label) {
170
175
  case 0:
171
- console.log('routerBase', routerBase, availablePort);
176
+ console.log('env', SWICO_RESTART, SWICO_PORT, SWICO_ROUTER_BASE);
172
177
  process.env.SWICO_ENV = 'dev';
173
- if (RESTART !== 'true') {
178
+ if (SWICO_RESTART !== 'true') {
174
179
  tools_1.toast.info("Swico v".concat(package_json_1.default.version));
175
180
  tools_1.toast.info('Initializing development config...');
176
181
  }
177
182
  return [4, (0, tools_1.initIndexFile)()];
178
183
  case 1:
179
184
  _h.sent();
180
- if (!(envPort !== null && envPort !== void 0)) return [3, 2];
181
- _g = envPort;
185
+ if (!(SWICO_RESTART === 'true')) return [3, 2];
186
+ _g = Number(SWICO_PORT);
182
187
  return [3, 4];
183
188
  case 2: return [4, (0, tools_1.getPort)()];
184
189
  case 3:
185
- _g = (_h.sent());
190
+ _g = _h.sent();
186
191
  _h.label = 4;
187
192
  case 4:
188
193
  availablePort = _g;
@@ -198,20 +203,22 @@ function start() {
198
203
  oriLogger = compiler.getInfrastructureLogger;
199
204
  compiler.getInfrastructureLogger = getMockGetLogger(compiler);
200
205
  devServer = new webpack_dev_server_1.default(__assign(__assign({}, startConfig.devServer), { port: availablePort }), compiler);
201
- devServer.watchFiles([], {});
202
206
  _h.label = 7;
203
207
  case 7:
204
208
  _h.trys.push([7, 9, , 10]);
205
209
  return [4, devServer.start()];
206
210
  case 8:
207
211
  _h.sent();
212
+ process.env.SWICO_PORT = availablePort.toString();
208
213
  createCompileListener(compiler);
209
214
  compiler.getInfrastructureLogger = oriLogger;
210
215
  handleWatch(projectPath, devServer);
211
- if (RESTART !== 'true' || newRouterBase !== routerBase) {
216
+ if (SWICO_RESTART !== 'true' ||
217
+ (SWICO_RESTART === 'true' && newRouterBase !== SWICO_ROUTER_BASE)) {
212
218
  tools_1.toast.info("Project is running at\uFF1A".concat(chalk_1.default.hex('#29abe0')("".concat(startConfig.devServer.server, "://localhost:").concat(availablePort).concat(newRouterBase))));
213
219
  }
214
- routerBase = newRouterBase;
220
+ currentRouterBase = newRouterBase;
221
+ currentPort = availablePort;
215
222
  return [3, 10];
216
223
  case 9:
217
224
  e_1 = _h.sent();