swico 0.6.0-beta19 → 0.6.0-beta2

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": "0.6.0-beta19",
3
+ "version": "0.6.0-beta2",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -54,9 +54,7 @@ function default_1() {
54
54
  switch (_a.label) {
55
55
  case 0:
56
56
  process.env.SWICO_ENV = 'prod';
57
- tools_1.toast.info("Swico v".concat(package_json_1.default.version));
58
- spinner.start('Initializing Swico production config...');
59
- (0, tools_1.initIndexFile)();
57
+ tools_1.toast.info("Swico V".concat(package_json_1.default.version));
60
58
  return [4, (0, config_1.getProjectConfig)('prod')];
61
59
  case 1:
62
60
  projectConfig = _a.sent();
@@ -70,8 +68,8 @@ function default_1() {
70
68
  })];
71
69
  case 2:
72
70
  buildConfig = _a.sent();
73
- spinner.succeed();
74
71
  compiler = (0, webpack_1.default)(buildConfig);
72
+ console.log("".concat(chalk_1.default.hex('#5f72f5')('Starts building....'), " \n"));
75
73
  compiler.run(function (err, stats) {
76
74
  if (err) {
77
75
  tools_1.toast.error(err.stack || err.toString());
@@ -131,9 +131,6 @@ function start() {
131
131
  switch (_b.label) {
132
132
  case 0:
133
133
  process.env.SWICO_ENV = 'dev';
134
- tools_1.toast.info("Swico v".concat(package_json_1.default.version));
135
- spinner.start('Initializing Swico development config...');
136
- (0, tools_1.initIndexFile)();
137
134
  if (!(envPort !== null && envPort !== void 0)) return [3, 1];
138
135
  _a = envPort;
139
136
  return [3, 3];
@@ -143,6 +140,8 @@ function start() {
143
140
  _b.label = 3;
144
141
  case 3:
145
142
  availablePort = _a;
143
+ tools_1.toast.info("Swico V".concat(package_json_1.default.version));
144
+ tools_1.toast.info('Initializing Swico config...');
146
145
  return [4, (0, config_1.getProjectConfig)('dev')];
147
146
  case 4:
148
147
  projectConfig = _b.sent();
@@ -150,7 +149,6 @@ function start() {
150
149
  return [4, (0, webpack_dev_1.default)(projectConfig)];
151
150
  case 5:
152
151
  startConfig = _b.sent();
153
- spinner.succeed();
154
152
  compiler = (0, webpack_1.default)(startConfig);
155
153
  devServer = new webpack_dev_server_1.default(__assign(__assign({}, startConfig.devServer), { port: availablePort }), compiler);
156
154
  _b.label = 6;
@@ -31,14 +31,13 @@ var interpolatePath = function (pathTemplate, params) {
31
31
  return interpolatedParts.join('/');
32
32
  };
33
33
  var interpolatePathParams = function (pathTemplate, path) {
34
- var _a;
35
34
  if (pathTemplate === void 0) { pathTemplate = ''; }
36
35
  var regexPattern = pathTemplate.replace(/:(\w+)/g, '([^/]+)');
37
36
  var regex = new RegExp("^".concat(regexPattern, "$"));
38
37
  var match = path.match(regex);
39
38
  if (match) {
40
39
  var params_1 = match.slice(1);
41
- var paramNames = ((_a = pathTemplate.match(/:(\w+)/g)) === null || _a === void 0 ? void 0 : _a.map(function (name) { return name.slice(1); })) || [];
40
+ var paramNames = pathTemplate.match(/:(\w+)/g).map(function (name) { return name.slice(1); });
42
41
  var result_1 = {};
43
42
  paramNames.forEach(function (name, index) {
44
43
  result_1[name] = params_1[index];
@@ -42,6 +42,6 @@ export interface GlobalData {
42
42
  prod: Pick<GlobalSwicoConfigType, 'plugins' | 'console' | 'copy' | 'devtool' | 'router'>;
43
43
  };
44
44
  }
45
- export declare const getProjectConfig: (env: GlobalData['env']) => Promise<GlobalData>;
45
+ export declare const getProjectConfig: (env?: GlobalData['env']) => Promise<GlobalData>;
46
46
  export declare const getFormatDefineVars: (defineVarsConfigData: any) => Promise<{}>;
47
47
  export declare const initConfig: Omit<GlobalSwicoConfigType, 'template'>;
@@ -172,7 +172,7 @@ var getProjectConfig = function (env) { return __awaiter(void 0, void 0, void 0,
172
172
  case 4:
173
173
  templateType = customConfig['base'].template;
174
174
  routerConfig = __assign(__assign(__assign({}, exports.initConfig.router), customConfig['base'].router), customConfig[env].router);
175
- return [4, initTemplateConfig(routerConfig, templateType, env)];
175
+ return [4, initTemplateConfig(routerConfig, templateType)];
176
176
  case 5:
177
177
  _e.sent();
178
178
  return [4, initCliIndexFile(templateType)];
@@ -226,7 +226,9 @@ var initCliIndexFile = function (templateType) { return __awaiter(void 0, void 0
226
226
  case 0:
227
227
  targetPath = path_1.default.resolve(__dirname, '../index.js');
228
228
  targetTypesPath = path_1.default.resolve(__dirname, '../index.d.ts');
229
- replaceFileText = fs_extra_1.default.readFileSync(path_1.default.resolve(__dirname, "../index.".concat(templateType, ".js")), 'utf8');
229
+ return [4, fs_extra_1.default.readFileSync(path_1.default.resolve(__dirname, "../index.".concat(templateType, ".js")), 'utf8')];
230
+ case 1:
231
+ replaceFileText = _a.sent();
230
232
  fileTypesText = fs_extra_1.default.readFileSync(path_1.default.resolve(__dirname, "../index.".concat(templateType, ".d.ts")), 'utf8');
231
233
  if (templateType === 'react') {
232
234
  formatHooksPath = path_1.default
@@ -235,18 +237,17 @@ var initCliIndexFile = function (templateType) { return __awaiter(void 0, void 0
235
237
  replaceFileText = replaceFileText.replaceAll('require("./template/react/hooks");', "require(\"".concat(formatHooksPath, "\");"));
236
238
  }
237
239
  return [4, (0, tools_1.writeFile)(targetPath, replaceFileText)];
238
- case 1:
240
+ case 2:
239
241
  _a.sent();
240
242
  return [4, (0, tools_1.writeFile)(targetTypesPath, fileTypesText)];
241
- case 2:
243
+ case 3:
242
244
  _a.sent();
243
245
  return [2];
244
246
  }
245
247
  });
246
248
  }); };
247
- var formatRouterConfig = function (_a, templateType, env) {
249
+ var formatRouterConfig = function (_a, templateType) {
248
250
  var _b = _a.routes, routes = _b === void 0 ? [] : _b, _c = _a.type, type = _c === void 0 ? 'browser' : _c, _d = _a.base, base = _d === void 0 ? '/' : _d;
249
- var envPathSuffix = env === 'dev' ? '' : 'prod.';
250
251
  return new Promise(function (resolve, reject) { return __awaiter(void 0, void 0, void 0, function () {
251
252
  var formatRouter, textData, modifiedText, configFilePath, replaceConfigText;
252
253
  return __generator(this, function (_a) {
@@ -255,10 +256,10 @@ var formatRouterConfig = function (_a, templateType, env) {
255
256
  formatRouter = getFormatRouter(routes, templateType);
256
257
  textData = "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.default = ".concat(JSON.stringify(formatRouter), ";");
257
258
  modifiedText = textData.replace(/"(\(\)=>import\('[^']+'\))"/g, '$1');
258
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, "./src/.swico/routes.".concat(envPathSuffix, "js")), modifiedText)];
259
+ return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/routes.js'), modifiedText)];
259
260
  case 1:
260
261
  _a.sent();
261
- configFilePath = path_1.default.resolve(projectPath, "./src/.swico/config.".concat(envPathSuffix, "js"));
262
+ configFilePath = path_1.default.resolve(projectPath, './src/.swico/config.js');
262
263
  replaceConfigText = fs_extra_1.default.readFileSync(configFilePath, 'utf8');
263
264
  if (base) {
264
265
  replaceConfigText = replaceConfigText.replace(/exports\.routerBase\s*=\s*(.*)/gm, function (match, p1) {
@@ -279,119 +280,75 @@ var formatRouterConfig = function (_a, templateType, env) {
279
280
  });
280
281
  }); });
281
282
  };
282
- var getCopyFileNameList = function (templateType, env) {
283
- var list = ['hooks.js', 'index.js', 'history.js', 'loading.js'];
284
- switch (true) {
285
- case templateType === 'vue' && env === 'dev':
286
- list.push('config.js', 'Container.vue', 'routes.js');
287
- break;
288
- case templateType === 'vue' && env === 'prod':
289
- list.push('config.prod.js', 'Container.vue', 'routes.prod.js');
290
- break;
291
- case templateType === 'react' && env === 'dev':
292
- list.push('config.js', 'history.js', 'routes.js');
293
- break;
294
- case templateType === 'react' && env === 'prod':
295
- list.push('config.prod.js', 'history.js', 'routes.prod.js');
296
- break;
297
- default:
298
- break;
299
- }
300
- return list;
301
- };
302
- var initTemplateConfig = function (routerConfig, templateType, env) {
283
+ var initTemplateConfig = function (routerConfig, templateType) {
303
284
  return new Promise(function (resolve, reject) { return __awaiter(void 0, void 0, void 0, function () {
304
- var copyTargetPath, copyFileNameList, replaceIndexText, e_1, e_2, replaceHooksText, e_3, replaceHistoryText;
285
+ var copyTargetPath, replaceIndexText, e_1, e_2, e_3;
305
286
  return __generator(this, function (_a) {
306
287
  switch (_a.label) {
307
288
  case 0:
308
- console.log('0');
309
289
  copyTargetPath = path_1.default.resolve(projectPath, './src/.swico');
310
- copyFileNameList = getCopyFileNameList(templateType, env);
311
- return [4, (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, "../template/".concat(templateType)), copyTargetPath, function (fileName) { return copyFileNameList.includes(fileName); })];
290
+ if (!fs_extra_1.default.existsSync(copyTargetPath)) return [3, 2];
291
+ return [4, fs_extra_1.default.remove(copyTargetPath)];
312
292
  case 1:
313
293
  _a.sent();
314
- return [4, formatRouterConfig(routerConfig, templateType, env)];
315
- case 2:
294
+ _a.label = 2;
295
+ case 2: return [4, (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, "../template/".concat(templateType)), copyTargetPath, function (fileName) {
296
+ return !fileName.endsWith('.d.ts') &&
297
+ (templateType === 'vue' ? fileName !== 'Container.js' : true);
298
+ })];
299
+ case 3:
300
+ _a.sent();
301
+ return [4, formatRouterConfig(routerConfig, templateType)];
302
+ case 4:
316
303
  _a.sent();
317
304
  replaceIndexText = fs_extra_1.default.readFileSync(path_1.default.resolve(projectPath, './src/.swico/index.js'), 'utf8');
318
- if (env === 'prod') {
319
- replaceIndexText = replaceIndexText.replaceAll('require("./config")', 'require("./config.prod")');
320
- replaceIndexText = replaceIndexText.replaceAll('require("./routes")', 'require("./routes.prod")');
321
- }
322
- else {
323
- replaceIndexText = replaceIndexText.replaceAll('require("./config.prod")', 'require("./config")');
324
- replaceIndexText = replaceIndexText.replaceAll('require("./routes.prod")', 'require("./routes")');
325
- }
326
- _a.label = 3;
327
- case 3:
328
- _a.trys.push([3, 5, , 6]);
305
+ _a.label = 5;
306
+ case 5:
307
+ _a.trys.push([5, 7, , 8]);
329
308
  return [4, fs_extra_1.default.access(path_1.default.resolve(projectPath, './src/global.ts'), fs_extra_1.default.constants.F_OK)];
330
- case 4:
309
+ case 6:
331
310
  _a.sent();
332
311
  replaceIndexText = replaceIndexText.replaceAll('require("../global");', '');
333
312
  replaceIndexText = 'require("../global");\n' + replaceIndexText;
334
- return [3, 6];
335
- case 5:
313
+ return [3, 8];
314
+ case 7:
336
315
  e_1 = _a.sent();
337
316
  replaceIndexText = replaceIndexText.replaceAll('require("../global");', '');
338
- return [3, 6];
339
- case 6:
340
- _a.trys.push([6, 8, , 9]);
317
+ return [3, 8];
318
+ case 8:
319
+ _a.trys.push([8, 10, , 11]);
341
320
  return [4, fs_extra_1.default.access(path_1.default.resolve(projectPath, './src/global.less'), fs_extra_1.default.constants.F_OK)];
342
- case 7:
321
+ case 9:
343
322
  _a.sent();
344
323
  replaceIndexText = replaceIndexText.replaceAll('require("../global.less");', '');
345
324
  replaceIndexText = 'require("../global.less");\n' + replaceIndexText;
346
- return [3, 9];
347
- case 8:
325
+ return [3, 11];
326
+ case 10:
348
327
  e_2 = _a.sent();
349
328
  replaceIndexText = replaceIndexText.replaceAll('require("../global.less");', '');
350
- return [3, 9];
351
- case 9:
352
- if (!(templateType === 'vue')) return [3, 12];
329
+ return [3, 11];
330
+ case 11:
331
+ if (!(templateType === 'vue')) return [3, 13];
353
332
  replaceIndexText = replaceIndexText.replace('"./Container"', '"./Container.vue"');
354
333
  return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/index.js'), replaceIndexText)];
355
- case 10:
356
- _a.sent();
357
- replaceHooksText = fs_extra_1.default.readFileSync(path_1.default.resolve(projectPath, './src/.swico/hooks.js'), 'utf8');
358
- if (env === 'prod') {
359
- replaceHooksText = replaceHooksText.replaceAll('require("./config")', 'require("./config.prod")');
360
- }
361
- else {
362
- replaceHooksText = replaceIndexText.replaceAll('require("./config.prod")', 'require("./config")');
363
- }
364
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/hooks.js'), replaceHooksText)];
365
- case 11:
366
- _a.sent();
367
- return [3, 19];
368
334
  case 12:
369
- if (!(templateType === 'react')) return [3, 19];
335
+ _a.sent();
370
336
  _a.label = 13;
371
337
  case 13:
372
- _a.trys.push([13, 15, 16, 19]);
373
- return [4, fs_extra_1.default.access(path_1.default.resolve(projectPath, './src/loading/index.tsx'), fs_extra_1.default.constants.F_OK)];
338
+ if (!(templateType === 'react')) return [3, 19];
339
+ _a.label = 14;
374
340
  case 14:
341
+ _a.trys.push([14, 16, 17, 19]);
342
+ return [4, fs_extra_1.default.access(path_1.default.resolve(projectPath, './src/loading/index.tsx'), fs_extra_1.default.constants.F_OK)];
343
+ case 15:
375
344
  _a.sent();
376
345
  replaceIndexText = replaceIndexText.replace('"./loading"', '"../loading"');
377
346
  return [3, 19];
378
- case 15:
347
+ case 16:
379
348
  e_3 = _a.sent();
380
349
  replaceIndexText = replaceIndexText.replace('"../loading"', '"./loading"');
381
350
  return [3, 19];
382
- case 16: return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/index.js'), replaceIndexText)];
383
- case 17:
384
- _a.sent();
385
- replaceHistoryText = fs_extra_1.default.readFileSync(path_1.default.resolve(projectPath, './src/.swico/history.js'), 'utf8');
386
- if (env === 'prod') {
387
- replaceHistoryText = replaceHistoryText.replaceAll('require("./config")', 'require("./config.prod")');
388
- replaceHistoryText = replaceHistoryText.replaceAll('require("./routes")', 'require("./routes.prod")');
389
- }
390
- else {
391
- replaceHistoryText = replaceHistoryText.replaceAll('require("./config.prod")', 'require("./config")');
392
- replaceHistoryText = replaceHistoryText.replaceAll('require("./routes.prod")', 'require("./routes")');
393
- }
394
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/history.js'), replaceHistoryText)];
351
+ case 17: return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/index.js'), replaceIndexText)];
395
352
  case 18:
396
353
  _a.sent();
397
354
  return [7];
@@ -6,4 +6,3 @@ export declare const toast: {
6
6
  warning: (message: string | string[]) => void;
7
7
  };
8
8
  export declare const writeFile: (sourcePath: any, text: any) => Promise<unknown>;
9
- export declare const initIndexFile: () => Promise<void>;
@@ -1,27 +1,4 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -62,12 +39,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
62
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
63
40
  };
64
41
  Object.defineProperty(exports, "__esModule", { value: true });
65
- exports.initIndexFile = exports.writeFile = exports.toast = exports.getPort = exports.copyDirFiles = void 0;
42
+ exports.writeFile = exports.toast = exports.getPort = exports.copyDirFiles = void 0;
66
43
  var portfinder_1 = __importDefault(require("portfinder"));
67
44
  var fs_extra_1 = __importDefault(require("fs-extra"));
68
45
  var path_1 = __importDefault(require("path"));
69
46
  var chalk_1 = __importDefault(require("chalk"));
70
- var process = __importStar(require("process"));
71
47
  var copyDirFiles = function (src, dest, filter) { return __awaiter(void 0, void 0, void 0, function () {
72
48
  var _copy, e_1;
73
49
  return __generator(this, function (_a) {
@@ -126,10 +102,10 @@ var getPort = function () {
126
102
  exports.getPort = getPort;
127
103
  exports.toast = {
128
104
  info: function (message) {
129
- console.log("\n> ".concat(chalk_1.default.hex('#5f72f5')(message), "\n"));
105
+ console.log("\n".concat(chalk_1.default.hex('#5f72f5')(message), "\n"));
130
106
  },
131
107
  error: function (message) {
132
- console.log("\n> ".concat(chalk_1.default.hex('#5f72f5')('There are some errors about Swico:'), " \n"));
108
+ console.log("\n".concat(chalk_1.default.hex('#5f72f5')('There are some errors about Swico:'), " \n"));
133
109
  if (Array.isArray(message)) {
134
110
  message.forEach(function (item) {
135
111
  console.log(" > ".concat(chalk_1.default.red.bold(item), " \n"));
@@ -140,7 +116,7 @@ exports.toast = {
140
116
  }
141
117
  },
142
118
  warning: function (message) {
143
- console.log("\n> ".concat(chalk_1.default.hex('#5f72f5')('There are some warnings about Swico:'), " \n"));
119
+ console.log("\n".concat(chalk_1.default.hex('#5f72f5')('There are some warnings about Swico:'), " \n"));
144
120
  if (Array.isArray(message)) {
145
121
  message.forEach(function (item) {
146
122
  console.log(" > ".concat(chalk_1.default.hex('#fb8918').bold(item), " \n"));
@@ -166,22 +142,3 @@ var writeFile = function (sourcePath, text) {
166
142
  });
167
143
  };
168
144
  exports.writeFile = writeFile;
169
- var initIndexFile = function () { return __awaiter(void 0, void 0, void 0, function () {
170
- var fileText, targetPath, formatHooksPath;
171
- return __generator(this, function (_a) {
172
- switch (_a.label) {
173
- case 0:
174
- fileText = fs_extra_1.default.readFileSync(path_1.default.resolve(__dirname, '../index.js'), 'utf8');
175
- targetPath = path_1.default.resolve(__dirname, '../index.js');
176
- formatHooksPath = path_1.default
177
- .resolve(process.cwd(), './src/.swico/hooks')
178
- .replaceAll('\\', '/');
179
- fileText = fileText.replaceAll("require(\"".concat(formatHooksPath, "\");"), 'require("./template/react/hooks");');
180
- return [4, (0, exports.writeFile)(targetPath, fileText)];
181
- case 1:
182
- _a.sent();
183
- return [2];
184
- }
185
- });
186
- }); };
187
- exports.initIndexFile = initIndexFile;
@@ -1,3 +0,0 @@
1
- import { ConfigRouterType } from '../../utils/config';
2
- export declare const routerType: ConfigRouterType['type'];
3
- export declare const routerBase: ConfigRouterType['base'];
@@ -1,5 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.routerBase = exports.routerType = void 0;
4
- exports.routerType = 'browser';
5
- exports.routerBase = '/';
@@ -1,3 +0,0 @@
1
- import { RoutesItemType } from './index';
2
- declare const _default: RoutesItemType[];
3
- export default _default;
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = [];
@@ -1,3 +0,0 @@
1
- import { ConfigRouterType } from '../../utils/config';
2
- export declare const routerType: ConfigRouterType['type'];
3
- export declare const routerBase: ConfigRouterType['base'];
@@ -1,5 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.routerBase = exports.routerType = void 0;
4
- exports.routerType = 'browser';
5
- exports.routerBase = '/';
@@ -1,6 +0,0 @@
1
- import { RouteRecordRaw } from 'vue-router';
2
- type RouteItem = RouteRecordRaw & {
3
- decorator?: string;
4
- };
5
- declare const _default: RouteItem[];
6
- export default _default;
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = [];