swico 2.6.0-beta.7 → 2.6.0-beta.9

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": "2.6.0-beta.7",
3
+ "version": "2.6.0-beta.9",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
package/src/index.vue.js CHANGED
@@ -11,7 +11,7 @@ var mock_history_1 = require("./mock-history");
11
11
  Object.defineProperty(exports, "history", { enumerable: true, get: function () { return mock_history_1.history; } });
12
12
  exports.Outlet = (0, vue_1.defineComponent)({
13
13
  name: 'Outlet',
14
- template: '<RouterView v-slot="{ Component }"><template v-if="Component"><Suspense><component :is="Component"></component><template #fallback><SwicoLoading /></template></Suspense></template></RouterView>'
14
+ template: '<RouterView v-slot="{ Component }"><template v-if="Component"><Suspense><component :is="Component"></component><template #fallback></template></Suspense></template></RouterView>'
15
15
  });
16
16
  const defineConfig = (env, config) => config;
17
17
  exports.defineConfig = defineConfig;
@@ -50,6 +50,29 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
50
50
  const path_1 = __importDefault(require("path"));
51
51
  const chalk_1 = __importDefault(require("chalk"));
52
52
  const utils_1 = require("../utils");
53
+ const getFormatRouter = (projectPath, routes, templateType) => {
54
+ const _main = (item) => {
55
+ const { component, name, children, redirect, decorator } = item;
56
+ return decorator
57
+ ? Object.assign(Object.assign({}, item), { component: `()=>import('${projectPath}/src/pages/${decorator}${templateType === 'vue' ? '.vue' : ''}')`, children: [
58
+ {
59
+ path: '',
60
+ component: component
61
+ ? `()=>import('${projectPath}/src/pages/${component}${templateType === 'vue' ? '.vue' : ''}')`
62
+ : undefined,
63
+ name,
64
+ redirect,
65
+ children: children ? children === null || children === void 0 ? void 0 : children.map((item) => _main(item)) : undefined
66
+ }
67
+ ] }) : Object.assign(Object.assign({}, item), { component: component
68
+ ? `()=>import('${projectPath}/src/pages/${component}${templateType === 'vue' ? '.vue' : ''}')`
69
+ : undefined, name,
70
+ redirect, children: children ? children === null || children === void 0 ? void 0 : children.map((item) => _main(item)) : undefined });
71
+ };
72
+ return routes.map((item) => {
73
+ return _main(item);
74
+ });
75
+ };
53
76
  const getProjectConfig = (env) => __awaiter(void 0, void 0, void 0, function* () {
54
77
  var _a, _b;
55
78
  const projectPath = process.cwd();
@@ -152,7 +175,7 @@ const formatRouterConfig = ({ routes = [], type = 'browser', base = '/' }, templ
152
175
  const projectPath = process.cwd();
153
176
  const envPath = env === 'dev' ? '/.dev/' : '/.prod/';
154
177
  return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
155
- const formatRouter = (0, utils_1.getFormatRouter)(projectPath, routes, templateType);
178
+ const formatRouter = getFormatRouter(projectPath, routes, templateType);
156
179
  const textData = `"use strict";
157
180
  Object.defineProperty(exports, "__esModule", { value: true });
158
181
  exports.default = ${JSON.stringify(formatRouter)};`;
@@ -244,8 +267,10 @@ const initTemplateConfig = (routerConfig, templateType, env) => {
244
267
  yield fs_extra_1.default.writeFile(hooksFilePath, replaceHooksText);
245
268
  let replaceIndexText = yield fs_extra_1.default.readFile(path_1.default.resolve(projectPath, `./.swico${envPath}index.js`), 'utf8');
246
269
  replaceIndexText = (0, exports.handleGlobalStyleFile)(replaceIndexText);
247
- const newReplaceIndexText = yield (0, exports.handleLoadingFile)(projectPath, templateType, replaceIndexText);
248
- yield (0, exports.updateIndexFileText)(envPath, newReplaceIndexText);
270
+ if (templateType === 'react') {
271
+ replaceIndexText = yield (0, exports.handleLoadingFile)(projectPath, templateType, replaceIndexText);
272
+ }
273
+ yield (0, exports.updateIndexFileText)(envPath, replaceIndexText);
249
274
  resolve(null);
250
275
  }));
251
276
  };
@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
7
7
  const vue_1 = require("vue");
8
8
  const Layout_1 = __importDefault(require("../../src/layout/Layout"));
9
9
  const global_1 = __importDefault(require("../../src/global"));
10
- const loading_1 = __importDefault(require("../loading"));
11
10
  const history_1 = require("./history");
12
11
  const Container = (0, vue_1.defineComponent)({
13
12
  name: 'Container',
@@ -24,7 +23,6 @@ const Container = (0, vue_1.defineComponent)({
24
23
  const router = (0, history_1.getRouter)();
25
24
  const app = (0, vue_1.createApp)(Container);
26
25
  app.component('SwicoLayout', Layout_1.default);
27
- app.component('SwicoLoading', loading_1.default);
28
26
  app.use(router);
29
27
  (_a = global_1.default === null || global_1.default === void 0 ? void 0 : global_1.default.onInit) === null || _a === void 0 ? void 0 : _a.call(global_1.default, app, router);
30
28
  app.mount('#root');
package/src/utils.d.ts CHANGED
@@ -1,6 +1,4 @@
1
- import { ConfigRouterType } from './main-config';
2
1
  export declare const copyDirFiles: (src: any, dest: any, filter?: (fileName: any) => boolean) => Promise<void>;
3
- export declare const getFormatRouter: (projectPath: string, routes: ConfigRouterType["routes"], templateType: any) => any[];
4
2
  export declare const getPort: () => Promise<number>;
5
3
  export declare const colorConfig: {
6
4
  theme: string;
package/src/utils.js CHANGED
@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
19
19
  return (mod && mod.__esModule) ? mod : { "default": mod };
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.toast = exports.colorConfig = exports.getPort = exports.getFormatRouter = exports.copyDirFiles = void 0;
22
+ exports.toast = exports.colorConfig = exports.getPort = exports.copyDirFiles = void 0;
23
23
  const portfinder_1 = __importDefault(require("portfinder"));
24
24
  const fs_extra_1 = __importDefault(require("fs-extra"));
25
25
  const path_1 = __importDefault(require("path"));
@@ -63,30 +63,6 @@ const copyDirFiles = (src, dest, filter) => __awaiter(void 0, void 0, void 0, fu
63
63
  yield _copy(src, dest);
64
64
  });
65
65
  exports.copyDirFiles = copyDirFiles;
66
- const getFormatRouter = (projectPath, routes, templateType) => {
67
- const _main = (item) => {
68
- const { component, name, children, redirect, decorator } = item;
69
- return decorator
70
- ? Object.assign(Object.assign({}, item), { component: `()=>import('${projectPath}/src/pages/${decorator}${templateType === 'vue' ? '.vue' : ''}')`, children: [
71
- {
72
- path: '',
73
- component: component
74
- ? `()=>import('${projectPath}/src/pages/${component}${templateType === 'vue' ? '.vue' : ''}')`
75
- : undefined,
76
- name,
77
- redirect,
78
- children: children ? children === null || children === void 0 ? void 0 : children.map((item) => _main(item)) : undefined
79
- }
80
- ] }) : Object.assign(Object.assign({}, item), { component: component
81
- ? `()=>import('${projectPath}/src/pages/${component}${templateType === 'vue' ? '.vue' : ''}')`
82
- : undefined, name,
83
- redirect, children: children ? children === null || children === void 0 ? void 0 : children.map((item) => _main(item)) : undefined });
84
- };
85
- return routes.map((item) => {
86
- return _main(item);
87
- });
88
- };
89
- exports.getFormatRouter = getFormatRouter;
90
66
  const getPort = () => {
91
67
  return portfinder_1.default.getPortPromise({
92
68
  port: 3000,
@@ -1,2 +0,0 @@
1
- declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
2
- export default _default;
@@ -1,7 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const vue_1 = require("vue");
4
- exports.default = (0, vue_1.defineComponent)({
5
- name: 'Loading',
6
- template: ''
7
- });