swico 1.1.0-beta.3 → 1.1.0-beta.4

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.4",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -57,8 +57,7 @@ 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 cross_spawn_1 = __importDefault(require("cross-spawn"));
61
- var _a = process.env, envPort = _a.PORT, RESTART = _a.RESTART;
60
+ var _a = process.env, SWICO_PORT = _a.SWICO_PORT, SWICO_RESTART = _a.SWICO_RESTART, SWICO_ROUTER_BASE = _a.SWICO_ROUTER_BASE;
62
61
  var package_json_1 = __importDefault(require("../../package.json"));
63
62
  var chalk_1 = __importDefault(require("chalk"));
64
63
  var handleWatch = function (projectPath, devServer) {
@@ -84,7 +83,8 @@ var handleWatch = function (projectPath, devServer) {
84
83
  return [4, configFilesWatcher.close()];
85
84
  case 2:
86
85
  _a.sent();
87
- restartServer();
86
+ process.env.SWICO_RESTART = 'true';
87
+ start();
88
88
  return [2];
89
89
  }
90
90
  });
@@ -112,24 +112,14 @@ var handleWatch = function (projectPath, devServer) {
112
112
  return [4, tsTypingsWatcher.close()];
113
113
  case 2:
114
114
  _a.sent();
115
- restartServer();
115
+ process.env.SWICO_RESTART = 'true';
116
+ start();
116
117
  _a.label = 3;
117
118
  case 3: return [2];
118
119
  }
119
120
  });
120
121
  }); });
121
122
  };
122
- var availablePort;
123
- var routerBase = '/';
124
- var restartServer = function () {
125
- var result = cross_spawn_1.default.sync('cross-env', ["PORT=".concat(availablePort), 'RESTART=true', 'swico', 'start'], {
126
- stdio: 'inherit'
127
- });
128
- if (result.error) {
129
- tools_1.toast.error(result.error.message());
130
- process.exit(1);
131
- }
132
- };
133
123
  var getMockGetLogger = function (compiler) {
134
124
  var logger = compiler.getInfrastructureLogger('name');
135
125
  var log = logger.log, debug = logger.debug, error = logger.error, warn = logger.warn;
@@ -164,25 +154,25 @@ var createCompileListener = function (compiler) {
164
154
  function start() {
165
155
  var _a, _b, _c, _d, _e, _f;
166
156
  return __awaiter(this, void 0, void 0, function () {
167
- var _g, projectConfig, projectPath, customConfig, newRouterBase, startConfig, compiler, oriLogger, devServer, e_1, strErr;
157
+ var availablePort, _g, projectConfig, projectPath, customConfig, newRouterBase, startConfig, compiler, oriLogger, devServer, e_1, strErr;
168
158
  return __generator(this, function (_h) {
169
159
  switch (_h.label) {
170
160
  case 0:
171
- console.log('routerBase', routerBase, availablePort);
161
+ console.log('env', SWICO_RESTART, SWICO_PORT, SWICO_ROUTER_BASE);
172
162
  process.env.SWICO_ENV = 'dev';
173
- if (RESTART !== 'true') {
163
+ if (SWICO_RESTART !== 'true') {
174
164
  tools_1.toast.info("Swico v".concat(package_json_1.default.version));
175
165
  tools_1.toast.info('Initializing development config...');
176
166
  }
177
167
  return [4, (0, tools_1.initIndexFile)()];
178
168
  case 1:
179
169
  _h.sent();
180
- if (!(envPort !== null && envPort !== void 0)) return [3, 2];
181
- _g = envPort;
170
+ if (!(SWICO_RESTART === 'true')) return [3, 2];
171
+ _g = Number(SWICO_PORT);
182
172
  return [3, 4];
183
173
  case 2: return [4, (0, tools_1.getPort)()];
184
174
  case 3:
185
- _g = (_h.sent());
175
+ _g = _h.sent();
186
176
  _h.label = 4;
187
177
  case 4:
188
178
  availablePort = _g;
@@ -205,13 +195,15 @@ function start() {
205
195
  return [4, devServer.start()];
206
196
  case 8:
207
197
  _h.sent();
198
+ process.env.SWICO_PORT = availablePort.toString();
208
199
  createCompileListener(compiler);
209
200
  compiler.getInfrastructureLogger = oriLogger;
210
201
  handleWatch(projectPath, devServer);
211
- if (RESTART !== 'true' || newRouterBase !== routerBase) {
202
+ if (SWICO_RESTART !== 'true' ||
203
+ (SWICO_RESTART === 'true' && newRouterBase !== SWICO_ROUTER_BASE)) {
212
204
  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
205
  }
214
- routerBase = newRouterBase;
206
+ process.env.SWICO_ROUTER_BASE = newRouterBase;
215
207
  return [3, 10];
216
208
  case 9:
217
209
  e_1 = _h.sent();