swico 1.1.0-beta.2 → 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.2",
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,13 +83,20 @@ 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
  });
91
91
  }); });
92
92
  var tsTypingsWatcher = chokidar_1.default
93
- .watch([path_1.default.join(projectPath, '/src/**/*.d.ts')], {
93
+ .watch([
94
+ path_1.default.join(projectPath, '/src/**/*.d.ts'),
95
+ path_1.default.join(projectPath, '/src/loading/index.tsx'),
96
+ path_1.default.join(projectPath, '/src/global.css'),
97
+ path_1.default.join(projectPath, '/src/global.less'),
98
+ path_1.default.join(projectPath, '/src/global.scss')
99
+ ], {
94
100
  interval: 500,
95
101
  binaryInterval: 500,
96
102
  ignoreInitial: true
@@ -106,48 +112,13 @@ var handleWatch = function (projectPath, devServer) {
106
112
  return [4, tsTypingsWatcher.close()];
107
113
  case 2:
108
114
  _a.sent();
109
- restartServer();
115
+ process.env.SWICO_RESTART = 'true';
116
+ start();
110
117
  _a.label = 3;
111
118
  case 3: return [2];
112
119
  }
113
120
  });
114
121
  }); });
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
- }); });
140
- };
141
- var availablePort;
142
- var routerBase = '/';
143
- var restartServer = function () {
144
- var result = cross_spawn_1.default.sync('cross-env', ["PORT=".concat(availablePort), 'RESTART=true', 'swico', 'start'], {
145
- stdio: 'inherit'
146
- });
147
- if (result.error) {
148
- tools_1.toast.error(result.error.message());
149
- process.exit(1);
150
- }
151
122
  };
152
123
  var getMockGetLogger = function (compiler) {
153
124
  var logger = compiler.getInfrastructureLogger('name');
@@ -183,24 +154,25 @@ var createCompileListener = function (compiler) {
183
154
  function start() {
184
155
  var _a, _b, _c, _d, _e, _f;
185
156
  return __awaiter(this, void 0, void 0, function () {
186
- 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;
187
158
  return __generator(this, function (_h) {
188
159
  switch (_h.label) {
189
160
  case 0:
161
+ console.log('env', SWICO_RESTART, SWICO_PORT, SWICO_ROUTER_BASE);
190
162
  process.env.SWICO_ENV = 'dev';
191
- if (RESTART !== 'true') {
163
+ if (SWICO_RESTART !== 'true') {
192
164
  tools_1.toast.info("Swico v".concat(package_json_1.default.version));
193
165
  tools_1.toast.info('Initializing development config...');
194
166
  }
195
167
  return [4, (0, tools_1.initIndexFile)()];
196
168
  case 1:
197
169
  _h.sent();
198
- if (!(envPort !== null && envPort !== void 0)) return [3, 2];
199
- _g = envPort;
170
+ if (!(SWICO_RESTART === 'true')) return [3, 2];
171
+ _g = Number(SWICO_PORT);
200
172
  return [3, 4];
201
173
  case 2: return [4, (0, tools_1.getPort)()];
202
174
  case 3:
203
- _g = (_h.sent());
175
+ _g = _h.sent();
204
176
  _h.label = 4;
205
177
  case 4:
206
178
  availablePort = _g;
@@ -223,13 +195,15 @@ function start() {
223
195
  return [4, devServer.start()];
224
196
  case 8:
225
197
  _h.sent();
198
+ process.env.SWICO_PORT = availablePort.toString();
226
199
  createCompileListener(compiler);
227
200
  compiler.getInfrastructureLogger = oriLogger;
228
201
  handleWatch(projectPath, devServer);
229
- if (RESTART !== 'true' || newRouterBase !== routerBase) {
202
+ if (SWICO_RESTART !== 'true' ||
203
+ (SWICO_RESTART === 'true' && newRouterBase !== SWICO_ROUTER_BASE)) {
230
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))));
231
205
  }
232
- routerBase = newRouterBase;
206
+ process.env.SWICO_ROUTER_BASE = newRouterBase;
233
207
  return [3, 10];
234
208
  case 9:
235
209
  e_1 = _h.sent();