cabloy 5.1.11 → 5.1.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 5.1.13
+
+### Features
+
+- Add upgrade script and remove testSecond flavor env files
+
+### Improvements
+
+- Switch tsconfig base from front to api and update dependencies
+
+## 5.1.12
+
 ## 5.1.11
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.11",
+  "version": "5.1.13",
   "description": "A Node.js fullstack framework",
   "keywords": [
     "cabloy",
@@ -21,6 +21,8 @@
   "type": "module",
   "scripts": {
     "init": "pnpm install --no-frozen-lockfile && node scripts/init.ts",
+    "upgrade": "node scripts/upgrade.ts",
+    "upgrade:dry-run": "node scripts/upgrade.ts --dry-run",
     "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",

package/scripts/upgrade.ts

@@ -0,0 +1,260 @@
+import { execSync } from 'node:child_process';
+import { createWriteStream } from 'node:fs';
+import { cpSync, existsSync, mkdirSync, rmSync, unlinkSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { pipeline } from 'node:stream/promises';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const ROOT_DIR = resolve(__dirname, '..');
+const NPM_REGISTRY = 'https://registry.npmjs.org';
+const PACKAGE_NAME = 'cabloy';
+const TEMP_DIR = resolve(ROOT_DIR, 'node_modules/.cabloy-upgrade');
+
+// --- Whitelist ---
+
+const WHITELIST_DIRS: string[] = [
+  // root
+  'scripts',
+  '.husky',
+  // vona
+  'vona/packages-vona',
+  'vona/packages-cli',
+  'vona/packages-utils',
+  'vona/src/suite-vendor',
+  'vona/src/module-vendor',
+  'vona/scripts',
+  'vona/docker-compose-original',
+  // zova
+  'zova/packages-zova',
+  'zova/packages-cli',
+  'zova/packages-utils',
+  'zova/src/suite-vendor',
+  'zova/src/module-vendor',
+  'zova/src/boot',
+  'zova/src-ssr',
+  'zova/scripts',
+];
+
+const WHITELIST_FILES: string[] = [
+  // root
+  'package.json',
+  'tsconfig.json',
+  'tsconfig.base.json',
+  'tsconfig.base.esm.json',
+  'oxfmt.config.ts',
+  'oxlint.config.ts',
+  'lint-staged.config.mjs',
+  'LICENSE',
+  // vona
+  'vona/package.original.json',
+  'vona/pnpm-workspace.yaml',
+  'vona/lerna.json',
+  'vona/tsconfig.json',
+  'vona/tsconfig.base.json',
+  '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',
+  'zova/pnpm-workspace.yaml',
+  'zova/lerna.json',
+  'zova/tsconfig.json',
+  'zova/tsconfig.base.json',
+  'zova/tsconfig.base.esm.json',
+  'zova/tsconfig.rest.json',
+  'zova/tsconfig.vue-tsc.json',
+  'zova/oxfmt.config.ts',
+  'zova/oxlint.config.ts',
+  'zova/quasar.config.ts',
+  'zova/quasar.extensions.json',
+  'zova/postcss.config.js',
+  'zova/index.html',
+  'zova/openapi.config.ts',
+];
+
+// --- Helpers ---
+
+// oxlint-disable no-console
+const log = console.log; // eslint-disable-line no-console
+
+function exec(cmd: string): void {
+  execSync(cmd, { stdio: 'inherit', cwd: ROOT_DIR });
+}
+
+// --- Step 1: Pre-flight ---
+
+function preflight(): void {
+  const markers = ['__CABLOY_BASIC__', '__CABLOY_START__'];
+  const found = markers.find(m => existsSync(resolve(ROOT_DIR, m)));
+  if (!found) {
+    console.error(
+      'Error: Not a cabloy project (no __CABLOY_BASIC__ or __CABLOY_START__ marker found)',
+    );
+    process.exit(1);
+  }
+}
+
+// --- Step 2: Download & extract ---
+
+async function fetchLatestTarballUrl(): Promise<string> {
+  const url = `${NPM_REGISTRY}/${PACKAGE_NAME}/latest`;
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(`Failed to fetch package info: ${res.status} ${res.statusText}`);
+  }
+  const data = (await res.json()) as { dist: { tarball: string } };
+  return data.dist.tarball;
+}
+
+async function downloadTarball(tarballUrl: string): Promise<string> {
+  const tmpFile = join(tmpdir(), `cabloy-upgrade-${Date.now()}.tgz`);
+  const res = await fetch(tarballUrl);
+  if (!res.ok) {
+    throw new Error(`Failed to download tarball: ${res.status} ${res.statusText}`);
+  }
+  if (!res.body) {
+    throw new Error('Failed to download tarball: empty response body');
+  }
+  mkdirSync(dirname(tmpFile), { recursive: true });
+  const fileStream = createWriteStream(tmpFile);
+  // @ts-expect-error Node.js ReadableStream vs Web ReadableStream
+  await pipeline(res.body, fileStream);
+  return tmpFile;
+}
+
+async function extractTarball(tarballPath: string, targetDir: string): Promise<void> {
+  mkdirSync(targetDir, { recursive: true });
+  const exitCode = execSync(`tar --strip-components=1 -xzf "${tarballPath}" -C "${targetDir}"`, {
+    stdio: 'pipe',
+  });
+  if (exitCode !== 0) {
+    throw new Error('Failed to extract tarball');
+  }
+}
+
+async function downloadAndExtract(): Promise<void> {
+  const tarballUrl = await fetchLatestTarballUrl();
+  const tarballPath = await downloadTarball(tarballUrl);
+  try {
+    await extractTarball(tarballPath, TEMP_DIR);
+  } finally {
+    try {
+      unlinkSync(tarballPath);
+    } catch {}
+  }
+}
+
+// --- Step 3: Selective overwrite ---
+
+function selectiveOverwrite(dryRun?: boolean): void {
+  // Overwrite directories
+  for (const dir of WHITELIST_DIRS) {
+    const src = resolve(TEMP_DIR, dir);
+    const dest = resolve(ROOT_DIR, dir);
+    if (!existsSync(src)) continue;
+    if (dryRun) {
+      log(`  [dry-run] Overwrite directory: ${dir}`);
+      continue;
+    }
+    if (existsSync(dest)) {
+      rmSync(dest, { recursive: true, force: true });
+    }
+    cpSync(src, dest, { recursive: true, filter: src => !src.includes('.DS_Store') });
+  }
+
+  // Overwrite files
+  for (const file of WHITELIST_FILES) {
+    const src = resolve(TEMP_DIR, file);
+    const dest = resolve(ROOT_DIR, file);
+    if (!existsSync(src)) continue;
+    if (dryRun) {
+      log(`  [dry-run] Overwrite file: ${file}`);
+      continue;
+    }
+    cpSync(src, dest);
+  }
+}
+
+// --- Step 4: Delete generated package.json files ---
+
+function deleteGeneratedPackageJsons(dryRun?: boolean): void {
+  const files = ['vona/package.json', 'zova/package.json'];
+  for (const file of files) {
+    const filePath = resolve(ROOT_DIR, file);
+    if (!existsSync(filePath)) continue;
+    if (dryRun) {
+      log(`  [dry-run] Delete: ${file}`);
+      continue;
+    }
+    rmSync(filePath);
+  }
+}
+
+// --- Step 5: Run init ---
+
+function runInit(dryRun?: boolean): void {
+  if (dryRun) {
+    log('  [dry-run] Run: npm run init');
+    return;
+  }
+  exec('npm run init');
+}
+
+// --- Step 6: Cleanup ---
+
+function cleanup(dryRun?: boolean): void {
+  if (dryRun) {
+    log('  [dry-run] Remove temp dir: node_modules/.cabloy-upgrade/');
+    return;
+  }
+  if (existsSync(TEMP_DIR)) {
+    rmSync(TEMP_DIR, { recursive: true, force: true });
+  }
+}
+
+// --- Main ---
+
+async function main(): Promise<void> {
+  const dryRun = process.argv.includes('--dry-run');
+
+  log('Cabloy Upgrade\n');
+
+  // 1. Pre-flight
+  preflight();
+
+  // 2. Download & extract
+  log('Downloading latest cabloy from npm registry...');
+  await downloadAndExtract();
+  log('Downloaded and extracted successfully!\n');
+
+  // 3. Selective overwrite
+  log('Overwriting framework-owned files...');
+  selectiveOverwrite(dryRun);
+  log('');
+
+  // 4. Delete generated package.json
+  log('Removing generated package.json files...');
+  deleteGeneratedPackageJsons(dryRun);
+  log('');
+
+  // 5. Run init
+  log('Running npm run init...');
+  runInit(dryRun);
+  log('');
+
+  // 6. Cleanup
+  cleanup(dryRun);
+
+  log('Upgrade complete!');
+}
+
+main().catch(err => {
+  console.error(`\nUpgrade failed: ${err.message}`);
+  process.exit(1);
+});

package/zova/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.68",
+  "version": "1.2.69",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.0.0",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.66"
+    "zova-cli-set-front": "^1.2.67"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.66",
+  "version": "1.2.67",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.82",
+  "version": "5.1.83",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.42",
-    "zova-suite-a-zova": "^5.1.81"
+    "zova-suite-a-zova": "^5.1.82"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/pnpm-lock.yaml

@@ -29,7 +29,7 @@ importers:
         specifier: ^1.1.6
         version: 1.1.6
       '@cabloy/logger':
-        specifier: ^1.1.14
+        specifier: ^1.1.15
         version: link:packages-utils/logger
       '@cabloy/module-info':
         specifier: ^2.0.0
@@ -41,7 +41,7 @@ importers:
         specifier: ^4.4.16
         version: 4.4.16(vue@3.5.34(typescript@5.9.3))
       '@cabloy/word-utils':
-        specifier: ^2.1.13
+        specifier: ^2.1.14
         version: link:packages-utils/word-utils
       '@cabloy/zod-openapi':
         specifier: ^1.1.6
@@ -98,7 +98,7 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       mutate-on-copy:
-        specifier: ^1.1.12
+        specifier: ^1.1.13
         version: link:packages-utils/mutate-on-copy
       openapi3-ts:
         specifier: ^4.5.0
@@ -131,7 +131,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.47
+        specifier: ^1.1.48
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -360,7 +360,7 @@ importers:
         specifier: ^3.2.6
         version: 3.2.9(typescript@5.9.3)
       zova-openapi:
-        specifier: ^1.1.13
+        specifier: ^1.1.14
         version: link:packages-utils/zova-openapi
       zova-vite:
         specifier: workspace:^
@@ -381,7 +381,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.0
       zova-cli-set-front:
-        specifier: ^1.2.66
+        specifier: ^1.2.67
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -839,7 +839,7 @@ importers:
         specifier: ^5.1.42
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.81
+        specifier: ^5.1.82
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -1030,7 +1030,7 @@ importers:
         specifier: ^5.1.27
         version: link:modules/a-table
       zova-module-a-zod:
-        specifier: ^5.1.21
+        specifier: ^5.1.23
         version: link:modules/a-zod
       zova-module-a-zova:
         specifier: ^5.1.53

package/zova/src/suite-vendor/a-zova/modules/a-zod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zod",
-  "version": "5.1.21",
+  "version": "5.1.23",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.81",
+  "version": "5.1.82",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "zova",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "zova-module-a-ssrserver": "^5.1.15",
     "zova-module-a-style": "^5.1.25",
     "zova-module-a-table": "^5.1.27",
-    "zova-module-a-zod": "^5.1.21",
+    "zova-module-a-zod": "^5.1.23",
     "zova-module-a-zova": "^5.1.53"
   },
   "title": "a-zova"

package/zova/tsconfig.base.esm.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@cabloy/lint/front/tsconfig.base.esm",
+  "extends": "@cabloy/lint/api/tsconfig.base.esm",
   "compilerOptions": {
     "target": "ESNext",
     "jsx": "preserve",

package/zova/env/.env.ssr.testSecond

@@ -1,5 +0,0 @@
-APP_PUBLIC_PATH = second
-
-SSR_COOKIE = true
-SSR_BODYREADYOBSERVER = true
-SSR_WITH_VONA = true

package/zova/env/.env.ssr.testSecond.production

@@ -1,7 +0,0 @@
-BUILD_MINIFY = false
-BUILD_SOURCEMAP = false
-
-BUILD_COPY_RELEASE = ../vona/src/suite-vendor/a-cabloy/modules/test-ssr/assets/site
-BUILD_REST_COPY_DIST = ../vona/src/suite-vendor/a-cabloy/modules/test-ssr/zovaRest
-
-MOCK_ENABLED = false