cabloy 5.1.19 → 5.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.19",
+  "version": "5.1.21",
   "description": "A Node.js fullstack framework",
   "keywords": [
     "cabloy",
@@ -19,26 +19,6 @@
     "url": "git+https://github.com/cabloy/cabloy.git"
   },
   "type": "module",
-  "devDependencies": {
-    "@cabloy/lint": "^5.1.21",
-    "@cabloy/process-helper": "^3.1.3",
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.19.17",
-    "husky": "^9.1.7",
-    "lint-staged": "^17.0.5",
-    "minimist": "^1.2.8",
-    "oxfmt": "^0.45.0",
-    "oxlint": "^1.65.0",
-    "textlint": "^15.7.0",
-    "textlint-rule-en-no-mixed-period": "^3.0.2",
-    "textlint-rule-ja-no-mixed-period": "^3.0.2",
-    "textlint-rule-ja-space-between-half-and-full-width": "^2.4.2",
-    "textlint-rule-period-in-list-item": "^1.0.1",
-    "typescript": "^5.9.3"
-  },
-  "engines": {
-    "node": ">=24.4.0"
-  },
   "scripts": {
     "init": "pnpm install --no-frozen-lockfile && node scripts/init.ts",
     "upgrade": "node scripts/upgrade.ts",
@@ -46,6 +26,8 @@
     "vona": "node ./vona/packages-cli/cli/src/bin/vona.ts --projectPath=vona",
     "zova": "node ./zova/packages-cli/cli/src/bin/zova.ts --projectPath=zova",
     "dev": "cd vona && npm run dev",
+    "dev:zova:admin": "cd zova && npm run dev:ssr:cabloyBasicAdmin",
+    "dev:zova:web": "cd zova && npm run dev:ssr:cabloyBasicWeb",
     "build": "pnpm --dir zova run build:ssr:cabloyBasicBatch && pnpm --dir vona run build",
     "build:docker": "pnpm --dir zova run build:ssr:cabloyBasicBatch && pnpm --dir vona run build:docker",
     "start": "cd vona && npm run start",
@@ -63,6 +45,28 @@
     "release:dry-run": "node scripts/release.ts --dry-run",
     "release:changelog": "node scripts/release.ts --changelog-only",
     "release:publish": "node scripts/release.ts --publish-only",
-    "release:github": "node scripts/release.ts --release-only"
-  }
-}
+    "release:github": "node scripts/release.ts --release-only",
+    "prepare": "husky"
+  },
+  "devDependencies": {
+    "@cabloy/lint": "^5.1.21",
+    "@cabloy/process-helper": "^3.1.3",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.19.17",
+    "husky": "^9.1.7",
+    "lint-staged": "^17.0.5",
+    "minimist": "^1.2.8",
+    "oxfmt": "^0.45.0",
+    "oxlint": "^1.65.0",
+    "textlint": "^15.7.0",
+    "textlint-rule-en-no-mixed-period": "^3.0.2",
+    "textlint-rule-ja-no-mixed-period": "^3.0.2",
+    "textlint-rule-ja-space-between-half-and-full-width": "^2.4.2",
+    "textlint-rule-period-in-list-item": "^1.0.1",
+    "typescript": "^5.9.3"
+  },
+  "engines": {
+    "node": ">=24.4.0"
+  },
+  "packageManager": "pnpm@10.19.0"
+}

package/scripts/upgrade.ts

@@ -37,9 +37,13 @@ const WHITELIST_DIRS: string[] = [
   'zova/scripts',
 ];
 
+const BLACKLIST_DIRS: string[] = [
+  // vona
+  'vona/src/suite-vendor/a-test',
+];
+
 const WHITELIST_FILES: string[] = [
   // root
-  'package.json',
   'tsconfig.json',
   'tsconfig.base.json',
   'tsconfig.base.esm.json',
@@ -56,9 +60,6 @@ const WHITELIST_FILES: string[] = [
   'vona/tsconfig.base.esm.json',
   'vona/oxfmt.config.ts',
   'vona/oxlint.config.ts',
-  'vona/nginx.conf',
-  'vona/docker-compose.original.yml',
-  'vona/docker-compose-dockerfile-app',
   'vona/codecov.yml',
   // zova
   'zova/package.original.json',
@@ -168,6 +169,14 @@ function selectiveOverwrite(dryRun?: boolean): void {
     cpSync(src, dest, { recursive: true, filter: src => !src.includes('.DS_Store') });
   }
 
+  // Delete directories
+  for (const dir of BLACKLIST_DIRS) {
+    const dest = resolve(ROOT_DIR, dir);
+    if (existsSync(dest)) {
+      rmSync(dest, { recursive: true, force: true });
+    }
+  }
+
   // Overwrite files
   for (const file of WHITELIST_FILES) {
     const src = resolve(TEMP_DIR, file);

package/vona/pnpm-lock.yaml

@@ -319,22 +319,22 @@ importers:
         version: link:src/suite/a-home/modules/home-user
       vona-module-test-auth:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-auth/modules/test-auth
+        version: link:src/suite-vendor/a-test/modules/test-auth
       vona-module-test-cabloy:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-cabloy/modules/test-cabloy
+        version: link:src/suite-vendor/a-test/modules/test-cabloy
       vona-module-test-captcha:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-captcha/modules/test-captcha
+        version: link:src/suite-vendor/a-test/modules/test-captcha
       vona-module-test-rest:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-cabloy/modules/test-rest
+        version: link:src/suite-vendor/a-test/modules/test-rest
       vona-module-test-ssr:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-cabloy/modules/test-ssr
+        version: link:src/suite-vendor/a-test/modules/test-ssr
       vona-module-test-vona:
         specifier: workspace:^
-        version: link:src/suite-vendor/a-vona/modules/test-vona
+        version: link:src/suite-vendor/a-test/modules/test-vona
       vona-shared:
         specifier: workspace:^
         version: link:packages-vona/vona-shared
@@ -1196,15 +1196,6 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-auth/modules/test-auth:
-    devDependencies:
-      clean-package:
-        specifier: ^2.2.0
-        version: 2.2.0
-      rimraf:
-        specifier: ^6.1.3
-        version: 6.1.3
-
   src/suite-vendor/a-cabloy:
     dependencies:
       vona-module-a-cabloy:
@@ -1303,7 +1294,16 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-cabloy/modules/test-cabloy:
+  src/suite-vendor/a-captcha:
+    dependencies:
+      vona-module-a-captcha:
+        specifier: workspace:^
+        version: link:modules/a-captcha
+      vona-module-captcha-simple:
+        specifier: workspace:^
+        version: link:modules/captcha-simple
+
+  src/suite-vendor/a-captcha/modules/a-captcha:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1312,11 +1312,17 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-cabloy/modules/test-rest:
+  src/suite-vendor/a-captcha/modules/captcha-simple:
     dependencies:
-      '@faker-js/faker':
-        specifier: ^10.4.0
-        version: 10.4.0
+      '@zhennann/svg-captcha':
+        specifier: ^1.5.2
+        version: 1.5.2
+      opentype.js:
+        specifier: ^2.0.0
+        version: 2.0.0
+      svg64:
+        specifier: ^2.0.0
+        version: 2.0.0
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1325,7 +1331,17 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-cabloy/modules/test-ssr:
+  src/suite-vendor/a-paypal:
+    dependencies:
+      vona-module-a-paypal:
+        specifier: workspace:^
+        version: link:modules/a-paypal
+
+  src/suite-vendor/a-paypal/modules/a-paypal:
+    dependencies:
+      '@cabloy/paypal-server-sdk':
+        specifier: ^2.2.0
+        version: 2.2.0
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1334,16 +1350,9 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-captcha:
-    dependencies:
-      vona-module-a-captcha:
-        specifier: workspace:^
-        version: link:modules/a-captcha
-      vona-module-captcha-simple:
-        specifier: workspace:^
-        version: link:modules/captcha-simple
+  src/suite-vendor/a-test: {}
 
-  src/suite-vendor/a-captcha/modules/a-captcha:
+  src/suite-vendor/a-test/modules/test-auth:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1352,17 +1361,7 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-captcha/modules/captcha-simple:
-    dependencies:
-      '@zhennann/svg-captcha':
-        specifier: ^1.5.2
-        version: 1.5.2
-      opentype.js:
-        specifier: ^2.0.0
-        version: 2.0.0
-      svg64:
-        specifier: ^2.0.0
-        version: 2.0.0
+  src/suite-vendor/a-test/modules/test-cabloy:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1371,7 +1370,7 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-captcha/modules/test-captcha:
+  src/suite-vendor/a-test/modules/test-captcha:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1380,17 +1379,29 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-paypal:
+  src/suite-vendor/a-test/modules/test-rest:
     dependencies:
-      vona-module-a-paypal:
-        specifier: workspace:^
-        version: link:modules/a-paypal
+      '@faker-js/faker':
+        specifier: ^10.4.0
+        version: 10.4.0
+    devDependencies:
+      clean-package:
+        specifier: ^2.2.0
+        version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
 
-  src/suite-vendor/a-paypal/modules/a-paypal:
-    dependencies:
-      '@cabloy/paypal-server-sdk':
+  src/suite-vendor/a-test/modules/test-ssr:
+    devDependencies:
+      clean-package:
         specifier: ^2.2.0
         version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
+
+  src/suite-vendor/a-test/modules/test-vona:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -2323,15 +2334,6 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite-vendor/a-vona/modules/test-vona:
-    devDependencies:
-      clean-package:
-        specifier: ^2.2.0
-        version: 2.2.0
-      rimraf:
-        specifier: ^6.1.3
-        version: 6.1.3
-
   src/suite/a-home:
     dependencies:
       vona-module-home-base:

package/vona/src/suite-vendor/a-auth/tsconfig.json

@@ -8,9 +8,6 @@
     {
       "path": "modules/auth-simple/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-auth/tsconfig.build.json"
-    },
     {
       "path": "modules/auth-oauth/tsconfig.build.json"
     }

package/vona/src/suite-vendor/a-cabloy/tsconfig.json

@@ -20,15 +20,6 @@
     {
       "path": "modules/a-datasharding/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-cabloy/tsconfig.build.json"
-    },
-    {
-      "path": "modules/test-ssr/tsconfig.build.json"
-    },
-    {
-      "path": "modules/test-rest/tsconfig.build.json"
-    },
     {
       "path": "modules/a-ssrhmr/tsconfig.build.json"
     }

package/vona/src/suite-vendor/a-captcha/tsconfig.json

@@ -5,9 +5,6 @@
     {
       "path": "modules/a-captcha/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-captcha/tsconfig.build.json"
-    },
     {
       "path": "modules/captcha-simple/tsconfig.build.json"
     }

package/vona/src/suite-vendor/a-vona/tsconfig.json

@@ -128,9 +128,6 @@
     {
       "path": "modules/a-openapiutils/tsconfig.build.json"
     },
-    {
-      "path": "modules/test-vona/tsconfig.build.json"
-    },
     {
       "path": "modules/a-mail/tsconfig.build.json"
     },