swico 2.4.0 → 2.5.0-beta.2

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.4.0",
3
+ "version": "2.5.0-beta.2",
4
4
  "description": "Simple, efficient, and practical front-end framework",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
@@ -23,7 +23,6 @@ function default_1() {
23
23
  process.env.SWICO_ENV = 'prod';
24
24
  tools_1.toast.info(`Swico v${package_json_1.default.version}`);
25
25
  tools_1.toast.info('Initializing production config...');
26
- yield (0, tools_1.initIndexFile)();
27
26
  const projectConfig = yield (0, config_1.getProjectConfig)('prod');
28
27
  const { entryPath, templatePath, projectPath, customConfig, templateType } = projectConfig;
29
28
  const buildConfig = yield (0, rspack_prod_1.default)({
@@ -142,7 +142,6 @@ function start() {
142
142
  tools_1.toast.info(`Swico v${package_json_1.default.version}`);
143
143
  tools_1.toast.info('Initializing development config...');
144
144
  }
145
- yield (0, tools_1.initIndexFile)();
146
145
  const availablePort = SWICO_RESTART === 'true' ? Number(SWICO_PORT) : yield (0, tools_1.getPort)();
147
146
  const projectConfig = yield (0, config_1.getProjectConfig)('dev');
148
147
  const { projectPath, customConfig, env } = projectConfig;
@@ -90,6 +90,7 @@ export default function ({ projectPath, entryPath, env, customConfig }: GlobalDa
90
90
  alias: {
91
91
  '@': string;
92
92
  'react-router': string;
93
+ swico: string;
93
94
  qs: string;
94
95
  };
95
96
  };
@@ -145,7 +145,7 @@ function default_1(_a) {
145
145
  },
146
146
  resolve: {
147
147
  extensions: ['.ts', '.tsx', '.js', '.jsx', '.json'],
148
- alias: Object.assign({ '@': path_1.default.join(projectPath, '/src'), 'react-router': path_1.default.dirname(require.resolve('react-router')), qs: path_1.default.dirname(require.resolve('qs')) }, getCustomAliasConfig())
148
+ alias: Object.assign({ '@': path_1.default.join(projectPath, '/src'), 'react-router': path_1.default.dirname(require.resolve('react-router')), swico: path_1.default.join(projectPath, '/.swico/index'), qs: path_1.default.dirname(require.resolve('qs')) }, getCustomAliasConfig())
149
149
  },
150
150
  externals: customConfig.base.externals,
151
151
  plugins: [
@@ -125,6 +125,7 @@ export default function ({ projectPath, entryPath, env, customConfig }: GlobalDa
125
125
  '@': string;
126
126
  vue: string;
127
127
  'vue-router': string;
128
+ swico: string;
128
129
  qs: string;
129
130
  };
130
131
  };
@@ -253,7 +253,7 @@ function default_1(_a) {
253
253
  },
254
254
  resolve: {
255
255
  extensions: ['.ts', '.js', '.vue', '.json'],
256
- alias: Object.assign({ '@': path_1.default.join(projectPath, '/src'), vue: 'vue/dist/vue.esm-bundler.js', 'vue-router': path_1.default.dirname(require.resolve('vue-router')), qs: path_1.default.dirname(require.resolve('qs')) }, getCustomAliasConfig())
256
+ alias: Object.assign({ '@': path_1.default.join(projectPath, '/src'), vue: 'vue/dist/vue.esm-bundler.js', 'vue-router': path_1.default.dirname(require.resolve('vue-router')), swico: path_1.default.join(projectPath, '/.swico/index'), qs: path_1.default.dirname(require.resolve('qs')) }, getCustomAliasConfig())
257
257
  },
258
258
  externals: customBaseConfig === null || customBaseConfig === void 0 ? void 0 : customBaseConfig.externals,
259
259
  plugins: [
@@ -3,7 +3,7 @@ export type CustomConfigType = GlobalData['customConfig'];
3
3
  export type { GlobalSwicoConfigType };
4
4
  export { default as Link } from './project-path/.swico-react/Link';
5
5
  export { Outlet } from 'react-router';
6
- export { useLocation, useNav } from './project-path/.swico-react/react-hooks';
6
+ export { useLocation, useNav } from './project-path/.swico-react/hooks';
7
7
  export { history } from './mock-history';
8
8
  export interface DefineSwicoConfigType {
9
9
  (env: 'base', config: CustomConfigType['base']): any;
@@ -8,9 +8,9 @@ var Link_1 = require("./project-path/.swico-react/Link");
8
8
  Object.defineProperty(exports, "Link", { enumerable: true, get: function () { return __importDefault(Link_1).default; } });
9
9
  var react_router_1 = require("react-router");
10
10
  Object.defineProperty(exports, "Outlet", { enumerable: true, get: function () { return react_router_1.Outlet; } });
11
- var react_hooks_1 = require("./project-path/.swico-react/react-hooks");
12
- Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return react_hooks_1.useLocation; } });
13
- Object.defineProperty(exports, "useNav", { enumerable: true, get: function () { return react_hooks_1.useNav; } });
11
+ var hooks_1 = require("./project-path/.swico-react/hooks");
12
+ Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return hooks_1.useLocation; } });
13
+ Object.defineProperty(exports, "useNav", { enumerable: true, get: function () { return hooks_1.useNav; } });
14
14
  var mock_history_1 = require("./mock-history");
15
15
  Object.defineProperty(exports, "history", { enumerable: true, get: function () { return mock_history_1.history; } });
16
16
  const defineConfig = (env, config) => 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, useNav } from './project-path/.swico-vue/vue-hooks';
6
+ export { useLocation, useNav } from './project-path/.swico-vue/hooks';
7
7
  export { history } from './mock-history';
8
8
  export type { GlobalSwicoConfigType };
9
9
  export { default as Link } from './project-path/.swico-vue/Link';
package/src/index.vue.js CHANGED
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.defineGlobal = exports.defineConfig = exports.Link = exports.history = exports.useNav = exports.useLocation = exports.Outlet = void 0;
7
7
  var vue_router_1 = require("vue-router");
8
8
  Object.defineProperty(exports, "Outlet", { enumerable: true, get: function () { return vue_router_1.RouterView; } });
9
- var vue_hooks_1 = require("./project-path/.swico-vue/vue-hooks");
10
- Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return vue_hooks_1.useLocation; } });
11
- Object.defineProperty(exports, "useNav", { enumerable: true, get: function () { return vue_hooks_1.useNav; } });
9
+ var hooks_1 = require("./project-path/.swico-vue/hooks");
10
+ Object.defineProperty(exports, "useLocation", { enumerable: true, get: function () { return hooks_1.useLocation; } });
11
+ Object.defineProperty(exports, "useNav", { enumerable: true, get: function () { return hooks_1.useNav; } });
12
12
  var mock_history_1 = require("./mock-history");
13
13
  Object.defineProperty(exports, "history", { enumerable: true, get: function () { return mock_history_1.history; } });
14
14
  var Link_1 = require("./project-path/.swico-vue/Link");
@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const react_1 = __importDefault(require("react"));
7
- const react_hooks_1 = require("./react-hooks");
7
+ const hooks_1 = require("./hooks");
8
8
  const Link = ({ replace, to, style, className, children }) => {
9
- const nav = (0, react_hooks_1.useNav)();
9
+ const nav = (0, hooks_1.useNav)();
10
10
  return (react_1.default.createElement("a", { onClick: () => {
11
11
  nav(to, { replace });
12
12
  }, style: style, className: className }, children));
@@ -1,2 +1,4 @@
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>;
1
+ declare const _default: import("vue").DefineComponent<{}, {
2
+ error: import("vue").Ref<string, string>;
3
+ }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
2
4
  export default _default;
@@ -1,4 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const vue_1 = require("vue");
4
- exports.default = (0, vue_1.defineComponent)({});
4
+ exports.default = (0, vue_1.defineComponent)({
5
+ name: 'Container',
6
+ setup(props) {
7
+ const error = (0, vue_1.ref)(null);
8
+ (0, vue_1.onErrorCaptured)((err) => {
9
+ error.value = err.toString();
10
+ return false;
11
+ });
12
+ return { error };
13
+ },
14
+ template: '<Layout v-if="!error"><RouterView /></Layout>'
15
+ });
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const vue_1 = require("vue");
4
- const vue_hooks_1 = require("./vue-hooks");
4
+ const hooks_1 = require("./hooks");
5
5
  exports.default = (0, vue_1.defineComponent)({
6
6
  name: 'Link',
7
7
  props: {
@@ -13,7 +13,7 @@ exports.default = (0, vue_1.defineComponent)({
13
13
  }
14
14
  },
15
15
  setup(props) {
16
- const nav = (0, vue_hooks_1.useNav)();
16
+ const nav = (0, hooks_1.useNav)();
17
17
  return { nav };
18
18
  },
19
19
  template: `<a
package/src/task.js CHANGED
@@ -14,18 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const fs_extra_1 = __importDefault(require("fs-extra"));
16
16
  const path_1 = __importDefault(require("path"));
17
- const copyVueFiles = () => __awaiter(void 0, void 0, void 0, function* () {
18
- const filePath = path_1.default.resolve(__dirname, './project-path/.swico-vue/Container.vue');
19
- const targetPath = path_1.default.resolve(__dirname, '../dist/src/project-path/.swico-vue/Container.vue');
20
- yield fs_extra_1.default.copyFile(filePath, targetPath);
21
- });
22
17
  const copyReadMeFiles = () => __awaiter(void 0, void 0, void 0, function* () {
23
18
  const filePath = path_1.default.resolve(__dirname, '../README.md');
24
19
  const targetPath = path_1.default.resolve(__dirname, '../dist/README.md');
25
20
  yield fs_extra_1.default.copyFile(filePath, targetPath);
26
21
  });
27
22
  const main = () => {
28
- copyVueFiles();
29
23
  copyReadMeFiles();
30
24
  };
31
25
  main();
@@ -117,7 +117,7 @@ const getProjectConfig = (env) => __awaiter(void 0, void 0, void 0, function* ()
117
117
  const templateType = customConfig['base'].template;
118
118
  const routerConfig = Object.assign(Object.assign(Object.assign({}, exports.initConfig.router), customConfig['base'].router), customConfig[env].router);
119
119
  yield initTemplateConfig(routerConfig, templateType, env);
120
- yield initCliIndexFile(templateType, env);
120
+ yield initCliEntryFile(projectPath, templateType, env);
121
121
  const envPath = env === 'dev' ? '.dev/' : '.prod/';
122
122
  const entryPath = path_1.default.resolve(projectPath, `./.swico/${envPath}index.js`);
123
123
  const templatePath = path_1.default.join(projectPath, '/src/index.ejs');
@@ -131,28 +131,22 @@ const getProjectConfig = (env) => __awaiter(void 0, void 0, void 0, function* ()
131
131
  };
132
132
  });
133
133
  exports.getProjectConfig = getProjectConfig;
134
- const initCliIndexFile = (templateType, env) => __awaiter(void 0, void 0, void 0, function* () {
135
- const projectPath = process.cwd();
136
- const targetPath = path_1.default.resolve(__dirname, '../index.js');
137
- const targetTypesPath = path_1.default.resolve(__dirname, '../index.d.ts');
138
- let replaceFileText = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, `../index.${templateType}.js`), 'utf8');
139
- const fileTypesText = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, `../index.${templateType}.d.ts`), 'utf8');
140
- if (templateType === 'react') {
141
- const formatHooksPath = path_1.default
142
- .resolve(projectPath, './.swico/react-hooks')
143
- .replaceAll('\\', '/');
144
- replaceFileText = replaceFileText.replaceAll('require("./project-path/.swico-react/react-hooks");', `require("${formatHooksPath}");`);
145
- const formatLinkComponentPath = path_1.default
146
- .resolve(projectPath, './.swico/Link')
147
- .replaceAll('\\', '/');
148
- replaceFileText = replaceFileText.replaceAll('require("./project-path/.swico-react/Link");', `require("${formatLinkComponentPath}");`);
149
- }
134
+ const initCliEntryFile = (projectPath, templateType, env) => __awaiter(void 0, void 0, void 0, function* () {
135
+ const entryFilePath = path_1.default.resolve(projectPath, './.swico/index.js');
136
+ let replaceEntryText = yield fs_extra_1.default.readFile(entryFilePath, 'utf8');
137
+ const formatHooksPath = path_1.default
138
+ .resolve(projectPath, './.swico/hooks')
139
+ .replaceAll('\\', '/');
140
+ replaceEntryText = replaceEntryText.replaceAll(`require("./project-path/.swico-${templateType}/hooks");`, `require("${formatHooksPath}");`);
141
+ const formatLinkComponentPath = path_1.default
142
+ .resolve(projectPath, './.swico/Link')
143
+ .replaceAll('\\', '/');
144
+ replaceEntryText = replaceEntryText.replaceAll(`require("./project-path/.swico-${templateType}/Link");`, `require("${formatLinkComponentPath}");`);
150
145
  const formatHistoryPath = path_1.default
151
146
  .resolve(projectPath, `./.swico/.${env}/history`)
152
147
  .replaceAll('\\', '/');
153
- replaceFileText = replaceFileText.replaceAll('require("./mock-history");', `require("${formatHistoryPath}");`);
154
- yield fs_extra_1.default.writeFile(targetPath, replaceFileText);
155
- yield fs_extra_1.default.writeFile(targetTypesPath, fileTypesText);
148
+ replaceEntryText = replaceEntryText.replaceAll('require("./mock-history");', `require("${formatHistoryPath}");`);
149
+ yield fs_extra_1.default.writeFile(entryFilePath, replaceEntryText);
156
150
  });
157
151
  const formatRouterConfig = ({ routes = [], type = 'browser', base = '/' }, templateType, env) => {
158
152
  const projectPath = process.cwd();
@@ -240,26 +234,18 @@ const initTemplateConfig = (routerConfig, templateType, env) => {
240
234
  const envPath = env === 'dev' ? '/.dev/' : '/.prod/';
241
235
  return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
242
236
  const copyTargetPath = path_1.default.resolve(projectPath, `./.swico${envPath}`);
243
- yield (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, `../project-path/.swico-${templateType}/$env`), copyTargetPath, (fileName) => !fileName.endsWith('.d.ts') &&
244
- (templateType === 'vue'
245
- ? !['Container.js', 'vue-hooks.js'].includes(fileName)
246
- : !['react-hooks.js'].includes(fileName)));
247
- yield (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, `../project-path/.swico-${templateType}`), path_1.default.resolve(projectPath, './.swico'), (fileName) => [
248
- 'react-hooks.js',
249
- 'vue-hooks.js',
250
- 'Link.js',
251
- 'loading.js',
252
- 'Container.vue'
253
- ].includes(fileName));
237
+ yield (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, `../project-path/.swico-${templateType}/$env`), copyTargetPath, (fileName) => !fileName.endsWith('.d.ts') && !['hooks.js'].includes(fileName));
238
+ yield (0, tools_1.copyDirFiles)(path_1.default.resolve(__dirname, `../project-path/.swico-${templateType}.js`), path_1.default.resolve(projectPath, './.swico'), (fileName) => ['hooks.js', 'Link.js', 'loading.js'].includes(fileName));
239
+ const entryFilePath = path_1.default.resolve(projectPath, './.swico/index.js');
240
+ yield fs_extra_1.default.copyFile(path_1.default.resolve(__dirname, `../index.${templateType}`), entryFilePath);
254
241
  yield formatRouterConfig(routerConfig, templateType, env);
255
- let replaceIndexText = yield fs_extra_1.default.readFile(path_1.default.resolve(projectPath, `./.swico${envPath}index.js`), 'utf8');
256
- const hooksFilePath = path_1.default.resolve(projectPath, `./.swico/${templateType}-hooks.js`);
242
+ const hooksFilePath = path_1.default.resolve(projectPath, './.swico/hooks.js');
257
243
  let replaceHooksText = yield fs_extra_1.default.readFile(hooksFilePath, 'utf8');
258
244
  replaceHooksText = replaceHooksText.replaceAll('$env', `.${env}`);
259
245
  yield fs_extra_1.default.writeFile(hooksFilePath, replaceHooksText);
246
+ let replaceIndexText = yield fs_extra_1.default.readFile(path_1.default.resolve(projectPath, `./.swico${envPath}index.js`), 'utf8');
260
247
  replaceIndexText = (0, exports.handleGlobalStyleFile)(replaceIndexText);
261
248
  if (templateType === 'vue') {
262
- replaceIndexText = replaceIndexText.replace('"../Container"', '"../Container.vue"');
263
249
  yield (0, exports.updateIndexFileText)(envPath, replaceIndexText);
264
250
  }
265
251
  else if (templateType === 'react') {
@@ -19,5 +19,4 @@ export declare const toast: {
19
19
  error: (message: string | string[], options?: ToastOptions) => void;
20
20
  warning: (message: string | string[], options?: ToastOptions) => void;
21
21
  };
22
- export declare const initIndexFile: () => Promise<void>;
23
22
  export {};
@@ -1,37 +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 () {
19
- var ownKeys = function(o) {
20
- ownKeys = Object.getOwnPropertyNames || function (o) {
21
- var ar = [];
22
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
- return ar;
24
- };
25
- return ownKeys(o);
26
- };
27
- return function (mod) {
28
- if (mod && mod.__esModule) return mod;
29
- var result = {};
30
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
- __setModuleDefault(result, mod);
32
- return result;
33
- };
34
- })();
35
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
36
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
37
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -52,12 +19,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
52
19
  return (mod && mod.__esModule) ? mod : { "default": mod };
53
20
  };
54
21
  Object.defineProperty(exports, "__esModule", { value: true });
55
- exports.initIndexFile = exports.toast = exports.colorConfig = exports.getPort = exports.getFormatRouter = exports.copyDirFiles = void 0;
22
+ exports.toast = exports.colorConfig = exports.getPort = exports.getFormatRouter = exports.copyDirFiles = void 0;
56
23
  const portfinder_1 = __importDefault(require("portfinder"));
57
24
  const fs_extra_1 = __importDefault(require("fs-extra"));
58
25
  const path_1 = __importDefault(require("path"));
59
26
  const chalk_1 = __importDefault(require("chalk"));
60
- const process = __importStar(require("process"));
61
27
  const copyDirFiles = (src, dest, filter) => __awaiter(void 0, void 0, void 0, function* () {
62
28
  const _copy = (src, dest) => __awaiter(void 0, void 0, void 0, function* () {
63
29
  var _a, e_1, _b, _c;
@@ -182,28 +148,3 @@ exports.toast = {
182
148
  }
183
149
  }
184
150
  };
185
- const initIndexFile = () => __awaiter(void 0, void 0, void 0, function* () {
186
- let fileText = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, '../index.js'), 'utf8');
187
- const targetPath = path_1.default.resolve(__dirname, '../index.js');
188
- const projectPath = process.cwd();
189
- const formatHooksPath = path_1.default
190
- .resolve(projectPath, './.swico/react-hooks')
191
- .replaceAll('\\', '/');
192
- if (fileText.includes(`require("${formatHooksPath}");`)) {
193
- fileText = fileText.replaceAll(`require("${formatHooksPath}");`, 'require("./project-path/.swico-react/react-hooks");');
194
- }
195
- const formatDevHistoryPath = path_1.default
196
- .resolve(projectPath, './.swico/.dev/history')
197
- .replaceAll('\\', '/');
198
- const formatProdHistoryPath = path_1.default
199
- .resolve(projectPath, './.swico/.prod/history')
200
- .replaceAll('\\', '/');
201
- if (fileText.includes(`require("${formatDevHistoryPath}");`)) {
202
- fileText = fileText.replaceAll(`require("${formatDevHistoryPath}");`, 'require("./mock-history");');
203
- }
204
- else if (fileText.includes(`require("${formatProdHistoryPath}");`)) {
205
- fileText = fileText.replaceAll(`require("${formatProdHistoryPath}");`, 'require("./mock-history");');
206
- }
207
- yield fs_extra_1.default.writeFile(targetPath, fileText);
208
- });
209
- exports.initIndexFile = initIndexFile;
@@ -1,15 +0,0 @@
1
- <script setup lang="ts">
2
- import { onErrorCaptured, ref } from 'vue';
3
- const error = ref<string | null>(null);
4
- onErrorCaptured((err, instance, info) => {
5
- console.error(err);
6
- error.value = err.toString();
7
- return false;
8
- });
9
- </script>
10
-
11
- <template>
12
- <Layout v-if="!error"><RouterView /></Layout>
13
- </template>
14
-
15
- <style scoped></style>