swico 0.6.0-beta9 → 0.6.1-beta1

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.
Files changed (34) hide show
  1. package/package.json +3 -2
  2. package/src/command/build.js +6 -4
  3. package/src/command/start.js +20 -20
  4. package/src/config/webpack.prod.js +4 -2
  5. package/src/index.react.d.ts +1 -1
  6. package/src/index.react.js +2 -2
  7. package/src/index.vue.d.ts +1 -1
  8. package/src/index.vue.js +2 -2
  9. package/src/template/react/{config.d.ts → $env/config.d.ts} +1 -1
  10. package/src/template/react/{history.d.ts → $env/history.d.ts} +1 -1
  11. package/src/template/react/{history.js → $env/history.js} +19 -3
  12. package/src/template/react/{index.d.ts → $env/index.d.ts} +1 -1
  13. package/src/template/react/{index.js → $env/index.js} +3 -3
  14. package/src/template/react/react-hooks.d.ts +1 -0
  15. package/src/template/react/{hooks.js → react-hooks.js} +3 -4
  16. package/src/template/vue/{config.d.ts → $env/config.d.ts} +1 -1
  17. package/src/template/vue/{index.js → $env/index.js} +3 -3
  18. package/src/template/vue/{hooks.js → vue-hooks.js} +1 -1
  19. package/src/utils/config.js +78 -89
  20. package/src/utils/tools.d.ts +2 -2
  21. package/src/utils/tools.js +113 -42
  22. package/src/template/hooks/react.d.ts +0 -12
  23. package/src/template/hooks/react.js +0 -47
  24. package/src/template/hooks/vue.d.ts +0 -3
  25. package/src/template/hooks/vue.js +0 -40
  26. package/src/template/react/hooks.d.ts +0 -2
  27. /package/src/template/react/{config.js → $env/config.js} +0 -0
  28. /package/src/template/react/{routes.d.ts → $env/routes.d.ts} +0 -0
  29. /package/src/template/react/{routes.js → $env/routes.js} +0 -0
  30. /package/src/template/vue/{config.js → $env/config.js} +0 -0
  31. /package/src/template/vue/{index.d.ts → $env/index.d.ts} +0 -0
  32. /package/src/template/vue/{routes.d.ts → $env/routes.d.ts} +0 -0
  33. /package/src/template/vue/{routes.js → $env/routes.js} +0 -0
  34. /package/src/template/vue/{hooks.d.ts → vue-hooks.d.ts} +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "swico",
3
- "version": "0.6.0-beta9",
3
+ "version": "0.6.1-beta1",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -21,7 +21,8 @@
21
21
  "scripts": {
22
22
  "compile": "tsc && ts-node ./src/task.ts",
23
23
  "publish:offical": "npm run compile && cd ./dist && npm publish",
24
- "publish:beta": "npm run compile && cd ./dist && npm publish --tag=beta"
24
+ "publish:beta": "npm run compile && cd ./dist && npm publish --tag=beta",
25
+ "test": "ts-node ./test.ts"
25
26
  },
26
27
  "repository": {
27
28
  "type": "git",
@@ -55,9 +55,12 @@ function default_1() {
55
55
  case 0:
56
56
  process.env.SWICO_ENV = 'prod';
57
57
  tools_1.toast.info("Swico v".concat(package_json_1.default.version));
58
- spinner.start('Initializing Swico production config...');
59
- return [4, (0, config_1.getProjectConfig)('prod')];
58
+ tools_1.toast.info('Initializing Swico production config...');
59
+ return [4, (0, tools_1.initIndexFile)()];
60
60
  case 1:
61
+ _a.sent();
62
+ return [4, (0, config_1.getProjectConfig)('prod')];
63
+ case 2:
61
64
  projectConfig = _a.sent();
62
65
  entryPath = projectConfig.entryPath, templatePath = projectConfig.templatePath, projectPath = projectConfig.projectPath, customConfig = projectConfig.customConfig, templateType = projectConfig.templateType;
63
66
  return [4, (0, webpack_prod_1.default)({
@@ -67,9 +70,8 @@ function default_1() {
67
70
  customConfig: customConfig,
68
71
  templateType: templateType
69
72
  })];
70
- case 2:
73
+ case 3:
71
74
  buildConfig = _a.sent();
72
- spinner.succeed();
73
75
  compiler = (0, webpack_1.default)(buildConfig);
74
76
  compiler.run(function (err, stats) {
75
77
  if (err) {
@@ -60,8 +60,6 @@ var path_1 = __importDefault(require("path"));
60
60
  var cross_spawn_1 = __importDefault(require("cross-spawn"));
61
61
  var envPort = process.env.PORT;
62
62
  var package_json_1 = __importDefault(require("../../package.json"));
63
- var ora_1 = __importDefault(require("ora"));
64
- var spinner = (0, ora_1.default)();
65
63
  var handleWatch = function (projectPath, devServer) {
66
64
  var configFilesWatcher = chokidar_1.default
67
65
  .watch([
@@ -132,40 +130,42 @@ function start() {
132
130
  case 0:
133
131
  process.env.SWICO_ENV = 'dev';
134
132
  tools_1.toast.info("Swico v".concat(package_json_1.default.version));
135
- spinner.start('Initializing Swico development config...');
136
- if (!(envPort !== null && envPort !== void 0)) return [3, 1];
133
+ tools_1.toast.info('Initializing Swico development config...');
134
+ return [4, (0, tools_1.initIndexFile)()];
135
+ case 1:
136
+ _b.sent();
137
+ if (!(envPort !== null && envPort !== void 0)) return [3, 2];
137
138
  _a = envPort;
138
- return [3, 3];
139
- case 1: return [4, (0, tools_1.getPort)()];
140
- case 2:
141
- _a = (_b.sent());
142
- _b.label = 3;
139
+ return [3, 4];
140
+ case 2: return [4, (0, tools_1.getPort)()];
143
141
  case 3:
142
+ _a = (_b.sent());
143
+ _b.label = 4;
144
+ case 4:
144
145
  availablePort = _a;
145
146
  return [4, (0, config_1.getProjectConfig)('dev')];
146
- case 4:
147
+ case 5:
147
148
  projectConfig = _b.sent();
148
149
  projectPath = projectConfig.projectPath;
149
150
  return [4, (0, webpack_dev_1.default)(projectConfig)];
150
- case 5:
151
+ case 6:
151
152
  startConfig = _b.sent();
152
- spinner.succeed();
153
153
  compiler = (0, webpack_1.default)(startConfig);
154
154
  devServer = new webpack_dev_server_1.default(__assign(__assign({}, startConfig.devServer), { port: availablePort }), compiler);
155
- _b.label = 6;
156
- case 6:
157
- _b.trys.push([6, 8, , 9]);
158
- return [4, devServer.start()];
155
+ _b.label = 7;
159
156
  case 7:
157
+ _b.trys.push([7, 9, , 10]);
158
+ return [4, devServer.start()];
159
+ case 8:
160
160
  _b.sent();
161
161
  handleWatch(projectPath, devServer);
162
- return [3, 9];
163
- case 8:
162
+ return [3, 10];
163
+ case 9:
164
164
  e_1 = _b.sent();
165
165
  strErr = e_1.toString();
166
166
  tools_1.toast.error(strErr);
167
- return [3, 9];
168
- case 9: return [2];
167
+ return [3, 10];
168
+ case 10: return [2];
169
169
  }
170
170
  });
171
171
  });
@@ -85,7 +85,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
85
85
  var webpack_bundle_analyzer_1 = __importDefault(require("webpack-bundle-analyzer"));
86
86
  var copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
87
87
  var path_1 = __importDefault(require("path"));
88
- var fs_1 = __importDefault(require("fs"));
88
+ var fs_extra_1 = __importDefault(require("fs-extra"));
89
89
  var config_1 = require("../utils/config");
90
90
  var webpack_merge_1 = require("webpack-merge");
91
91
  var esbuild_loader_1 = require("esbuild-loader");
@@ -106,7 +106,9 @@ function default_1(options) {
106
106
  case 2:
107
107
  baseConfig = _h.sent();
108
108
  consoleAvailable = (_b = (_a = customConfig.prod) === null || _a === void 0 ? void 0 : _a.console) !== null && _b !== void 0 ? _b : config_1.initConfig.console;
109
- isPublicDirExist = fs_1.default.existsSync(path_1.default.join(projectPath, '/public'));
109
+ return [4, fs_extra_1.default.exists(path_1.default.join(projectPath, '/public'))];
110
+ case 3:
111
+ isPublicDirExist = _h.sent();
110
112
  copyConfig = (_d = (_c = customConfig.prod) === null || _c === void 0 ? void 0 : _c.copy) !== null && _d !== void 0 ? _d : config_1.initConfig.copy;
111
113
  customDevtool = (_e = customConfig.prod.devtool) !== null && _e !== void 0 ? _e : customConfig.base.devtool;
112
114
  return [2, (0, webpack_merge_1.merge)(baseConfig, {
@@ -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/hooks';
13
+ export { useLocation } from './template/react/react-hooks';
14
14
  export interface DefineSwicoConfigType {
15
15
  (env: 'base', config: CustomConfigType['base']): any;
16
16
  (env: 'dev', config: CustomConfigType['dev']): any;
@@ -13,8 +13,8 @@ var Link = function (_a) {
13
13
  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
- var hooks_1 = require("./template/react/hooks");
17
- Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return hooks_1.useLocation; } });
16
+ var react_hooks_1 = require("./template/react/react-hooks");
17
+ Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return react_hooks_1.useLocation; } });
18
18
  var defineConfig = function (env, config) { return config; };
19
19
  exports.defineConfig = defineConfig;
20
20
  var defineGlobal = function (config) {
@@ -3,7 +3,7 @@ import { App } from 'vue';
3
3
  import { Router } from 'vue-router';
4
4
  export type CustomConfigType = GlobalData['customConfig'];
5
5
  export { RouterView as Outlet } from 'vue-router';
6
- export { useLocation } from './template/vue/hooks';
6
+ export { useLocation } from './template/vue/vue-hooks';
7
7
  export type { GlobalSwicoConfigType };
8
8
  export declare const Link: import("vue").DefineComponent<{
9
9
  to: {
package/src/index.vue.js CHANGED
@@ -5,8 +5,8 @@ var vue_1 = require("vue");
5
5
  var vue_router_1 = require("vue-router");
6
6
  var vue_router_2 = require("vue-router");
7
7
  Object.defineProperty(exports, "Outlet", { enumerable: true, get: function () { return vue_router_2.RouterView; } });
8
- var hooks_1 = require("./template/vue/hooks");
9
- Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return hooks_1.useLocation; } });
8
+ var vue_hooks_1 = require("./template/vue/vue-hooks");
9
+ Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return vue_hooks_1.useLocation; } });
10
10
  exports.Link = (0, vue_1.defineComponent)({
11
11
  components: {
12
12
  RouterLink: vue_router_1.RouterLink
@@ -1,3 +1,3 @@
1
- import { ConfigRouterType } from '../../utils/config';
1
+ import { ConfigRouterType } from '../../../utils/config';
2
2
  export declare const routerType: ConfigRouterType['type'];
3
3
  export declare const routerBase: ConfigRouterType['base'];
@@ -1,4 +1,4 @@
1
- import { ConfigRouterType } from '../../utils/config';
1
+ import { ConfigRouterType } from '../../../utils/config';
2
2
  export { unstable_HistoryRouter as HistoryRouter } from 'react-router-dom';
3
3
  export declare const formatAncPath: (ancPath: string) => string;
4
4
  export declare const pathNameList: {
@@ -8,11 +8,28 @@ var qs_1 = __importDefault(require("qs"));
8
8
  var history_1 = require("history");
9
9
  var routes_1 = __importDefault(require("./routes"));
10
10
  var config_1 = require("./config");
11
- var hooks_1 = require("./hooks");
12
11
  var react_router_dom_1 = require("react-router-dom");
13
12
  Object.defineProperty(exports, "HistoryRouter", { enumerable: true, get: function () { return react_router_dom_1.unstable_HistoryRouter; } });
14
13
  var lastIndexBase = config_1.routerBase[config_1.routerBase.length - 1];
15
14
  var formatRouterBase = lastIndexBase === '/' ? config_1.routerBase.slice(0, config_1.routerBase.length - 1) : config_1.routerBase;
15
+ var compareURLPatterns = function (urlPatternWithValues, urlPatternWithParams) {
16
+ var patternWithValuesParts = urlPatternWithValues.split('/');
17
+ var patternWithParamsParts = urlPatternWithParams.split('/');
18
+ if (patternWithValuesParts.length !== patternWithParamsParts.length) {
19
+ return false;
20
+ }
21
+ for (var i = 0; i < patternWithValuesParts.length; i++) {
22
+ var valuePart = patternWithValuesParts[i];
23
+ var paramPart = patternWithParamsParts[i];
24
+ if (paramPart.startsWith(':') && paramPart !== '') {
25
+ continue;
26
+ }
27
+ if (valuePart !== paramPart) {
28
+ return false;
29
+ }
30
+ }
31
+ return true;
32
+ };
16
33
  var interpolatePath = function (pathTemplate, params) {
17
34
  var pathParts = pathTemplate.split('/');
18
35
  var interpolatedParts = pathParts.map(function (part) {
@@ -71,8 +88,7 @@ var getLocation = function (originalHistory) {
71
88
  var _a = originalHistory.location, pathname = _a.pathname, hash = _a.hash, search = _a.search;
72
89
  var routerBaseLength = formatRouterBase.length;
73
90
  var path = pathname.slice(routerBaseLength);
74
- var matchPathNameItem = exports.pathNameList.find(function (item) { return item.path === path || (0, hooks_1.compareURLPatterns)(path, item.path); });
75
- console.log('matchPathNameItem', matchPathNameItem);
91
+ var matchPathNameItem = exports.pathNameList.find(function (item) { return item.path === path || compareURLPatterns(path, item.path); });
76
92
  var params = interpolatePathParams(matchPathNameItem === null || matchPathNameItem === void 0 ? void 0 : matchPathNameItem.path, path);
77
93
  return {
78
94
  hash: hash,
@@ -1,5 +1,5 @@
1
1
  import { FC } from 'react';
2
- import '../global';
2
+ import '../../global';
3
3
  export type RoutesItemType = {
4
4
  component?: () => Promise<{
5
5
  default: FC;
@@ -30,11 +30,11 @@ var client_1 = require("react-dom/client");
30
30
  var react_1 = __importStar(require("react"));
31
31
  var react_router_dom_1 = require("react-router-dom");
32
32
  var routes_1 = __importDefault(require("./routes"));
33
- var loading_1 = __importDefault(require("./loading"));
33
+ var loading_1 = __importDefault(require("../loading"));
34
34
  var history_1 = require("./history");
35
35
  var config_1 = require("./config");
36
- require("../global");
37
- var layout_1 = __importDefault(require("../layout"));
36
+ require("../../global");
37
+ var layout_1 = __importDefault(require("../../layout"));
38
38
  var renderChildrenRouteList = function (childrenRoutes, ancPathKey) {
39
39
  return childrenRoutes === null || childrenRoutes === void 0 ? void 0 : childrenRoutes.map(function (item) {
40
40
  var component = item.component, path = item.path, children = item.children, redirect = item.redirect;
@@ -0,0 +1 @@
1
+ export declare const useLocation: UseLocationType;
@@ -3,9 +3,9 @@ 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.compareURLPatterns = void 0;
6
+ exports.useLocation = void 0;
7
7
  var react_router_dom_1 = require("react-router-dom");
8
- var history_1 = require("./history");
8
+ var history_1 = require("./$env/history");
9
9
  var qs_1 = __importDefault(require("qs"));
10
10
  var compareURLPatterns = function (urlPatternWithValues, urlPatternWithParams) {
11
11
  var patternWithValuesParts = urlPatternWithValues.split('/');
@@ -25,14 +25,13 @@ var compareURLPatterns = function (urlPatternWithValues, urlPatternWithParams) {
25
25
  }
26
26
  return true;
27
27
  };
28
- exports.compareURLPatterns = compareURLPatterns;
29
28
  var useLocation = function () {
30
29
  var _a, _b;
31
30
  var location = (0, react_router_dom_1.useLocation)();
32
31
  var params = (0, react_router_dom_1.useParams)();
33
32
  var search = location.search, hash = location.hash, pathname = location.pathname;
34
33
  var name = (_a = history_1.pathNameList.find(function (item) {
35
- return (Object.keys(params).length > 0 && (0, exports.compareURLPatterns)(pathname, item.path)) ||
34
+ return (Object.keys(params).length > 0 && compareURLPatterns(pathname, item.path)) ||
36
35
  item.path === pathname;
37
36
  })) === null || _a === void 0 ? void 0 : _a.name;
38
37
  var query = search ? qs_1.default.parse(search.startsWith('?') ? search.slice(1) : search) : {};
@@ -1,3 +1,3 @@
1
- import { ConfigRouterType } from '../../utils/config';
1
+ import { ConfigRouterType } from '../../../utils/config';
2
2
  export declare const routerType: ConfigRouterType['type'];
3
3
  export declare const routerBase: ConfigRouterType['base'];
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
7
7
  var vue_1 = require("vue");
8
8
  var routes_1 = __importDefault(require("./routes"));
9
9
  var vue_router_1 = require("vue-router");
10
- var Container_1 = __importDefault(require("./Container"));
10
+ var Container_1 = __importDefault(require("../Container"));
11
11
  var config_1 = require("./config");
12
- var Layout_1 = __importDefault(require("../layout/Layout"));
13
- var global_1 = __importDefault(require("../global"));
12
+ var Layout_1 = __importDefault(require("../../layout/Layout"));
13
+ var global_1 = __importDefault(require("../../global"));
14
14
  var qs_1 = __importDefault(require("qs"));
15
15
  var router = (0, vue_router_1.createRouter)({
16
16
  history: (config_1.routerType === 'hash' ? vue_router_1.createWebHashHistory : vue_router_1.createWebHistory)(config_1.routerBase),
@@ -7,7 +7,7 @@ exports.useLocation = exports.getFormatRouterBase = void 0;
7
7
  var vue_router_1 = require("vue-router");
8
8
  var qs_1 = __importDefault(require("qs"));
9
9
  var vue_1 = require("vue");
10
- var config_1 = require("./config");
10
+ var config_1 = require("./$env/config");
11
11
  var getFormatRouterBase = function (routerBase) {
12
12
  var lastIndexBase = routerBase[routerBase.length - 1];
13
13
  return lastIndexBase === '/' ? routerBase.slice(0, routerBase.length - 1) : routerBase;
@@ -80,7 +80,7 @@ var chalk_1 = __importDefault(require("chalk"));
80
80
  var tools_1 = require("./tools");
81
81
  var projectPath = process.cwd();
82
82
  var getProjectConfig = function (env) { return __awaiter(void 0, void 0, void 0, function () {
83
- var configDir, configPath, customConfig, _loop_1, _i, _a, key, templateType, routerConfig, entryPath, templatePath;
83
+ var configDir, configPath, customConfig, _loop_1, _i, _a, key, templateType, routerConfig, envPath, entryPath, templatePath;
84
84
  var _b, _c, _d;
85
85
  return __generator(this, function (_e) {
86
86
  switch (_e.label) {
@@ -98,10 +98,12 @@ var getProjectConfig = function (env) { return __awaiter(void 0, void 0, void 0,
98
98
  switch (_h.label) {
99
99
  case 0:
100
100
  curConfigFilePath = configPath[key];
101
- exists = fs_extra_1.default.existsSync(curConfigFilePath);
102
- if (!exists) return [3, 3];
103
- return [4, Promise.resolve("".concat(curConfigFilePath)).then(function (s) { return __importStar(require(s)); })];
101
+ return [4, fs_extra_1.default.exists(curConfigFilePath)];
104
102
  case 1:
103
+ exists = _h.sent();
104
+ if (!exists) return [3, 4];
105
+ return [4, Promise.resolve("".concat(curConfigFilePath)).then(function (s) { return __importStar(require(s)); })];
106
+ case 2:
105
107
  configObj = (_h.sent()).default;
106
108
  configFields = Object.keys(configObj);
107
109
  configFileName = void 0;
@@ -150,10 +152,10 @@ var getProjectConfig = function (env) { return __awaiter(void 0, void 0, void 0,
150
152
  _f = customConfig;
151
153
  _g = key;
152
154
  return [4, Promise.resolve("".concat(curConfigFilePath)).then(function (s) { return __importStar(require(s)); })];
153
- case 2:
155
+ case 3:
154
156
  _f[_g] = (_h.sent()).default;
155
- _h.label = 3;
156
- case 3: return [2];
157
+ _h.label = 4;
158
+ case 4: return [2];
157
159
  }
158
160
  });
159
161
  };
@@ -178,7 +180,8 @@ var getProjectConfig = function (env) { return __awaiter(void 0, void 0, void 0,
178
180
  return [4, initCliIndexFile(templateType)];
179
181
  case 6:
180
182
  _e.sent();
181
- entryPath = path_1.default.resolve(projectPath, './src/.swico/index.js');
183
+ envPath = env === 'dev' ? '.dev/' : '.prod/';
184
+ entryPath = path_1.default.resolve(projectPath, "./src/.swico/".concat(envPath, "index.js"));
182
185
  templatePath = path_1.default.join(projectPath, '/src/index.ejs');
183
186
  return [2, {
184
187
  projectPath: projectPath,
@@ -226,21 +229,23 @@ var initCliIndexFile = function (templateType) { return __awaiter(void 0, void 0
226
229
  case 0:
227
230
  targetPath = path_1.default.resolve(__dirname, '../index.js');
228
231
  targetTypesPath = path_1.default.resolve(__dirname, '../index.d.ts');
229
- return [4, fs_extra_1.default.readFileSync(path_1.default.resolve(__dirname, "../index.".concat(templateType, ".js")), 'utf8')];
232
+ return [4, fs_extra_1.default.readFile(path_1.default.resolve(__dirname, "../index.".concat(templateType, ".js")), 'utf8')];
230
233
  case 1:
231
234
  replaceFileText = _a.sent();
232
- fileTypesText = fs_extra_1.default.readFileSync(path_1.default.resolve(__dirname, "../index.".concat(templateType, ".d.ts")), 'utf8');
235
+ return [4, fs_extra_1.default.readFile(path_1.default.resolve(__dirname, "../index.".concat(templateType, ".d.ts")), 'utf8')];
236
+ case 2:
237
+ fileTypesText = _a.sent();
233
238
  if (templateType === 'react') {
234
239
  formatHooksPath = path_1.default
235
- .resolve(projectPath, './src/.swico/hooks')
240
+ .resolve(projectPath, './src/.swico/react-hooks')
236
241
  .replaceAll('\\', '/');
237
- replaceFileText = replaceFileText.replaceAll('require("./template/react/hooks");', "require(\"".concat(formatHooksPath, "\");"));
242
+ replaceFileText = replaceFileText.replaceAll('require("./template/react/react-hooks");', "require(\"".concat(formatHooksPath, "\");"));
238
243
  }
239
- return [4, (0, tools_1.writeFile)(targetPath, replaceFileText)];
240
- case 2:
241
- _a.sent();
242
- return [4, (0, tools_1.writeFile)(targetTypesPath, fileTypesText)];
244
+ return [4, fs_extra_1.default.writeFile(targetPath, replaceFileText)];
243
245
  case 3:
246
+ _a.sent();
247
+ return [4, fs_extra_1.default.writeFile(targetTypesPath, fileTypesText)];
248
+ case 4:
244
249
  _a.sent();
245
250
  return [2];
246
251
  }
@@ -248,24 +253,22 @@ var initCliIndexFile = function (templateType) { return __awaiter(void 0, void 0
248
253
  }); };
249
254
  var formatRouterConfig = function (_a, templateType, env) {
250
255
  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;
251
- var envPathSuffix = env === 'dev' ? '' : 'prod.';
256
+ var envPath = env === 'dev' ? '/.dev/' : '/.prod/';
252
257
  return new Promise(function (resolve, reject) { return __awaiter(void 0, void 0, void 0, function () {
253
258
  var formatRouter, textData, modifiedText, configFilePath, replaceConfigText;
254
259
  return __generator(this, function (_a) {
255
260
  switch (_a.label) {
256
261
  case 0:
257
- if (env === 'prod') {
258
- fs_extra_1.default.copyFileSync(path_1.default.resolve(projectPath, './src/.swico/routes.js'), path_1.default.resolve(projectPath, './src/.swico/routes.prod.js'));
259
- fs_extra_1.default.copyFileSync(path_1.default.resolve(projectPath, './src/.swico/config.js'), path_1.default.resolve(projectPath, './src/.swico/routes.config.js'));
260
- }
261
262
  formatRouter = getFormatRouter(routes, templateType);
262
263
  textData = "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.default = ".concat(JSON.stringify(formatRouter), ";");
263
264
  modifiedText = textData.replace(/"(\(\)=>import\('[^']+'\))"/g, '$1');
264
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, "./src/.swico/routes.".concat(envPathSuffix, "js")), modifiedText)];
265
+ return [4, fs_extra_1.default.writeFile(path_1.default.resolve(projectPath, "./src/.swico".concat(envPath, "routes.js")), modifiedText)];
265
266
  case 1:
266
267
  _a.sent();
267
- configFilePath = path_1.default.resolve(projectPath, "./src/.swico/config.".concat(envPathSuffix, "js"));
268
- replaceConfigText = fs_extra_1.default.readFileSync(configFilePath, 'utf8');
268
+ configFilePath = path_1.default.resolve(projectPath, "./src/.swico".concat(envPath, "config.js"));
269
+ return [4, fs_extra_1.default.readFile(configFilePath, 'utf8')];
270
+ case 2:
271
+ replaceConfigText = _a.sent();
269
272
  if (base) {
270
273
  replaceConfigText = replaceConfigText.replace(/exports\.routerBase\s*=\s*(.*)/gm, function (match, p1) {
271
274
  return "exports.routerBase = '".concat(templateType === 'react' && type === 'hash' ? '/' : base, "';");
@@ -276,8 +279,8 @@ var formatRouterConfig = function (_a, templateType, env) {
276
279
  return "exports.routerType = '".concat(type, "';");
277
280
  });
278
281
  }
279
- return [4, (0, tools_1.writeFile)(configFilePath, replaceConfigText)];
280
- case 2:
282
+ return [4, fs_extra_1.default.writeFile(configFilePath, replaceConfigText)];
283
+ case 3:
281
284
  _a.sent();
282
285
  resolve(null);
283
286
  return [2];
@@ -286,93 +289,79 @@ var formatRouterConfig = function (_a, templateType, env) {
286
289
  }); });
287
290
  };
288
291
  var initTemplateConfig = function (routerConfig, templateType, env) {
292
+ var envPath = env === 'dev' ? '/.dev/' : '/.prod/';
289
293
  return new Promise(function (resolve, reject) { return __awaiter(void 0, void 0, void 0, function () {
290
- var copyTargetPath, replaceIndexText, replaceHistoryText, e_1, e_2, e_3;
294
+ var copyTargetPath, replaceIndexText, hooksFilePath, replaceHooksText, e_1, e_2;
291
295
  return __generator(this, function (_a) {
292
296
  switch (_a.label) {
293
297
  case 0:
294
- copyTargetPath = path_1.default.resolve(projectPath, './src/.swico');
295
- if (!fs_extra_1.default.existsSync(copyTargetPath)) return [3, 2];
296
- return [4, fs_extra_1.default.remove(copyTargetPath)];
298
+ copyTargetPath = path_1.default.resolve(projectPath, "./src/.swico".concat(envPath));
299
+ return [4, (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, "../template/".concat(templateType, "/$env")), copyTargetPath, function (fileName) {
300
+ return !fileName.endsWith('.d.ts') &&
301
+ (templateType === 'vue'
302
+ ? !['Container.js', 'vue-hooks.js'].includes(fileName)
303
+ : !['react-hooks.js'].includes(fileName));
304
+ })];
297
305
  case 1:
298
306
  _a.sent();
299
- _a.label = 2;
300
- case 2: return [4, (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, "../template/".concat(templateType)), copyTargetPath, function (fileName) {
301
- return !fileName.endsWith('.d.ts') &&
302
- (templateType === 'vue' ? fileName !== 'Container.js' : true);
303
- })];
304
- case 3:
307
+ return [4, (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, "../template/".concat(templateType)), path_1.default.resolve(projectPath, './src/.swico'), function (fileName) {
308
+ return ['react-hooks.js', 'vue-hooks.js', 'loading.js', 'Container.vue'].includes(fileName);
309
+ })];
310
+ case 2:
305
311
  _a.sent();
306
312
  return [4, formatRouterConfig(routerConfig, templateType, env)];
307
- case 4:
313
+ case 3:
308
314
  _a.sent();
309
- replaceIndexText = fs_extra_1.default.readFileSync(path_1.default.resolve(projectPath, './src/.swico/index.js'), 'utf8');
310
- replaceHistoryText = fs_extra_1.default.readFileSync(path_1.default.resolve(projectPath, './src/.swico/history.js'), 'utf8');
311
- if (env === 'prod') {
312
- replaceIndexText = replaceIndexText.replaceAll('require("./config");', 'require("./config.prod");');
313
- replaceHistoryText = replaceHistoryText.replaceAll('require("./config");', 'require("./config.prod");');
314
- }
315
- else {
316
- replaceIndexText = replaceIndexText.replaceAll('require("./config.prod");', 'require("./config");');
317
- replaceHistoryText = replaceHistoryText.replaceAll('require("./config.prod");', 'require("./config");');
318
- }
319
- _a.label = 5;
315
+ return [4, fs_extra_1.default.readFile(path_1.default.resolve(projectPath, "./src/.swico".concat(envPath, "index.js")), 'utf8')];
316
+ case 4:
317
+ replaceIndexText = _a.sent();
318
+ hooksFilePath = path_1.default.resolve(projectPath, "./src/.swico/".concat(templateType, "-hooks.js"));
319
+ return [4, fs_extra_1.default.readFile(hooksFilePath, 'utf8')];
320
320
  case 5:
321
- _a.trys.push([5, 7, , 8]);
322
- return [4, fs_extra_1.default.access(path_1.default.resolve(projectPath, './src/global.ts'), fs_extra_1.default.constants.F_OK)];
321
+ replaceHooksText = _a.sent();
322
+ replaceHooksText = replaceHooksText.replaceAll('$env', ".".concat(env));
323
+ return [4, fs_extra_1.default.writeFile(hooksFilePath, replaceHooksText)];
323
324
  case 6:
324
325
  _a.sent();
325
- replaceIndexText = replaceIndexText.replaceAll('require("../global");', '');
326
- replaceIndexText = 'require("../global");\n' + replaceIndexText;
327
- return [3, 8];
326
+ _a.label = 7;
328
327
  case 7:
329
- e_1 = _a.sent();
330
- replaceIndexText = replaceIndexText.replaceAll('require("../global");', '');
331
- return [3, 8];
332
- case 8:
333
- _a.trys.push([8, 10, , 11]);
328
+ _a.trys.push([7, 9, , 10]);
334
329
  return [4, fs_extra_1.default.access(path_1.default.resolve(projectPath, './src/global.less'), fs_extra_1.default.constants.F_OK)];
335
- case 9:
330
+ case 8:
336
331
  _a.sent();
337
- replaceIndexText = replaceIndexText.replaceAll('require("../global.less");', '');
338
- replaceIndexText = 'require("../global.less");\n' + replaceIndexText;
339
- return [3, 11];
332
+ replaceIndexText = replaceIndexText.replaceAll('require("../../global.less");', '');
333
+ replaceIndexText = 'require("../../global.less");\n' + replaceIndexText;
334
+ return [3, 10];
335
+ case 9:
336
+ e_1 = _a.sent();
337
+ replaceIndexText = replaceIndexText.replaceAll('require("../../global.less");', '');
338
+ return [3, 10];
340
339
  case 10:
341
- e_2 = _a.sent();
342
- replaceIndexText = replaceIndexText.replaceAll('require("../global.less");', '');
343
- return [3, 11];
340
+ if (!(templateType === 'vue')) return [3, 12];
341
+ replaceIndexText = replaceIndexText.replace('"../Container"', '"../Container.vue"');
342
+ return [4, fs_extra_1.default.writeFile(path_1.default.resolve(projectPath, "./src/.swico".concat(envPath, "index.js")), replaceIndexText)];
344
343
  case 11:
345
- if (!(templateType === 'vue')) return [3, 14];
346
- replaceIndexText = replaceIndexText.replace('"./Container"', '"./Container.vue"');
347
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/index.js'), replaceIndexText)];
348
- case 12:
349
344
  _a.sent();
350
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/history.js'), replaceHistoryText)];
345
+ return [3, 18];
346
+ case 12:
347
+ if (!(templateType === 'react')) return [3, 18];
348
+ _a.label = 13;
351
349
  case 13:
352
- _a.sent();
353
- _a.label = 14;
354
- case 14:
355
- if (!(templateType === 'react')) return [3, 21];
356
- _a.label = 15;
357
- case 15:
358
- _a.trys.push([15, 17, 18, 21]);
350
+ _a.trys.push([13, 15, 16, 18]);
359
351
  return [4, fs_extra_1.default.access(path_1.default.resolve(projectPath, './src/loading/index.tsx'), fs_extra_1.default.constants.F_OK)];
360
- case 16:
352
+ case 14:
361
353
  _a.sent();
362
- replaceIndexText = replaceIndexText.replace('"./loading"', '"../loading"');
363
- return [3, 21];
354
+ replaceIndexText = replaceIndexText.replace('"../loading"', '"../../loading"');
355
+ return [3, 18];
356
+ case 15:
357
+ e_2 = _a.sent();
358
+ replaceIndexText = replaceIndexText.replace('"../../loading"', '"../loading"');
359
+ return [3, 18];
360
+ case 16: return [4, fs_extra_1.default.writeFile(path_1.default.resolve(projectPath, "./src/.swico".concat(envPath, "index.js")), replaceIndexText)];
364
361
  case 17:
365
- e_3 = _a.sent();
366
- replaceIndexText = replaceIndexText.replace('"../loading"', '"./loading"');
367
- return [3, 21];
368
- case 18: return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/index.js'), replaceIndexText)];
369
- case 19:
370
- _a.sent();
371
- return [4, (0, tools_1.writeFile)(path_1.default.resolve(projectPath, './src/.swico/history.js'), replaceHistoryText)];
372
- case 20:
373
362
  _a.sent();
374
363
  return [7];
375
- case 21:
364
+ case 18:
376
365
  resolve(null);
377
366
  return [2];
378
367
  }
@@ -1,8 +1,8 @@
1
- export declare const copyDirFiles: (src: any, dest: any, filter?: (fileName: any) => boolean) => Promise<any>;
1
+ export declare const copyDirFiles: (src: any, dest: any, filter?: (fileName: any) => boolean) => Promise<void>;
2
2
  export declare const getPort: () => Promise<number>;
3
3
  export declare const toast: {
4
4
  info: (message: string) => void;
5
5
  error: (message: string | string[]) => void;
6
6
  warning: (message: string | string[]) => void;
7
7
  };
8
- export declare const writeFile: (sourcePath: any, text: any) => Promise<unknown>;
8
+ export declare const initIndexFile: () => Promise<void>;
@@ -1,4 +1,27 @@
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
+ };
2
25
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
26
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
27
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,60 +58,101 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
58
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
59
  }
37
60
  };
61
+ var __asyncValues = (this && this.__asyncValues) || function (o) {
62
+ if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
63
+ var m = o[Symbol.asyncIterator], i;
64
+ return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
65
+ function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
66
+ function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
67
+ };
38
68
  var __importDefault = (this && this.__importDefault) || function (mod) {
39
69
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
70
  };
41
71
  Object.defineProperty(exports, "__esModule", { value: true });
42
- exports.writeFile = exports.toast = exports.getPort = exports.copyDirFiles = void 0;
72
+ exports.initIndexFile = exports.toast = exports.getPort = exports.copyDirFiles = void 0;
43
73
  var portfinder_1 = __importDefault(require("portfinder"));
44
74
  var fs_extra_1 = __importDefault(require("fs-extra"));
45
75
  var path_1 = __importDefault(require("path"));
46
76
  var chalk_1 = __importDefault(require("chalk"));
77
+ var process = __importStar(require("process"));
47
78
  var copyDirFiles = function (src, dest, filter) { return __awaiter(void 0, void 0, void 0, function () {
48
79
  var _copy, e_1;
49
80
  return __generator(this, function (_a) {
50
81
  switch (_a.label) {
51
82
  case 0:
52
83
  _copy = function (src, dest) { return __awaiter(void 0, void 0, void 0, function () {
53
- var files;
54
- return __generator(this, function (_a) {
55
- switch (_a.label) {
84
+ var files, filterFiles, _a, filterFiles_1, filterFiles_1_1, file, srcPath, destPath, srcStat, e_2_1;
85
+ var _b, e_2, _c, _d;
86
+ return __generator(this, function (_e) {
87
+ switch (_e.label) {
56
88
  case 0: return [4, fs_extra_1.default.readdir(src)];
57
89
  case 1:
58
- files = _a.sent();
59
- files.forEach(function (file) {
60
- var srcPath = path_1.default.join(src, file);
61
- var destPath = path_1.default.join(dest, file);
62
- var srcStat = fs_extra_1.default.statSync(srcPath);
63
- if (srcStat.isDirectory()) {
64
- _copy(srcPath, destPath);
65
- }
66
- else {
67
- var isFilter = filter ? filter(file) === true : true;
68
- if (isFilter) {
69
- fs_extra_1.default.copyFileSync(srcPath, destPath);
70
- }
71
- }
72
- });
73
- return [2, null];
90
+ files = _e.sent();
91
+ filterFiles = files.filter(function (fileName) { return (filter ? filter(fileName) === true : true); });
92
+ _e.label = 2;
93
+ case 2:
94
+ _e.trys.push([2, 10, 11, 16]);
95
+ _a = true, filterFiles_1 = __asyncValues(filterFiles);
96
+ _e.label = 3;
97
+ case 3: return [4, filterFiles_1.next()];
98
+ case 4:
99
+ if (!(filterFiles_1_1 = _e.sent(), _b = filterFiles_1_1.done, !_b)) return [3, 9];
100
+ _d = filterFiles_1_1.value;
101
+ _a = false;
102
+ file = _d;
103
+ srcPath = path_1.default.join(src, file);
104
+ destPath = path_1.default.join(dest, file);
105
+ return [4, fs_extra_1.default.stat(srcPath)];
106
+ case 5:
107
+ srcStat = _e.sent();
108
+ if (!srcStat.isDirectory()) return [3, 6];
109
+ _copy(srcPath, destPath);
110
+ return [3, 8];
111
+ case 6: return [4, fs_extra_1.default.copyFile(srcPath, destPath)];
112
+ case 7:
113
+ _e.sent();
114
+ _e.label = 8;
115
+ case 8:
116
+ _a = true;
117
+ return [3, 3];
118
+ case 9: return [3, 16];
119
+ case 10:
120
+ e_2_1 = _e.sent();
121
+ e_2 = { error: e_2_1 };
122
+ return [3, 16];
123
+ case 11:
124
+ _e.trys.push([11, , 14, 15]);
125
+ if (!(!_a && !_b && (_c = filterFiles_1.return))) return [3, 13];
126
+ return [4, _c.call(filterFiles_1)];
127
+ case 12:
128
+ _e.sent();
129
+ _e.label = 13;
130
+ case 13: return [3, 15];
131
+ case 14:
132
+ if (e_2) throw e_2.error;
133
+ return [7];
134
+ case 15: return [7];
135
+ case 16: return [2, null];
74
136
  }
75
137
  });
76
138
  }); };
77
139
  _a.label = 1;
78
140
  case 1:
79
- _a.trys.push([1, 3, , 4]);
141
+ _a.trys.push([1, 3, , 5]);
80
142
  return [4, fs_extra_1.default.access(dest)];
81
143
  case 2:
82
144
  _a.sent();
83
- return [3, 4];
145
+ return [3, 5];
84
146
  case 3:
85
147
  e_1 = _a.sent();
86
- fs_extra_1.default.mkdirSync(dest, { recursive: true });
87
- return [3, 4];
88
- case 4: return [4, _copy(src, dest)];
89
- case 5:
148
+ return [4, fs_extra_1.default.mkdir(dest, { recursive: true })];
149
+ case 4:
150
+ _a.sent();
151
+ return [3, 5];
152
+ case 5: return [4, _copy(src, dest)];
153
+ case 6:
90
154
  _a.sent();
91
- return [2, null];
155
+ return [2];
92
156
  }
93
157
  });
94
158
  }); };
@@ -102,7 +166,7 @@ var getPort = function () {
102
166
  exports.getPort = getPort;
103
167
  exports.toast = {
104
168
  info: function (message) {
105
- console.log("\n> ".concat(chalk_1.default.hex('#5f72f5')(message), "\n"));
169
+ console.log("> ".concat(chalk_1.default.hex('#5f72f5')(message), "\n"));
106
170
  },
107
171
  error: function (message) {
108
172
  console.log("\n> ".concat(chalk_1.default.hex('#5f72f5')('There are some errors about Swico:'), " \n"));
@@ -127,18 +191,25 @@ exports.toast = {
127
191
  }
128
192
  }
129
193
  };
130
- var writeFile = function (sourcePath, text) {
131
- return new Promise(function (resolve, reject) {
132
- fs_extra_1.default.writeFile(sourcePath, text, function (err) {
133
- if (err) {
134
- var errText = 'An error occurred during the Swico configuration.';
135
- exports.toast.error(errText);
136
- return reject(errText);
137
- }
138
- else {
139
- return resolve(null);
140
- }
141
- });
194
+ var initIndexFile = function () { return __awaiter(void 0, void 0, void 0, function () {
195
+ var fileText, targetPath, formatHooksPath;
196
+ return __generator(this, function (_a) {
197
+ switch (_a.label) {
198
+ case 0: return [4, fs_extra_1.default.readFile(path_1.default.resolve(__dirname, '../index.js'), 'utf8')];
199
+ case 1:
200
+ fileText = _a.sent();
201
+ targetPath = path_1.default.resolve(__dirname, '../index.js');
202
+ formatHooksPath = path_1.default
203
+ .resolve(process.cwd(), './src/.swico/react-hooks')
204
+ .replaceAll('\\', '/');
205
+ if (!fileText.includes("require(\"".concat(formatHooksPath, "\");"))) return [3, 3];
206
+ fileText = fileText.replaceAll("require(\"".concat(formatHooksPath, "\");"), 'require("./template/react/react-hooks");');
207
+ return [4, fs_extra_1.default.writeFile(targetPath, fileText)];
208
+ case 2:
209
+ _a.sent();
210
+ _a.label = 3;
211
+ case 3: return [2];
212
+ }
142
213
  });
143
- };
144
- exports.writeFile = writeFile;
214
+ }); };
215
+ exports.initIndexFile = initIndexFile;
@@ -1,12 +0,0 @@
1
- export interface UseLocationType {
2
- (): {
3
- name: string;
4
- path: string;
5
- pathname: string;
6
- search: string;
7
- query?: Record<string, any>;
8
- hash: string;
9
- params?: Record<string, any>;
10
- };
11
- }
12
- export declare const useLocation: UseLocationType;
@@ -1,47 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.useLocation = void 0;
7
- var react_router_dom_1 = require("react-router-dom");
8
- var qs_1 = __importDefault(require("qs"));
9
- var history_1 = require("../react/history");
10
- var routes_1 = require("../react/routes");
11
- var compareURLPatterns = function (urlPatternWithValues, urlPatternWithParams) {
12
- var patternWithValuesParts = urlPatternWithValues.split('/');
13
- var patternWithParamsParts = urlPatternWithParams.split('/');
14
- if (patternWithValuesParts.length !== patternWithParamsParts.length) {
15
- return false;
16
- }
17
- for (var i = 0; i < patternWithValuesParts.length; i++) {
18
- var valuePart = patternWithValuesParts[i];
19
- var paramPart = patternWithParamsParts[i];
20
- if (paramPart.startsWith(':') && paramPart !== '') {
21
- continue;
22
- }
23
- if (valuePart !== paramPart) {
24
- return false;
25
- }
26
- }
27
- return true;
28
- };
29
- var useLocation = function () {
30
- var _a, _b;
31
- var location = (0, react_router_dom_1.useLocation)();
32
- var params = (0, react_router_dom_1.useParams)();
33
- var search = location.search, hash = location.hash, pathname = location.pathname;
34
- var pathNameList = (0, history_1.getPathNameList)(routes_1.routes);
35
- var name = (_a = pathNameList.find(function (item) { return (params && compareURLPatterns(pathname, item.path)) || item.path === pathname; })) === null || _a === void 0 ? void 0 : _a.name;
36
- var query = search ? qs_1.default.parse(search.startsWith('?') ? search.slice(1) : search) : {};
37
- return {
38
- name: name,
39
- path: pathname,
40
- pathname: (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.pathname,
41
- search: search,
42
- query: query,
43
- hash: hash,
44
- params: params
45
- };
46
- };
47
- exports.useLocation = useLocation;
@@ -1,3 +0,0 @@
1
- import { UseLocationType } from './react';
2
- export declare const getFormatRouterBase: (routerBase: any) => any;
3
- export declare const useLocation: UseLocationType;
@@ -1,40 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.useLocation = exports.getFormatRouterBase = void 0;
7
- var vue_router_1 = require("vue-router");
8
- var qs_1 = __importDefault(require("qs"));
9
- var vue_1 = require("vue");
10
- var config_1 = require("../vue/config");
11
- var getFormatRouterBase = function (routerBase) {
12
- var lastIndexBase = routerBase[routerBase.length - 1];
13
- return lastIndexBase === '/' ? routerBase.slice(0, routerBase.length - 1) : routerBase;
14
- };
15
- exports.getFormatRouterBase = getFormatRouterBase;
16
- var useLocation = function () {
17
- var route = (0, vue_router_1.useRoute)();
18
- var location = (0, vue_1.reactive)({
19
- name: '',
20
- path: '',
21
- search: '',
22
- hash: '',
23
- pathname: '',
24
- params: {},
25
- query: {}
26
- });
27
- (0, vue_1.watchEffect)(function () {
28
- var hash = route.hash, path = route.path, params = route.params, fullPath = route.fullPath, query = route.query, name = route.name;
29
- var search = query ? qs_1.default.stringify(query) : '';
30
- location.name = name;
31
- location.path = path;
32
- location.pathname = (0, exports.getFormatRouterBase)(config_1.routerBase) + path;
33
- location.search = search;
34
- location.query = query;
35
- location.hash = hash;
36
- location.params = params;
37
- });
38
- return location;
39
- };
40
- exports.useLocation = useLocation;
@@ -1,2 +0,0 @@
1
- export declare const compareURLPatterns: (urlPatternWithValues: string, urlPatternWithParams: string) => boolean;
2
- export declare const useLocation: UseLocationType;
File without changes
File without changes
File without changes