swico 1.1.0-beta.4 → 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.4",
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,10 +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 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
67
  .watch([
@@ -83,8 +85,7 @@ var handleWatch = function (projectPath, devServer) {
83
85
  return [4, configFilesWatcher.close()];
84
86
  case 2:
85
87
  _a.sent();
86
- process.env.SWICO_RESTART = 'true';
87
- start();
88
+ restartServer();
88
89
  return [2];
89
90
  }
90
91
  });
@@ -112,14 +113,28 @@ var handleWatch = function (projectPath, devServer) {
112
113
  return [4, tsTypingsWatcher.close()];
113
114
  case 2:
114
115
  _a.sent();
115
- process.env.SWICO_RESTART = 'true';
116
- start();
116
+ restartServer();
117
117
  _a.label = 3;
118
118
  case 3: return [2];
119
119
  }
120
120
  });
121
121
  }); });
122
122
  };
123
+ var restartServer = function () {
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
+ ], {
131
+ stdio: 'inherit'
132
+ });
133
+ if (result.error) {
134
+ tools_1.toast.error(result.error.message());
135
+ process.exit(1);
136
+ }
137
+ };
123
138
  var getMockGetLogger = function (compiler) {
124
139
  var logger = compiler.getInfrastructureLogger('name');
125
140
  var log = logger.log, debug = logger.debug, error = logger.error, warn = logger.warn;
@@ -188,7 +203,6 @@ function start() {
188
203
  oriLogger = compiler.getInfrastructureLogger;
189
204
  compiler.getInfrastructureLogger = getMockGetLogger(compiler);
190
205
  devServer = new webpack_dev_server_1.default(__assign(__assign({}, startConfig.devServer), { port: availablePort }), compiler);
191
- devServer.watchFiles([], {});
192
206
  _h.label = 7;
193
207
  case 7:
194
208
  _h.trys.push([7, 9, , 10]);
@@ -203,7 +217,8 @@ function start() {
203
217
  (SWICO_RESTART === 'true' && newRouterBase !== SWICO_ROUTER_BASE)) {
204
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))));
205
219
  }
206
- process.env.SWICO_ROUTER_BASE = newRouterBase;
220
+ currentRouterBase = newRouterBase;
221
+ currentPort = availablePort;
207
222
  return [3, 10];
208
223
  case 9:
209
224
  e_1 = _h.sent();