swico 0.5.0-beta17 → 0.5.0-beta19

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.5.0-beta17",
3
+ "version": "0.5.0-beta19",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -10,7 +10,7 @@ export declare const Link: FC<{
10
10
  children: ReactNode;
11
11
  }>;
12
12
  export { Outlet } from 'react-router-dom';
13
- export { useLocation } from './template/react/history';
13
+ export { func } from './template/react/history';
14
14
  export interface DefineSwicoConfigType {
15
15
  (env: 'base', config: CustomConfigType['base']): any;
16
16
  (env: 'dev', config: CustomConfigType['dev']): any;
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.defineGlobal = exports.defineConfig = exports.useLocation = exports.Outlet = exports.Link = void 0;
6
+ exports.defineGlobal = exports.defineConfig = exports.func = exports.Outlet = exports.Link = void 0;
7
7
  var react_router_dom_1 = require("react-router-dom");
8
8
  var react_1 = __importDefault(require("react"));
9
9
  var Link = function (_a) {
@@ -14,7 +14,7 @@ exports.Link = Link;
14
14
  var react_router_dom_2 = require("react-router-dom");
15
15
  Object.defineProperty(exports, "Outlet", { enumerable: true, get: function () { return react_router_dom_2.Outlet; } });
16
16
  var history_1 = require("./template/react/history");
17
- Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return history_1.useLocation; } });
17
+ Object.defineProperty(exports, "func", { enumerable: true, get: function () { return history_1.func; } });
18
18
  var defineConfig = function (env, config) { return config; };
19
19
  exports.defineConfig = defineConfig;
20
20
  var defineGlobal = function (config) {
@@ -9,7 +9,7 @@ export declare const getHistory: (routerBase: ConfigRouterType['base'], routerTy
9
9
  history: SwicoHistoryType;
10
10
  originalHistory: import("history").HashHistory;
11
11
  };
12
- export declare const useLocation: () => {
12
+ export declare const func: () => {
13
13
  name: string;
14
14
  path: string;
15
15
  pathname: string;
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.useLocation = exports.getHistory = exports.getPathNameList = exports.formatAncPath = exports.HistoryRouter = void 0;
6
+ exports.func = exports.getHistory = exports.getPathNameList = exports.formatAncPath = exports.HistoryRouter = void 0;
7
7
  var qs_1 = __importDefault(require("qs"));
8
8
  var history_1 = require("history");
9
9
  var routes_1 = require("./routes");
@@ -145,7 +145,7 @@ var compareURLPatterns = function (urlPatternWithValues, urlPatternWithParams) {
145
145
  }
146
146
  return true;
147
147
  };
148
- var useLocation = function () {
148
+ var func = function () {
149
149
  var _a;
150
150
  console.log('routes2', routes_1.routes);
151
151
  return {
@@ -158,4 +158,4 @@ var useLocation = function () {
158
158
  params: {}
159
159
  };
160
160
  };
161
- exports.useLocation = useLocation;
161
+ exports.func = func;
@@ -241,22 +241,18 @@ var handleCliIndexFile = function (templateType) { return __awaiter(void 0, void
241
241
  var formatTemplateFileText = function (_a, templateType) {
242
242
  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;
243
243
  return new Promise(function (resolve, reject) { return __awaiter(void 0, void 0, void 0, function () {
244
- var formatRouter, textData, modifiedText, indexFilePath, configFilePath, indexText, configText, replaceIndexText, replaceConfigText;
244
+ var formatRouter, textData, modifiedText, configFilePath, replaceConfigText;
245
245
  return __generator(this, function (_a) {
246
246
  switch (_a.label) {
247
247
  case 0:
248
248
  formatRouter = getFormatRouter(routes, templateType);
249
249
  textData = "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.routes = ".concat(JSON.stringify(formatRouter), ";");
250
250
  modifiedText = textData.replace(/"(\(\)=>import\('[^']+'\))"/g, '$1');
251
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(__dirname, "../template/".concat(templateType, "/routes.js")), modifiedText)];
251
+ return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/routes.js'), modifiedText)];
252
252
  case 1:
253
253
  _a.sent();
254
- indexFilePath = path_1.default.resolve(__dirname, "../template/".concat(templateType, "/index.js"));
255
- configFilePath = path_1.default.resolve(__dirname, "../template/".concat(templateType, "/config.js"));
256
- indexText = fs_extra_1.default.readFileSync(indexFilePath, 'utf8');
257
- configText = fs_extra_1.default.readFileSync(configFilePath, 'utf8');
258
- replaceIndexText = indexText;
259
- replaceConfigText = configText;
254
+ configFilePath = path_1.default.resolve(projectPath, './src/.swico/config.js');
255
+ replaceConfigText = fs_extra_1.default.readFileSync(configFilePath, 'utf8');
260
256
  if (base) {
261
257
  replaceConfigText = replaceConfigText.replace(/exports\.routerBase\s*=\s*(.*)/gm, function (match, p1) {
262
258
  return "exports.routerBase = '".concat(templateType === 'react' && type === 'hash' ? '/' : base, "';");
@@ -267,11 +263,8 @@ var formatTemplateFileText = function (_a, templateType) {
267
263
  return "exports.routerType = '".concat(type, "';");
268
264
  });
269
265
  }
270
- return [4, (0, tools_1.writeFile)(indexFilePath, replaceIndexText)];
271
- case 2:
272
- _a.sent();
273
266
  return [4, (0, tools_1.writeFile)(configFilePath, replaceConfigText)];
274
- case 3:
267
+ case 2:
275
268
  _a.sent();
276
269
  resolve(null);
277
270
  return [2];
@@ -284,19 +277,20 @@ var initTemplateRouterConfig = function (routerConfig, templateType) {
284
277
  var copyTargetPath, replaceIndexText, e_1, e_2, e_3;
285
278
  return __generator(this, function (_a) {
286
279
  switch (_a.label) {
287
- case 0: return [4, formatTemplateFileText(routerConfig, templateType)];
288
- case 1:
289
- _a.sent();
280
+ case 0:
290
281
  copyTargetPath = path_1.default.resolve(projectPath, './src/.swico');
291
- if (!fs_extra_1.default.existsSync(copyTargetPath)) return [3, 3];
282
+ if (!fs_extra_1.default.existsSync(copyTargetPath)) return [3, 2];
292
283
  return [4, fs_extra_1.default.remove(copyTargetPath)];
293
- case 2:
284
+ case 1:
294
285
  _a.sent();
295
- _a.label = 3;
296
- case 3: return [4, (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, "../template/".concat(templateType)), copyTargetPath, function (fileName) {
286
+ _a.label = 2;
287
+ case 2: return [4, (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, "../template/".concat(templateType)), copyTargetPath, function (fileName) {
297
288
  return !fileName.endsWith('.d.ts') &&
298
289
  (templateType === 'vue' ? fileName !== 'Container.js' : true);
299
290
  })];
291
+ case 3:
292
+ _a.sent();
293
+ return [4, formatTemplateFileText(routerConfig, templateType)];
300
294
  case 4:
301
295
  _a.sent();
302
296
  replaceIndexText = fs_extra_1.default.readFileSync(path_1.default.resolve(projectPath, './src/.swico/index.js'), 'utf8');