@ykdz/template 0.0.36 → 0.0.37

package/node_modules/@ykdz/template-builtin-presets/templates/ts-cli/publication/readiness.ts

@@ -86,6 +86,24 @@ const publicationFiles = [
 
 const canonicalPublicationPrepack = "pnpm exec turbo run build --filter=.";
 
+// 私有根 engines.node 允许两种形态：旧仓库的纯大版本（"24"）与初始化投影发版快照
+// 的精确三段版本（"24.16.0"），两者都能派生大版本；范围表达式、两段版本与 v 前缀
+// 等未声明形态一律拒绝。
+const nodeMajorOrExactVersionPattern = /^(\d+)(?:\.(\d+\.\d+))?$/u;
+
+// 公开候选范围与根声明形态配对：精确根只接受同一精确值的 caret 范围，旧大版本根
+// 只接受原有 `>=major`；精确根不得回退到无上界范围。
+function expectedPublicNodeRange(
+  rootNodeDeclaration: string,
+): string | undefined {
+  const parsed = nodeMajorOrExactVersionPattern.exec(rootNodeDeclaration);
+  if (parsed === null) return undefined;
+  const [, major, exactRemainder] = parsed;
+  return exactRemainder === undefined
+    ? `>=${major}`
+    : `^${major}.${exactRemainder}`;
+}
+
 function isObject(value: unknown): value is JsonObject {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -548,12 +566,15 @@ function addManifestBlockers(options: {
     );
   }
 
-  const baseline =
+  const rootNodeDeclaration =
     isObject(rootManifest?.engines) &&
-    typeof rootManifest.engines.node === "string" &&
-    /^\d+$/u.test(rootManifest.engines.node)
+    typeof rootManifest.engines.node === "string"
       ? rootManifest.engines.node
       : undefined;
+  const expectedPublicNodeRangeFromRoot =
+    rootNodeDeclaration === undefined
+      ? undefined
+      : expectedPublicNodeRange(rootNodeDeclaration);
   const publishConfig = manifest.publishConfig;
   const scripts = manifest.scripts;
   const forbiddenFields = [
@@ -566,9 +587,9 @@ function addManifestBlockers(options: {
   const manifestContractValid =
     manifest.type === "module" &&
     exactStringSet(manifest.files, publicationFiles) &&
-    baseline !== undefined &&
+    expectedPublicNodeRangeFromRoot !== undefined &&
     isObject(manifest.engines) &&
-    manifest.engines.node === `>=${baseline}` &&
+    manifest.engines.node === expectedPublicNodeRangeFromRoot &&
     validRecordOfStrings(manifest.dependencies) &&
     typeof manifest.dependencies.commander === "string" &&
     manifest.dependencies.commander.trim().length > 0 &&

package/node_modules/@ykdz/template-builtin-presets/templates/ts-cli/publication/release.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           node-version-file: package.json
       - name: Set up pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
+        uses: pnpm/action-setup@d9184bf108216479bc5a137cc391f4d7b14c870b # v6.1.0
         with:
           cache: true
       - name: Install dependencies

package/node_modules/@ykdz/template-builtin-presets/templates/ts-cli/publication/root-tsconfig.json

@@ -2,12 +2,7 @@
   "compilerOptions": {
     "allowJs": true,
     "allowImportingTsExtensions": true,
-    "checkJs": true,
-    "noEmit": true
+    "checkJs": true
   },
-  "include": [
-    ".pnpmfile.mjs",
-    "scripts/npm-publication/*.ts",
-    "scripts/npm-publication-setup/bridge.ts"
-  ]
+  "files": [".pnpmfile.mjs"]
 }

package/node_modules/@ykdz/template-builtin-presets/templates/ts-cli/tsconfig.json

@@ -7,8 +7,8 @@
     "module": "nodenext",
     "moduleResolution": "nodenext",
     "rewriteRelativeImportExtensions": true,
-    "target": "es2023",
+    "target": "es2024",
     "types": ["node", "vitest/globals"]
   },
-  "include": ["src/**/*.ts", "test/**/*.ts"]
+  "include": ["src/**/*.ts", "test/**/*.ts", "scripts/**/*.ts"]
 }

package/node_modules/@ykdz/template-builtin-presets/templates/ts-lib/tsconfig.build.json

@@ -4,5 +4,6 @@
     "customConditions": [],
     "outDir": "dist",
     "rootDir": "src"
-  }
+  },
+  "include": ["src/**/*.ts"]
 }

package/node_modules/@ykdz/template-builtin-presets/templates/ts-lib/tsconfig.json

@@ -7,8 +7,8 @@
     "module": "nodenext",
     "moduleResolution": "nodenext",
     "rewriteRelativeImportExtensions": true,
-    "target": "es2023",
+    "target": "es2024",
     "types": ["node"]
   },
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts", "scripts/**/*.ts"]
 }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db/scripts/reset.ts

@@ -0,0 +1,3 @@
+import { resetDatabaseStorageTarget } from "#db/storage";
+
+resetDatabaseStorageTarget();

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db/src/db.ts

@@ -5,14 +5,13 @@ import { drizzle } from "drizzle-orm/node-sqlite";
 import { defineRelations } from "drizzle-orm/relations";
 
 import * as schema from "#db/schema";
+import { databaseStorageTarget } from "#db/storage";
 
 const relations = defineRelations(schema);
-const defaultDatabaseFile = "./data/app.sqlite";
-
 export type Database = ReturnType<typeof createDatabase>;
 
-export function createDatabase(databaseFile = process.env.DATABASE_FILE) {
-  const file = databaseFile ?? defaultDatabaseFile;
+export function createDatabase(databaseFile = databaseStorageTarget()) {
+  const file = databaseFile;
   mkdirSync(path.dirname(file), { recursive: true });
   return drizzle(file, { relations });
 }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db/src/readiness.ts

@@ -10,12 +10,13 @@ export function assertDatabaseReady(db: Database) {
       .limit(1)
       .all();
   } catch (cause) {
+    const profile = process.env.DATABASE_PROFILE;
+    const preparation =
+      profile === "dev" || profile === "test" || profile === "e2e"
+        ? `请在仓库根运行 \`pnpm run database:prepare:${profile}\``
+        : "请先使用配套 migration artifact 完成部署数据库迁移";
     throw new Error(
-      [
-        "Database is not ready.",
-        "For local development, run `pnpm --dir apps/web dev`.",
-        "For deployment, run `pnpm --dir packages/db-migrations run db:prepare:deploy` before starting the app.",
-      ].join(" "),
+      `DATABASE_NOT_READY: 数据库尚未就绪。${preparation} 后重试。`,
       { cause },
     );
   }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db/src/storage.ts

@@ -0,0 +1,93 @@
+import { rmSync } from "node:fs";
+import { isAbsolute } from "node:path";
+import { fileURLToPath } from "node:url";
+
+export type DatabaseProfile = "dev" | "test" | "e2e";
+
+function localProfile(): DatabaseProfile {
+  const profile = process.env.DATABASE_PROFILE;
+  if (process.env.DATABASE_FILE !== undefined) {
+    throw new Error("DATABASE_FILE 不能与本地 DATABASE_PROFILE 同时设置");
+  }
+  if (profile === "dev" || profile === "test" || profile === "e2e") {
+    return profile;
+  }
+  throw new Error("DATABASE_PROFILE 必须为 dev、test 或 e2e");
+}
+
+function localDatabaseStorageTarget(profile: DatabaseProfile): string {
+  switch (profile) {
+    case "dev":
+      return fileURLToPath(new URL("../data/dev.sqlite", import.meta.url));
+    case "test":
+      return fileURLToPath(new URL("../data/test.sqlite", import.meta.url));
+    case "e2e":
+      return fileURLToPath(new URL("../data/e2e.sqlite", import.meta.url));
+  }
+}
+
+export function databaseStorageTarget(): string {
+  if (process.env.DATABASE_PROFILE !== undefined) {
+    return localDatabaseStorageTarget(localProfile());
+  }
+  const externalTarget = process.env.DATABASE_FILE;
+  if (externalTarget !== undefined && isAbsolute(externalTarget)) {
+    return externalTarget;
+  }
+  throw new Error("部署必须提供绝对路径 DATABASE_FILE");
+}
+
+export function resetDatabaseStorageTarget(): void {
+  switch (localProfile()) {
+    case "dev":
+      rmSync(fileURLToPath(new URL("../data/dev.sqlite", import.meta.url)), {
+        force: true,
+      });
+      rmSync(
+        fileURLToPath(new URL("../data/dev.sqlite-journal", import.meta.url)),
+        { force: true },
+      );
+      rmSync(
+        fileURLToPath(new URL("../data/dev.sqlite-wal", import.meta.url)),
+        { force: true },
+      );
+      rmSync(
+        fileURLToPath(new URL("../data/dev.sqlite-shm", import.meta.url)),
+        { force: true },
+      );
+      return;
+    case "test":
+      rmSync(fileURLToPath(new URL("../data/test.sqlite", import.meta.url)), {
+        force: true,
+      });
+      rmSync(
+        fileURLToPath(new URL("../data/test.sqlite-journal", import.meta.url)),
+        { force: true },
+      );
+      rmSync(
+        fileURLToPath(new URL("../data/test.sqlite-wal", import.meta.url)),
+        { force: true },
+      );
+      rmSync(
+        fileURLToPath(new URL("../data/test.sqlite-shm", import.meta.url)),
+        { force: true },
+      );
+      return;
+    case "e2e":
+      rmSync(fileURLToPath(new URL("../data/e2e.sqlite", import.meta.url)), {
+        force: true,
+      });
+      rmSync(
+        fileURLToPath(new URL("../data/e2e.sqlite-journal", import.meta.url)),
+        { force: true },
+      );
+      rmSync(
+        fileURLToPath(new URL("../data/e2e.sqlite-wal", import.meta.url)),
+        { force: true },
+      );
+      rmSync(
+        fileURLToPath(new URL("../data/e2e.sqlite-shm", import.meta.url)),
+        { force: true },
+      );
+  }
+}

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db/tsconfig.build.json

@@ -1,6 +1,12 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "customConditions": []
-  }
+    "customConditions": ["source"],
+    "declaration": true,
+    "declarationMap": false,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "tsBuildInfoFile": "./dist/tsconfig.build.tsbuildinfo"
+  },
+  "include": ["src/**/*.ts"]
 }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db/tsconfig.json

@@ -8,15 +8,11 @@
     "erasableSyntaxOnly": true,
     "module": "esnext",
     "moduleResolution": "bundler",
+    "rewriteRelativeImportExtensions": true,
     "rootDir": ".",
     "skipLibCheck": true,
-    "target": "es2023",
+    "target": "es2024",
     "types": ["node"]
   },
-  "include": [
-    "src/**/*.ts",
-    "scripts/**/*.ts",
-    "test/**/*.ts",
-    "vitest.config.ts"
-  ]
+  "include": ["src/**/*.ts", "scripts/**/*.ts", "test/**/*.ts"]
 }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db/turbo.json

@@ -3,7 +3,7 @@
   "tags": ["library"],
   "tasks": {
     "build": {
-      "outputs": []
+      "outputs": ["dist/**"]
     }
   }
 }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db-migrations/drizzle.config.ts

@@ -2,13 +2,13 @@ import { mkdirSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
+// oxfmt-ignore
+import { databaseStorageTarget } from "{{DB_PACKAGE_NAME}}/storage";
 import { defineConfig } from "drizzle-kit";
 
-const databasePackageName = process.env.DATABASE_PACKAGE_NAME ?? "@database";
-const schemaFile = fileURLToPath(
-  import.meta.resolve(`${databasePackageName}/schema`),
-);
-const databaseFile = process.env.DATABASE_FILE ?? "./data/app.sqlite";
+// oxfmt-ignore
+const schemaFile = fileURLToPath(import.meta.resolve("{{DB_PACKAGE_NAME}}/schema"));
+const databaseFile = databaseStorageTarget();
 mkdirSync(path.dirname(databaseFile), { recursive: true });
 
 export default defineConfig({

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db-migrations/tsconfig.build.json

@@ -2,5 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "customConditions": []
-  }
+  },
+  "include": ["drizzle.config.ts"]
 }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/db-migrations/tsconfig.json

@@ -1,13 +1,13 @@
 {
   "extends": "{{TYPESCRIPT_CONFIG_PACKAGE}}/base.json",
   "compilerOptions": {
-    "customConditions": ["source"],
     "erasableSyntaxOnly": true,
     "module": "esnext",
     "moduleResolution": "bundler",
+    "rewriteRelativeImportExtensions": true,
     "rootDir": ".",
     "skipLibCheck": true,
-    "target": "es2023",
+    "target": "es2024",
     "types": ["node"]
   },
   "include": ["drizzle.config.ts", "scripts/**/*.ts"]

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/.env.example

@@ -1 +1,2 @@
-DATABASE_FILE=./data/app.sqlite
+# 仅部署运行时设置绝对路径；本地任务由 dev、test、e2e profile 管理隔离数据库。
+# DATABASE_FILE=/absolute/path/to/app.sqlite

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/Dockerfile

@@ -1,17 +1,23 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.27
 
 ARG DEPLOYMENT_BUILD_ID="local"
 
-FROM node:{{NODE_VERSION}}-bookworm-slim AS base
-ARG PACKAGE_MANAGER_PIN="{{PACKAGE_MANAGER_PIN}}"
+# @template-mirror NODE_VERSION
+ARG NODE_VERSION="{{NODE_VERSION}}"
+# @end-template-mirror
+
+FROM node:${NODE_VERSION}-bookworm-slim AS base
 ENV COREPACK_HOME="/corepack"
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME/bin:$PNPM_HOME:$PATH"
 WORKDIR /repo
+COPY package.json /root-manifest.json
 RUN install -d -m 0755 "$COREPACK_HOME" "$PNPM_HOME" "$PNPM_HOME/bin" \
   && corepack enable --install-directory "$PNPM_HOME" \
+  && package_manager="$(node -p "require('/root-manifest.json').packageManager")" \
+  && rm /root-manifest.json \
   && for attempt in 1 2 3; do \
-    if corepack prepare "$PACKAGE_MANAGER_PIN" --activate; then break; fi; \
+    if corepack prepare "$package_manager" --activate; then break; fi; \
     [ "$attempt" -lt 3 ] || exit 1; \
     sleep 2; \
   done \
@@ -21,12 +27,14 @@ FROM base AS pruner
 COPY pnpm-lock.yaml pnpm-workspace.yaml ./
 RUN pnpm fetch
 COPY package.json turbo.json ./
-COPY apps/web/package.json apps/web/package.json
-COPY packages/db/package.json packages/db/package.json
-COPY packages/db-migrations/package.json packages/db-migrations/package.json
-RUN pnpm install --offline --frozen-lockfile
+COPY {{APPLICATION_PACKAGE_PATH}}/package.json {{APPLICATION_PACKAGE_PATH}}/package.json
+COPY {{DATABASE_PACKAGE_PATH}}/package.json {{DATABASE_PACKAGE_PATH}}/package.json
+COPY {{MIGRATION_PACKAGE_PATH}}/package.json {{MIGRATION_PACKAGE_PATH}}/package.json
+COPY {{TYPESCRIPT_CONFIG_PACKAGE_PATH}}/package.json {{TYPESCRIPT_CONFIG_PACKAGE_PATH}}/package.json
+# 冻结安装会校验 lockfile 的每个 importer，加包会产生四份初始 manifest 之外的新 importer，故安装前需让完整上下文可见。
 COPY . .
-RUN pnpm exec turbo prune {{WEB_PACKAGE_NAME}} {{DB_MIGRATIONS_PACKAGE_NAME}} --docker
+RUN pnpm install --offline --frozen-lockfile
+RUN pnpm exec turbo prune {{APPLICATION_PACKAGE_NAME}} {{MIGRATION_PACKAGE_NAME}} --docker
 
 FROM base AS build
 COPY --from=pruner /repo/out/json/pnpm-lock.yaml ./pnpm-lock.yaml
@@ -35,19 +43,20 @@ RUN pnpm fetch
 COPY --from=pruner /repo/out/json/ ./
 RUN pnpm install --offline --frozen-lockfile
 COPY --from=pruner /repo/out/full/ ./
-RUN pnpm --filter ./packages/db run build
-RUN pnpm --filter ./apps/web run build
-RUN pnpm --config.inject-workspace-packages=true --filter ./apps/web deploy --prod /runtime-deploy
-RUN pnpm --config.inject-workspace-packages=true --filter ./packages/db-migrations deploy --prod /migration-deploy
+COPY --from=pruner /repo/scripts/container-entrypoint.sh ./scripts/container-entrypoint.sh
+RUN pnpm --filter {{DATABASE_PACKAGE_NAME}} run build
+RUN pnpm --filter {{APPLICATION_PACKAGE_NAME}} run build
+RUN pnpm --config.inject-workspace-packages=true --filter {{APPLICATION_PACKAGE_NAME}} deploy --prod /runtime-deploy
+RUN pnpm --config.inject-workspace-packages=true --filter {{MIGRATION_PACKAGE_NAME}} deploy --prod /migration-deploy
 
-FROM node:{{NODE_VERSION}}-bookworm-slim AS application-runtime
+FROM node:${NODE_VERSION}-bookworm-slim AS application-runtime
 ENV NODE_ENV="production"
 WORKDIR /app
 RUN groupadd --system --gid 1001 nodejs \
   && useradd --system --uid 1001 --gid nodejs --home-dir /app --shell /usr/sbin/nologin app \
   && install -d -o app -g nodejs /app /data
 COPY --from=build --chown=app:nodejs /runtime-deploy/node_modules ./node_modules
-COPY --from=build --chown=app:nodejs /repo/apps/web/dist ./dist
+COPY --from=build --chown=app:nodejs /repo/{{APPLICATION_PACKAGE_PATH}}/dist ./dist
 ENV DATABASE_FILE="/data/app.sqlite"
 USER app
 
@@ -57,9 +66,8 @@ FROM application-runtime AS standalone
 ARG DEPLOYMENT_BUILD_ID
 LABEL org.opencontainers.image.version="$DEPLOYMENT_BUILD_ID"
 ENV PATH="/migration/node_modules/.bin:$PATH"
-ENV DATABASE_PACKAGE_NAME="{{DB_PACKAGE_NAME}}"
 COPY --from=build --chown=app:nodejs /migration-deploy /migration
-COPY --chmod=755 --from=build /repo/apps/web/scripts/container-entrypoint.sh /usr/local/bin/container-entrypoint
+COPY --chmod=755 --from=build /repo/scripts/container-entrypoint.sh /usr/local/bin/container-entrypoint
 EXPOSE 3000
 ENTRYPOINT ["/usr/local/bin/container-entrypoint"]
 CMD ["prepare-and-start"]

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/Dockerfile.dockerignore

@@ -6,9 +6,9 @@ node_modules
 **/dist
 **/playwright-report
 **/test-results
-apps/web/data
-apps/web/node_modules/.tmp
-packages/db/data
-packages/db/node_modules/.tmp
+{{APPLICATION_PACKAGE_PATH}}/data
+{{APPLICATION_PACKAGE_PATH}}/node_modules/.tmp
+{{DATABASE_PACKAGE_PATH}}/data
+{{DATABASE_PACKAGE_PATH}}/node_modules/.tmp
 *.sqlite
 *.sqlite-*

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/playwright.config.ts

@@ -1,5 +1,3 @@
-import { execFileSync } from "node:child_process";
-import { rmSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { createServer } from "node:net";
 import path from "node:path";
@@ -10,8 +8,6 @@ import { defineConfig, devices } from "@playwright/test";
 const externalBaseUrlName = "PLAYWRIGHT_EXTERNAL_BASE_URL";
 const externalReadinessTimeoutMs = 30_000;
 const webRoot = path.dirname(fileURLToPath(import.meta.url));
-const migrationsRoot = path.resolve(webRoot, "../../packages/db-migrations");
-const databaseFile = path.join(webRoot, "node_modules/.tmp/e2e.sqlite");
 const stateFile = path.join(webRoot, "node_modules/.tmp/playwright-port");
 
 function externalBaseUrl(): string | undefined {
@@ -89,44 +85,28 @@ async function awaitExternalService(baseUrl: string): Promise<void> {
   );
 }
 
-async function sharedPort(envName: string): Promise<{
-  readonly port: string;
-  readonly prepared: boolean;
-}> {
+async function sharedPort(envName: string): Promise<string> {
   const envPort = process.env[envName];
   if (envPort !== undefined) {
-    return { port: envPort, prepared: false };
+    return envPort;
   }
   try {
-    return { port: await readFile(stateFile, "utf8"), prepared: false };
+    return await readFile(stateFile, "utf8");
   } catch {
     const port = await availablePort();
     await mkdir(path.dirname(stateFile), { recursive: true });
     await writeFile(stateFile, port, "utf8");
-    return { port, prepared: true };
+    return port;
   }
 }
 
-function prepareLocalDatabase(): void {
-  rmSync(databaseFile, { force: true });
-  execFileSync("pnpm", ["run", "db:push"], {
-    cwd: migrationsRoot,
-    env: { ...process.env, DATABASE_FILE: databaseFile },
-    stdio: "inherit",
-  });
-}
-
 const externalServiceUrl = externalBaseUrl();
 let previewUrl: string;
 
 if (externalServiceUrl === undefined) {
-  const { port, prepared } = await sharedPort("PLAYWRIGHT_WEB_PORT");
+  const port = await sharedPort("PLAYWRIGHT_WEB_PORT");
   previewUrl = `http://127.0.0.1:${port}`;
-  process.env.DATABASE_FILE = databaseFile;
   process.env.PORT = port;
-  if (prepared) {
-    prepareLocalDatabase();
-  }
 } else {
   previewUrl = externalServiceUrl;
   await awaitExternalService(externalServiceUrl);

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/scripts/check-standalone-deployment.ts

@@ -1,9 +1,7 @@
 import { spawn } from "node:child_process";
 import { readFile } from "node:fs/promises";
-import path from "node:path";
-
-const webRoot = path.resolve(import.meta.dirname, "..");
-const repositoryRoot = path.resolve(webRoot, "../..");
+const repositoryRoot = process.cwd();
+const applicationPackageName = "{{APPLICATION_PACKAGE_NAME}}";
 const uniqueId = `${process.pid}-${Date.now()}`;
 const standaloneImage = `vike-deployment-check-standalone:${uniqueId}`;
 const runtimeImage = `vike-deployment-check-runtime:${uniqueId}`;
@@ -321,15 +319,19 @@ if (row.count !== 0) throw new Error(\`Fresh deployment must contain zero TODOs,
 }
 
 async function runPlaywright(baseUrl: string): Promise<void> {
-  await runCommand("pnpm", ["--dir", "apps/web", "run", "test:e2e"], {
-    cwd: repositoryRoot,
-    env: {
-      ...process.env,
-      PLAYWRIGHT_EXTERNAL_BASE_URL: baseUrl,
+  await runCommand(
+    "pnpm",
+    ["--filter", applicationPackageName, "run", "test:e2e"],
+    {
+      cwd: repositoryRoot,
+      env: {
+        ...process.env,
+        PLAYWRIGHT_EXTERNAL_BASE_URL: baseUrl,
+      },
+      signal: abortController.signal,
+      timeout: 120_000,
     },
-    signal: abortController.signal,
-    timeout: 120_000,
-  });
+  );
 }
 
 async function runStartedDeployment(
@@ -431,7 +433,7 @@ async function assertUnpreparedRuntimeFails(): Promise<void> {
           `Unprepared runtime exited successfully instead of rejecting startup.\n${logs}`,
         );
       }
-      if (!logs.includes("Database is not ready")) {
+      if (!logs.includes("DATABASE_NOT_READY")) {
         throw new Error(
           `Unprepared runtime did not report database readiness failure.\n${logs}`,
         );
@@ -462,7 +464,7 @@ try {
     docker(
       "build",
       "--file",
-      "apps/web/Dockerfile",
+      "Dockerfile",
       "--target",
       "standalone",
       "--build-arg",
@@ -476,7 +478,7 @@ try {
     docker(
       "build",
       "--file",
-      "apps/web/Dockerfile",
+      "Dockerfile",
       "--target",
       "runtime",
       "--build-arg",

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/test/playwright-teardown.ts

@@ -1,12 +1,11 @@
 import { rmSync } from "node:fs";
-import path from "node:path";
 import { fileURLToPath } from "node:url";
 
-const webRoot = path.dirname(fileURLToPath(import.meta.url));
-
 export default function teardown(): void {
-  rmSync(path.join(webRoot, "node_modules/.tmp/e2e.sqlite"), { force: true });
-  rmSync(path.join(webRoot, "node_modules/.tmp/playwright-port"), {
-    force: true,
-  });
+  rmSync(
+    fileURLToPath(
+      new URL("../node_modules/.tmp/playwright-port", import.meta.url),
+    ),
+    { force: true },
+  );
 }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/tsconfig.app.json

@@ -5,13 +5,12 @@
   ],
   "compilerOptions": {
     "composite": true,
-    "customConditions": ["source"],
     "exactOptionalPropertyTypes": false,
     "module": "esnext",
     "moduleResolution": "bundler",
     "rewriteRelativeImportExtensions": false,
     "skipLibCheck": true,
-    "target": "es2023",
+    "target": "es2024",
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "types": ["node"]
   },

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "files": [],
   "references": [
-    { "path": "../../packages/db/tsconfig.json" },
     { "path": "./tsconfig.app.json" },
     { "path": "./tsconfig.test.json" },
     { "path": "./tsconfig.node.json" }

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/tsconfig.node.json

@@ -2,14 +2,13 @@
   "extends": "{{TYPESCRIPT_CONFIG_PACKAGE}}/base.json",
   "compilerOptions": {
     "composite": true,
-    "customConditions": ["source"],
     "erasableSyntaxOnly": true,
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
     "module": "esnext",
     "moduleResolution": "bundler",
-    "rewriteRelativeImportExtensions": false,
+    "rewriteRelativeImportExtensions": true,
     "skipLibCheck": true,
-    "target": "es2023",
+    "target": "es2024",
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "types": ["node"]
   },

package/node_modules/@ykdz/template-builtin-presets/templates/vike-app/web/tsconfig.test.json

@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
-    "customConditions": ["source"],
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.test.tsbuildinfo",
     "types": ["node", "vitest/globals"]