cabloy 5.1.41 → 5.1.42
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/CHANGELOG.md +26 -0
- package/package.json +4 -1
- package/scripts/init.ts +12 -10
- package/scripts/upgrade.ts +12 -13
- package/vona/packages-vona/vona/package.json +1 -1
- package/vona/pnpm-lock.yaml +82 -338
- package/vona/src/suite/cabloy-basic/modules/basic-siteadmin/src/bean/ssrSite.admin.ts +2 -2
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/package.json +53 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/.metadata/index.ts +87 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/.metadata/locales.ts +18 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/.metadata/this.ts +2 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/bean/ssrMenu.home.ts +26 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/bean/ssrSite.web.ts +26 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/config/locale/en-us.ts +3 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/config/locale/zh-cn.ts +3 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/index.ts +2 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/tsconfig.build.json +11 -0
- package/vona/src/suite/cabloy-basic/modules/basic-siteweb/tsconfig.json +7 -0
- package/vona/src/suite/cabloy-basic/package.json +1 -0
- package/vona/src/suite/cabloy-basic/tsconfig.json +3 -0
- package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json +1 -1
- package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrMenu.ts +0 -13
- package/vona/src/suite-vendor/a-cabloy/package.json +1 -1
- package/vona/src/suite-vendor/a-vona/modules/a-menu/package.json +1 -1
- package/vona/src/suite-vendor/a-vona/modules/a-menu/src/types/menu.ts +12 -2
- package/vona/src/suite-vendor/a-vona/package.json +1 -1
- package/zova/env/.env +1 -1
- package/zova/env/.env.cabloyBasicWeb +1 -1
- package/zova/package.original.json +6 -1
- package/zova/pnpm-lock.yaml +42 -12
- package/zova/src/front/config/config/config.cabloyBasicAdmin.ts +14 -0
- package/zova/src/front/config/config/config.cabloyBasicWeb.ts +17 -0
- package/zova/src/front/config/config/config.ts +3 -3
- package/zova/src/suite/a-demo/modules/demo-basic/package.json +1 -14
- package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/index.ts +0 -50
- package/zova/src/suite/a-home/modules/home-base/src/.metadata/index.ts +17 -2
- package/zova/src/suite/a-home/modules/home-base/src/config/locale/en-us.ts +2 -0
- package/zova/src/suite/a-home/modules/home-base/src/config/locale/zh-cn.ts +2 -0
- package/zova/src/suite/a-home/modules/home-base/src/lib/utils.ts +13 -1
- package/zova/src/suite/a-home/modules/home-base/src/service/locale.ts +11 -0
- package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts +13 -0
- package/zova/src/suite/a-home/modules/{home-index → home-indexadmin}/package.json +1 -1
- package/zova/src/suite/a-home/modules/home-indexadmin/src/.metadata/index.ts +75 -0
- package/zova/src/suite/a-home/modules/home-indexadmin/src/.metadata/page/dashboard.ts +9 -0
- package/zova/src/suite/a-home/modules/home-indexadmin/src/.metadata/this.ts +2 -0
- package/zova/src/suite/a-home/modules/home-indexadmin/src/page/dashboard/controller.tsx +23 -0
- package/zova/src/suite/a-home/modules/home-indexadmin/src/routes.ts +8 -0
- package/zova/src/suite/a-home/modules/home-indexweb/package.json +52 -0
- package/zova/src/suite/a-home/modules/{home-index → home-indexweb}/src/.metadata/index.ts +9 -9
- package/zova/src/suite/a-home/modules/home-indexweb/src/.metadata/this.ts +2 -0
- package/zova/src/suite/a-home/modules/home-indexweb/src/index.ts +1 -0
- package/zova/src/suite/a-home/modules/{home-index → home-indexweb}/src/page/home/controller.tsx +2 -0
- package/zova/src/suite/a-home/modules/home-indexweb/src/routes.ts +15 -0
- package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/package.json +2 -2
- package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/component/layoutAdmin.ts +44 -0
- package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/index.ts +249 -0
- package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/locales.ts +22 -0
- package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/this.ts +2 -0
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/controller.tsx +6 -3
- package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.content.tsx +14 -0
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.header.tsx +2 -2
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.locale.tsx +10 -19
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.sidebar.tsx +2 -2
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.tabs.tsx +33 -29
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.theme.tsx +19 -12
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.tsx +1 -1
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.user.tsx +3 -1
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/style.ts +1 -1
- package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/src/config/locale/en-us.ts +1 -0
- package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/src/config/locale/zh-cn.ts +1 -0
- package/zova/src/suite/a-home/modules/home-layoutadmin/tsconfig.build.json +13 -0
- package/zova/src/suite/a-home/modules/home-layoutadmin/tsconfig.json +5 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/package.json +52 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/.metadata/component/layoutWeb.ts +39 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/.metadata/index.ts +200 -0
- package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutweb}/src/.metadata/locales.ts +1 -1
- package/zova/src/suite/a-home/modules/home-layoutweb/src/.metadata/this.ts +2 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/controller.tsx +112 -0
- package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutweb/src/component/layoutWeb}/render.content.tsx +2 -2
- package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.header.tsx +39 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.locale.tsx +50 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.tabs.tsx +95 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.theme.tsx +98 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.tsx +39 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/config/config.ts +20 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/config/locale/en-us.ts +10 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/config/locale/zh-cn.ts +10 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/index.ts +2 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/model/layout.ts +27 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/src/model/menu.ts +115 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/tsconfig.build.json +13 -0
- package/zova/src/suite/a-home/modules/home-layoutweb/tsconfig.json +5 -0
- package/zova/src/suite/a-home/modules/home-passport/src/model/passport.ts +1 -1
- package/zova/src/suite/a-home/package.json +4 -2
- package/zova/src/suite/a-demo/modules/demo-basic/src/bean/aop.home.tsx +0 -23
- package/zova/src/suite/a-demo/modules/demo-basic/src/bean/aop.home3.tsx +0 -14
- package/zova/src/suite/a-home/modules/home-index/src/.metadata/this.ts +0 -2
- package/zova/src/suite/a-home/modules/home-index/src/routes.ts +0 -8
- package/zova/src/suite/a-home/modules/home-layouttabs/src/.metadata/component/layoutTabs.ts +0 -44
- package/zova/src/suite/a-home/modules/home-layouttabs/src/.metadata/index.ts +0 -249
- package/zova/src/suite/a-home/modules/home-layouttabs/src/.metadata/this.ts +0 -2
- /package/zova/src/suite/a-home/modules/{home-index → home-indexadmin}/src/index.ts +0 -0
- /package/zova/src/suite/a-home/modules/{home-index → home-indexadmin}/tsconfig.build.json +0 -0
- /package/zova/src/suite/a-home/modules/{home-index → home-indexadmin}/tsconfig.json +0 -0
- /package/zova/src/suite/a-home/modules/{home-index → home-indexweb}/src/.metadata/page/home.ts +0 -0
- /package/zova/src/suite/a-home/modules/{home-layouttabs → home-indexweb}/tsconfig.build.json +0 -0
- /package/zova/src/suite/a-home/modules/{home-layouttabs → home-indexweb}/tsconfig.json +0 -0
- /package/zova/src/suite/a-home/modules/{home-layouttabs/src/component/layoutTabs → home-layoutadmin/src/component/layoutAdmin}/render.menu.tsx +0 -0
- /package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/src/config/config.ts +0 -0
- /package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/src/index.ts +0 -0
- /package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/src/model/layout.ts +0 -0
- /package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/src/model/menu.ts +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,31 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 5.1.42
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add the Cabloy basic site web module.
|
|
8
|
+
- Add home web modules.
|
|
9
|
+
- Add the home layout web structure.
|
|
10
|
+
- Add locale handling for home routes.
|
|
11
|
+
- Add basic site web locale menu support.
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
- Use the locale service for the layout web switcher.
|
|
16
|
+
- Localize language switcher labels.
|
|
17
|
+
|
|
18
|
+
### Improvements
|
|
19
|
+
|
|
20
|
+
- Improve init and upgrade scripts.
|
|
21
|
+
- Share the details dropdown close helper.
|
|
22
|
+
- Update basic site web SSR paths.
|
|
23
|
+
- Update the home layout web header button.
|
|
24
|
+
- Update home layout theming and web rendering.
|
|
25
|
+
- Update home layout web rendering.
|
|
26
|
+
- Rename the home index admin dashboard.
|
|
27
|
+
- Rename home layout tabs to layout admin.
|
|
28
|
+
|
|
3
29
|
## 5.1.41
|
|
4
30
|
|
|
5
31
|
### Improvements
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cabloy",
|
|
3
|
-
"version": "5.1.
|
|
3
|
+
"version": "5.1.42",
|
|
4
4
|
"gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
|
|
5
5
|
"description": "A Node.js fullstack framework",
|
|
6
6
|
"keywords": [
|
|
@@ -35,6 +35,8 @@
|
|
|
35
35
|
"start": "cd vona && npm run start",
|
|
36
36
|
"start:one": "cd vona && npm run start:one",
|
|
37
37
|
"test": "cd vona && npm run test",
|
|
38
|
+
"tsc": "npm run tsc:zova && pnpm --dir vona run tsc",
|
|
39
|
+
"tsc:zova": "pnpm --dir zova run tsc",
|
|
38
40
|
"format": "oxfmt --check",
|
|
39
41
|
"format:fix": "oxfmt --write",
|
|
40
42
|
"lint": "oxlint",
|
|
@@ -61,6 +63,7 @@
|
|
|
61
63
|
"minimist": "^1.2.8",
|
|
62
64
|
"oxfmt": "^0.45.0",
|
|
63
65
|
"oxlint": "^1.65.0",
|
|
66
|
+
"tar": "^7.5.11",
|
|
64
67
|
"textlint": "^15.7.0",
|
|
65
68
|
"textlint-rule-en-no-mixed-period": "^3.0.2",
|
|
66
69
|
"textlint-rule-ja-no-mixed-period": "^3.0.2",
|
package/scripts/init.ts
CHANGED
|
@@ -15,6 +15,8 @@ import { fileURLToPath } from 'node:url';
|
|
|
15
15
|
|
|
16
16
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
17
17
|
const ROOT_DIR = resolve(__dirname, '..');
|
|
18
|
+
const VONA_DIR = resolve(ROOT_DIR, 'vona');
|
|
19
|
+
const ZOVA_DIR = resolve(ROOT_DIR, 'zova');
|
|
18
20
|
|
|
19
21
|
// --- Helpers ---
|
|
20
22
|
|
|
@@ -32,8 +34,8 @@ function generatePassword(length: number, exclude: string): string {
|
|
|
32
34
|
return result;
|
|
33
35
|
}
|
|
34
36
|
|
|
35
|
-
function exec(cmd: string): void {
|
|
36
|
-
execSync(cmd, { stdio: 'inherit', cwd
|
|
37
|
+
function exec(cmd: string, cwd = ROOT_DIR): void {
|
|
38
|
+
execSync(cmd, { stdio: 'inherit', cwd });
|
|
37
39
|
}
|
|
38
40
|
|
|
39
41
|
function deleteGitkeepFiles(dir: string): void {
|
|
@@ -144,10 +146,10 @@ function generateEnvProdDockerLocal(): void {
|
|
|
144
146
|
function initVona(): void {
|
|
145
147
|
// eslint-disable-next-line
|
|
146
148
|
console.log('[init] Initializing vona...');
|
|
147
|
-
const pkgPath = resolve(
|
|
149
|
+
const pkgPath = resolve(VONA_DIR, 'package.json');
|
|
148
150
|
// if (!existsSync(pkgPath)) {
|
|
149
|
-
copyFileSync(resolve(
|
|
150
|
-
exec(
|
|
151
|
+
copyFileSync(resolve(VONA_DIR, 'package.original.json'), pkgPath);
|
|
152
|
+
exec('pnpm install --no-frozen-lockfile', VONA_DIR);
|
|
151
153
|
// }
|
|
152
154
|
exec('npm run vona :tools:deps');
|
|
153
155
|
}
|
|
@@ -157,10 +159,10 @@ function initVona(): void {
|
|
|
157
159
|
function initZova(): void {
|
|
158
160
|
// eslint-disable-next-line
|
|
159
161
|
console.log('[init] Initializing zova...');
|
|
160
|
-
const pkgPath = resolve(
|
|
162
|
+
const pkgPath = resolve(ZOVA_DIR, 'package.json');
|
|
161
163
|
// if (!existsSync(pkgPath)) {
|
|
162
|
-
copyFileSync(resolve(
|
|
163
|
-
exec(
|
|
164
|
+
copyFileSync(resolve(ZOVA_DIR, 'package.original.json'), pkgPath);
|
|
165
|
+
exec('pnpm install --no-frozen-lockfile', ZOVA_DIR);
|
|
164
166
|
// }
|
|
165
167
|
exec('npm run zova :tools:deps');
|
|
166
168
|
}
|
|
@@ -171,11 +173,11 @@ function buildSsrCabloyBasicStartBatch(): void {
|
|
|
171
173
|
if (existsSync(resolve(ROOT_DIR, '__CABLOY_BASIC__'))) {
|
|
172
174
|
// eslint-disable-next-line
|
|
173
175
|
console.log('[init] Building zova SSR cabloyBasicBatch...');
|
|
174
|
-
exec(
|
|
176
|
+
exec('pnpm run build:ssr:cabloyBasicBatch', ZOVA_DIR);
|
|
175
177
|
} else if (existsSync(resolve(ROOT_DIR, '__CABLOY_START__'))) {
|
|
176
178
|
// eslint-disable-next-line
|
|
177
179
|
console.log('[init] Building zova SSR cabloyStartBatch...');
|
|
178
|
-
exec(
|
|
180
|
+
exec('pnpm run build:ssr:cabloyStartBatch', ZOVA_DIR);
|
|
179
181
|
}
|
|
180
182
|
}
|
|
181
183
|
|
package/scripts/upgrade.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { execSync } from 'node:child_process';
|
|
2
|
-
import { createWriteStream } from 'node:fs';
|
|
3
|
-
import { cpSync, existsSync, mkdirSync, rmSync, unlinkSync } from 'node:fs';
|
|
2
|
+
import { cpSync, createWriteStream, existsSync, mkdirSync, rmSync, unlinkSync } from 'node:fs';
|
|
4
3
|
import { tmpdir } from 'node:os';
|
|
5
4
|
import { dirname, join, resolve } from 'node:path';
|
|
6
5
|
import { pipeline } from 'node:stream/promises';
|
|
7
6
|
import { fileURLToPath } from 'node:url';
|
|
7
|
+
import { x as extractTar } from 'tar';
|
|
8
8
|
|
|
9
9
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
10
10
|
const ROOT_DIR = resolve(__dirname, '..');
|
|
@@ -79,6 +79,16 @@ function exec(cmd: string): void {
|
|
|
79
79
|
execSync(cmd, { stdio: 'inherit', cwd: ROOT_DIR });
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
+
async function extractTarball(tarballPath: string, targetDir: string): Promise<void> {
|
|
83
|
+
rmSync(targetDir, { recursive: true, force: true });
|
|
84
|
+
mkdirSync(targetDir, { recursive: true });
|
|
85
|
+
try {
|
|
86
|
+
await extractTar({ file: tarballPath, cwd: targetDir, strip: 1 });
|
|
87
|
+
} catch {
|
|
88
|
+
throw new Error('Failed to extract tarball');
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
82
92
|
// --- Step 1: Pre-flight ---
|
|
83
93
|
|
|
84
94
|
function preflight(): void {
|
|
@@ -119,17 +129,6 @@ async function downloadTarball(tarballUrl: string): Promise<string> {
|
|
|
119
129
|
return tmpFile;
|
|
120
130
|
}
|
|
121
131
|
|
|
122
|
-
async function extractTarball(tarballPath: string, targetDir: string): Promise<void> {
|
|
123
|
-
mkdirSync(targetDir, { recursive: true });
|
|
124
|
-
try {
|
|
125
|
-
execSync(`tar --strip-components=1 -xzf "${tarballPath}" -C "${targetDir}"`, {
|
|
126
|
-
stdio: 'pipe',
|
|
127
|
-
});
|
|
128
|
-
} catch {
|
|
129
|
-
throw new Error('Failed to extract tarball');
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
|
|
133
132
|
async function downloadAndExtract(): Promise<void> {
|
|
134
133
|
const tarballUrl = await fetchLatestTarballUrl();
|
|
135
134
|
const tarballPath = await downloadTarball(tarballUrl);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vona",
|
|
3
|
-
"version": "5.1.
|
|
3
|
+
"version": "5.1.39",
|
|
4
4
|
"gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
|
|
5
5
|
"description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
|
|
6
6
|
"keywords": [
|