swico 0.3.0-beta5 → 0.4.0-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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "swico",
3
- "version": "0.3.0-beta5",
3
+ "version": "0.4.0-beta1",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -64,6 +64,7 @@ var handleWatch = function (projectPath, devServer) {
64
64
  .watch([
65
65
  path_1.default.join(projectPath, '/config/*.ts'),
66
66
  path_1.default.join(projectPath, '/.eslintrc'),
67
+ path_1.default.join(projectPath, '/src/loading/index.tsx'),
67
68
  path_1.default.join(projectPath, '/src/global.less')
68
69
  ], {
69
70
  interval: 500,
@@ -17,3 +17,6 @@ export interface DefineSwicoConfigType {
17
17
  (env: 'prod', config: CustomConfigType['prod']): any;
18
18
  }
19
19
  export declare const defineConfig: DefineSwicoConfigType;
20
+ export interface DefineGlobalConfigType {
21
+ }
22
+ export declare const defineGlobal: (config: DefineGlobalConfigType) => DefineGlobalConfigType;
@@ -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.defineConfig = exports.useLocation = exports.Outlet = exports.Link = void 0;
6
+ exports.defineGlobal = exports.defineConfig = exports.useLocation = 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) {
@@ -17,3 +17,7 @@ var react_2 = require("./template/hooks/react");
17
17
  Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return react_2.useLocation; } });
18
18
  var defineConfig = function (env, config) { return config; };
19
19
  exports.defineConfig = defineConfig;
20
+ var defineGlobal = function (config) {
21
+ return config;
22
+ };
23
+ exports.defineGlobal = defineGlobal;
@@ -5,5 +5,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  var react_router_dom_1 = require("react-router-dom");
7
7
  var react_1 = __importDefault(require("react"));
8
- exports.default = (function () { return react_1.default.createElement("div", null,
9
- react_1.default.createElement(react_router_dom_1.Outlet, null)); });
8
+ exports.default = (function () { return react_1.default.createElement(react_router_dom_1.Outlet, null); });
@@ -73,7 +73,8 @@ var getHistory = function (routerBase, routerType) {
73
73
  var history;
74
74
  var originalHistory = (_a = (routerType === 'hash' ? history_1.createHashHistory : history_1.createBrowserHistory)) === null || _a === void 0 ? void 0 : _a();
75
75
  var lastIndexBase = routerBase[routerBase.length - 1];
76
- var formatRouterBase = lastIndexBase === '/' ? routerBase.slice(0, routerBase.length - 1) : routerBase;
76
+ var formatRouterBase = routerType === 'hash' ? '' :
77
+ (lastIndexBase === '/' ? routerBase.slice(0, routerBase.length - 1) : routerBase);
77
78
  history = {
78
79
  go: originalHistory.go,
79
80
  back: originalHistory.back,
@@ -45,17 +45,14 @@ var renderChildrenRouteList = function (childrenRoutes, ancPathKey) {
45
45
  var App = function () {
46
46
  var _a = (0, history_1.getHistory)(config_1.routerBase, config_1.routerType), history = _a.history, originalHistory = _a.originalHistory;
47
47
  if (config_1.routerBase && config_1.routerBase !== '/') {
48
- if (config_1.routerType === 'hash' && ['', '/'].includes(window.location.hash)) {
49
- window.location.replace("/#".concat(config_1.routerBase));
50
- }
51
- else if (config_1.routerType === 'browser' && window.location.pathname === '/') {
48
+ if (config_1.routerType === 'browser' && window.location.pathname === '/') {
52
49
  window.location.replace("".concat(config_1.routerBase));
53
50
  }
54
51
  }
55
52
  window.Swico = {
56
53
  history: history
57
54
  };
58
- return (react_1.default.createElement(history_1.HistoryRouter, { basename: config_1.routerBase, history: originalHistory },
55
+ return (react_1.default.createElement(history_1.HistoryRouter, { basename: config_1.routerType === 'hash' ? '/' : config_1.routerBase, history: originalHistory },
59
56
  react_1.default.createElement(react_router_dom_1.Routes, null,
60
57
  react_1.default.createElement(react_router_dom_1.Route, { element: react_1.default.createElement(layout_1.default, null), path: '' }, renderChildrenRouteList(routes_1.default, '')))));
61
58
  };