@batijs/cli 0.0.281 → 0.0.286

package/dist/boilerplates/@batijs/authjs/files/$package.json.js

@@ -44,8 +44,7 @@ var require_package = __commonJS({
         "@auth/core": "^0.35.0",
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.10",
-        dotenv: "^16.4.5"
+        "@universal-middleware/core": "^0.2.10"
       },
       dependencies: {
         "@batijs/core": "workspace:*"
@@ -84,7 +83,7 @@ import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    dependencies: ["@auth/core", "@universal-middleware/core", "dotenv"]
+    dependencies: ["@auth/core", "@universal-middleware/core"]
   });
 }
 export {

package/dist/boilerplates/@batijs/authjs/files/global.d.ts

@@ -0,0 +1,11 @@
+import type { Session } from "@auth/core/types";
+
+declare global {
+  namespace Vike {
+    interface PageContext {
+      session?: Session | null;
+    }
+  }
+}
+
+export {};

package/dist/boilerplates/@batijs/aws/files/$package.json.js

@@ -65,7 +65,8 @@ var require_package = __commonJS({
       bati: {
         if: {
           flag: "aws"
-        }
+        },
+        enforce: "post"
       },
       exports: {
         "./vitest.config": {

package/dist/boilerplates/@batijs/cloudflare/files/$package.json.js

@@ -58,7 +58,8 @@ var require_package = __commonJS({
       bati: {
         if: {
           flag: "cloudflare"
-        }
+        },
+        enforce: "post"
       },
       exports: {
         "./test": {
@@ -77,38 +78,44 @@ var require_package = __commonJS({
 });
 
 // files/$package.json.ts
-import { addDependency, loadAsJson, setScripts } from "@batijs/core";
+import { addDependency, loadAsJson, removeDependency, setScripts } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   setScripts(packageJson, {
     "preview:wrangler": {
       value: "wrangler pages dev",
-      precedence: 20,
+      precedence: 40,
       warnIfReplaced: true
     },
     preview: {
       value: "run-s build preview:wrangler",
-      precedence: 20,
+      precedence: 40,
       warnIfReplaced: true
     },
     "deploy:wrangler": {
       value: "wrangler pages deploy",
-      precedence: 20,
+      precedence: 40,
       warnIfReplaced: true
     },
     deploy: {
       value: "run-s build deploy:wrangler",
-      precedence: 20,
+      precedence: 40,
       warnIfReplaced: true
     }
   });
-  return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
+  addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
     devDependencies: ["wrangler", "npm-run-all2", "@cloudflare/workers-types"],
-    dependencies: [
-      "vike-cloudflare",
-      ...props.meta.BATI.has("hattip") ? ["@hattip/adapter-cloudflare-workers"] : []
-    ]
+    dependencies: ["vike-cloudflare"]
   });
+  if (props.meta.BATI.has("hattip")) {
+    addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
+      dependencies: ["@hattip/adapter-cloudflare-workers"]
+    });
+  } else {
+    removeDependency(packageJson, "tsx");
+    removeDependency(packageJson, "cross-env");
+  }
+  return packageJson;
 }
 export {
   getPackageJson as default

package/dist/boilerplates/@batijs/d1-sqlite/files/database/d1/queries/lucia-auth.ts

@@ -1,3 +1,4 @@
+/*# BATI include-if-imported #*/
 import type { D1Database } from "@cloudflare/workers-types";
 
 export function getExistingUser<T>(db: D1Database, username: string) {

package/dist/boilerplates/@batijs/drizzle/files/$package.json.js

@@ -114,9 +114,15 @@ async function getPackageJson(props) {
   packageJson.scripts["drizzle:generate"] = "drizzle-kit generate";
   packageJson.scripts["drizzle:migrate"] = props.meta.BATI.hasD1 ? "wrangler d1 migrations apply YOUR_DATABASE_NAME --local" : "drizzle-kit migrate";
   packageJson.scripts["drizzle:studio"] = "drizzle-kit studio";
+  if (!props.meta.BATI.hasD1) {
+    addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
+      devDependencies: ["@types/better-sqlite3"],
+      dependencies: ["better-sqlite3"]
+    });
+  }
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: ["@types/better-sqlite3", "tsx"],
-    dependencies: ["better-sqlite3", "drizzle-kit", "drizzle-orm", "dotenv"]
+    devDependencies: ["tsx"],
+    dependencies: ["drizzle-kit", "drizzle-orm", "dotenv"]
   });
 }
 export {

package/dist/boilerplates/@batijs/drizzle/files/drizzle.config.ts

@@ -1,3 +1,4 @@
+import "dotenv/config";
 import { defineConfig } from "drizzle-kit";
 
 if (!BATI.hasD1) {

package/dist/boilerplates/@batijs/drizzle/types/drizzle.config.d.ts

@@ -1,2 +1,3 @@
+import "dotenv/config";
 declare const _default: import("drizzle-kit").Config;
 export default _default;

package/dist/boilerplates/@batijs/express/files/$package.json.js

@@ -44,15 +44,12 @@ var require_package = __commonJS({
         "@auth/core": "^0.35.0",
         "@batijs/compile": "workspace:*",
         "@trpc/server": "^10.45.2",
-        "@types/cookie-parser": "^1.4.7",
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
         "@universal-middleware/express": "^0.2.6",
-        "cookie-parser": "^1.4.6",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
         express: "^4.21.0",
-        "express-openid-connect": "^2.17.1",
         telefunc: "^0.1.79",
         tsx: "^4.19.1",
         vike: "^0.4.196",
@@ -106,10 +103,7 @@ async function getPackageJson(props) {
     }
   });
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: [
-      "@types/express",
-      ...props.meta.BATI.has("firebase-auth") ? ["@types/cookie-parser"] : []
-    ],
+    devDependencies: ["@types/express"],
     dependencies: [
       "@universal-middleware/express",
       "cross-env",
@@ -117,7 +111,7 @@ async function getPackageJson(props) {
       "tsx",
       "vite",
       "vike",
-      ...props.meta.BATI.has("firebase-auth") ? ["cookie-parser"] : []
+      ...props.meta.BATI.has("auth0") || props.meta.BATI.hasDatabase ? ["dotenv"] : []
     ]
   });
 }

package/dist/boilerplates/@batijs/fastify/files/$package.json.js

@@ -105,16 +105,15 @@ async function getPackageJson(props) {
     }
   });
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: ["@types/node", ...props.meta.BATI.has("auth0") ? ["@types/express", "dotenv"] : []],
+    devDependencies: ["cross-env", "tsx", "@types/node"],
     dependencies: [
       "@fastify/middie",
       "@fastify/static",
       "@universal-middleware/fastify",
-      "cross-env",
       "fastify",
-      "tsx",
       "vike",
-      "vite"
+      "vite",
+      ...props.meta.BATI.has("auth0") || props.meta.BATI.hasDatabase ? ["dotenv"] : []
     ]
   });
 }

package/dist/boilerplates/@batijs/fastify/files/global.d.ts

@@ -1,16 +1,5 @@
-import type { RequestContext, ResponseContext } from "express-openid-connect";
 import type { UserRecord } from "firebase-admin/auth";
 
-//# BATI.has("auth0")
-declare module "node:http" {
-  interface IncomingMessage {
-    oidc: RequestContext;
-  }
-  interface ServerResponse {
-    oidc: ResponseContext;
-  }
-}
-
 //# BATI.has("firebase-auth")
 declare module "fastify" {
   interface FastifyRequest {

package/dist/boilerplates/@batijs/firebase-auth/files/$package.json.js

@@ -115,8 +115,8 @@ import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: ["dotenv", "@types/cookie"],
-    dependencies: ["firebase", "firebase-admin", "firebaseui", "cookie", "@universal-middleware/core"]
+    devDependencies: ["@types/cookie"],
+    dependencies: ["firebase", "firebase-admin", "firebaseui", "cookie", "@universal-middleware/core", "dotenv"]
   });
 }
 export {

package/dist/boilerplates/@batijs/h3/files/$package.json.js

@@ -106,10 +106,7 @@ async function getPackageJson(props) {
     }
   });
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: [
-      "@types/serve-static",
-      ...props.meta.BATI.has("auth0") ? ["@types/express", "dotenv"] : []
-    ],
+    devDependencies: ["@types/serve-static"],
     dependencies: [
       "@hattip/polyfills",
       "cross-env",
@@ -119,7 +116,8 @@ async function getPackageJson(props) {
       "vike",
       "vite",
       "@universal-middleware/h3",
-      ...props.meta.BATI.has("authjs") || props.meta.BATI.has("auth0") ? ["@auth/core"] : []
+      ...props.meta.BATI.has("authjs") || props.meta.BATI.has("auth0") ? ["@auth/core"] : [],
+      ...props.meta.BATI.has("auth0") || props.meta.BATI.hasDatabase ? ["dotenv"] : []
     ]
   });
 }

package/dist/boilerplates/@batijs/h3/files/global.d.ts

@@ -1,17 +1,5 @@
-import type { RequestContext, ResponseContext } from "express-openid-connect";
 import type { UserRecord } from "firebase-admin/auth";
 
-//# BATI.has("auth0")
-declare module "node:http" {
-  interface IncomingMessage {
-    oidc: RequestContext;
-  }
-
-  interface ServerResponse {
-    oidc: ResponseContext;
-  }
-}
-
 //# BATI.has("firebase-auth")
 declare module "h3" {
   interface H3EventContext {

package/dist/boilerplates/@batijs/hattip/files/$package.json.js

@@ -97,7 +97,7 @@ var require_package = __commonJS({
 });
 
 // files/$package.json.ts
-import { addDependency, loadAsJson, setScripts } from "@batijs/core";
+import { addDependency, loadAsJson, removeDependency, setScripts } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   setScripts(packageJson, {
@@ -127,7 +127,7 @@ async function getPackageJson(props) {
   if (packageJson.scripts.preview) {
     delete packageJson.scripts.preview;
   }
-  return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
+  addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
     devDependencies: ["@hattip/vite", "@hattip/adapter-node"],
     dependencies: [
       "@hattip/core",
@@ -137,11 +137,12 @@ async function getPackageJson(props) {
       "vite",
       "vike",
       "@universal-middleware/hattip",
-      "dotenv",
+      ...props.meta.BATI.has("auth0") || props.meta.BATI.hasDatabase ? ["dotenv"] : [],
       ...props.meta.BATI.has("vercel") ? ["@hattip/adapter-vercel-edge"] : [],
       ...props.meta.BATI.has("aws") ? ["@types/aws-lambda", "@hattip/adapter-aws-lambda", "@hattip/static", "@hattip/walk"] : []
     ]
   });
+  return removeDependency(packageJson, "tsx");
 }
 export {
   getPackageJson as default

package/dist/boilerplates/@batijs/hono/files/$package.json.js

@@ -131,7 +131,7 @@ async function getPackageJson(props) {
       "tsx",
       "vite",
       "vike",
-      "dotenv"
+      ...props.meta.BATI.has("auth0") || props.meta.BATI.hasDatabase ? ["dotenv"] : []
     ]
   });
 }

package/dist/boilerplates/@batijs/lucia-auth/files/$package.json.js

@@ -102,12 +102,13 @@ import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: ["dotenv", "@types/better-sqlite3", "@types/cookie"],
+    devDependencies: ["@types/better-sqlite3", "@types/cookie"],
     dependencies: [
       "arctic",
       "cookie",
       "lucia",
       "@universal-middleware/core",
+      "dotenv",
       ...props.meta.BATI.has("drizzle") ? ["@lucia-auth/adapter-drizzle"] : ["better-sqlite3", "@lucia-auth/adapter-sqlite"]
     ]
   });

package/dist/boilerplates/@batijs/lucia-auth/files/server/lucia-auth-handlers.ts

@@ -147,13 +147,16 @@ export const luciaAuthSignupHandler = (() => async (request, context, _runtime)
       },
     });
   } catch (error) {
-    if (error instanceof SqliteError && error.code === "SQLITE_CONSTRAINT_UNIQUE") {
-      return new Response(JSON.stringify({ error: { username: "Username already in use" } }), {
-        status: 422,
-        headers: {
-          "content-type": "application/json",
-        },
-      });
+    console.error(error);
+    if (BATI.has("sqlite") && !BATI.hasD1) {
+      if (error instanceof SqliteError && error.code === "SQLITE_CONSTRAINT_UNIQUE") {
+        return new Response(JSON.stringify({ error: { username: "Username already in use" } }), {
+          status: 422,
+          headers: {
+            "content-type": "application/json",
+          },
+        });
+      }
     }
 
     return new Response(JSON.stringify({ error: { invalid: "An unknown error has occurred" } }), {

package/dist/boilerplates/@batijs/sqlite/files/$package.json.js

@@ -120,8 +120,8 @@ async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   packageJson.scripts["sqlite:migrate"] = "tsx ./database/sqlite/schema/all.ts";
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: ["dotenv", "@types/better-sqlite3", "tsx"],
-    dependencies: ["better-sqlite3"]
+    devDependencies: ["@types/better-sqlite3", "tsx"],
+    dependencies: ["better-sqlite3", "dotenv"]
   });
 }
 export {

package/dist/boilerplates/@batijs/sqlite/files/database/sqlite/queries/lucia-auth.ts

@@ -1,3 +1,4 @@
+/*# BATI include-if-imported #*/
 import type { Database, Transaction } from "better-sqlite3";
 
 export function getExistingUser<T>(db: Database, username: string) {

package/dist/boilerplates/@batijs/sqlite/files/database/sqlite/schema/lucia-auth.ts

@@ -1,4 +1,4 @@
-/*# BATI include-if-imported #*/
+/*{ @if (it.BATI.has("lucia-auth")) }*/
 import "dotenv/config";
 import { db } from "../db";
 
@@ -29,3 +29,4 @@ client.exec(`CREATE TABLE IF NOT EXISTS sessions (
     user_id TEXT NOT NULL,
     FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE cascade ON DELETE cascade
 )`);
+/*{ /if }*/

package/dist/boilerplates/@batijs/trpc/types/server/trpc-handler.d.ts

@@ -1 +1 @@
-export declare const trpcHandler: (endpoint: string) => (request: Request, context: Universal.Context, runtime: import("@universal-middleware/core").RuntimeAdapter) => Promise<Response>;
+export declare const trpcHandler: (endpoint: string) => (request: Request<unknown, CfProperties<unknown>>, context: Universal.Context, runtime: import("@universal-middleware/core").RuntimeAdapter) => Promise<Response>;

package/dist/boilerplates/@batijs/trpc/types/trpc/client.d.ts

@@ -5,9 +5,9 @@ export declare const trpc: {
                 ctx: object & {
                     db: ReturnType<typeof import("@batijs/sqlite/database/sqlite/db").db>;
                 } & {
-                    db: ReturnType<any>;
+                    db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbSqlite>;
                 } & {
-                    db: ReturnType<any>;
+                    db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbD1>;
                 } & {
                     db: import("@cloudflare/workers-types").D1Database;
                 };
@@ -18,9 +18,9 @@ export declare const trpc: {
             _ctx_out: object & {
                 db: ReturnType<typeof import("@batijs/sqlite/database/sqlite/db").db>;
             } & {
-                db: ReturnType<any>;
+                db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbSqlite>;
             } & {
-                db: ReturnType<any>;
+                db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbD1>;
             } & {
                 db: import("@cloudflare/workers-types").D1Database;
             };
@@ -39,9 +39,9 @@ export declare const trpc: {
                 ctx: object & {
                     db: ReturnType<typeof import("@batijs/sqlite/database/sqlite/db").db>;
                 } & {
-                    db: ReturnType<any>;
+                    db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbSqlite>;
                 } & {
-                    db: ReturnType<any>;
+                    db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbD1>;
                 } & {
                     db: import("@cloudflare/workers-types").D1Database;
                 };
@@ -53,9 +53,9 @@ export declare const trpc: {
             _ctx_out: object & {
                 db: ReturnType<typeof import("@batijs/sqlite/database/sqlite/db").db>;
             } & {
-                db: ReturnType<any>;
+                db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbSqlite>;
             } & {
-                db: ReturnType<any>;
+                db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbD1>;
             } & {
                 db: import("@cloudflare/workers-types").D1Database;
             };

package/dist/boilerplates/boilerplates.json

@@ -30,7 +30,8 @@
     "config": {
       "if": {
         "flag": "aws"
-      }
+      },
+      "enforce": "post"
     },
     "folder": "@batijs/aws",
     "subfolders": [
@@ -52,7 +53,8 @@
     "config": {
       "if": {
         "flag": "cloudflare"
-      }
+      },
+      "enforce": "post"
     },
     "folder": "@batijs/cloudflare",
     "subfolders": [

package/dist/index.js

@@ -22,6 +22,7 @@ import { relative } from "node:path";
 import { parseModule, transformAndFormat } from "@batijs/core";
 import { parse } from "path";
 import { formatCode } from "@batijs/core";
+import { extname } from "node:path";
 async function mergeDts({
   fileContent,
   previousContent,
@@ -180,6 +181,77 @@ Please report this issue to https://github.com/vikejs/bati`);
     }
   }
 };
+var RelationFile = class _RelationFile {
+  constructor(pathAbsolute, includeIfImported) {
+    this.pathAbsolute = pathAbsolute;
+    this.includeIfImported = includeIfImported;
+    _RelationFile.allPathAbsolute.set(pathAbsolute, this);
+    if (includeIfImported) {
+      _RelationFile.allIncludeIfImported.push(this);
+    }
+  }
+  static allPathAbsolute = /* @__PURE__ */ new Map();
+  static allIncludeIfImported = [];
+};
+var RelationImport = class _RelationImport {
+  constructor(source, importTarget) {
+    this.source = source;
+    this.importTarget = importTarget;
+    _RelationImport.allImports.push(this);
+  }
+  static allImports = [];
+  get importTargetRelationFile() {
+    const potentialTargets = importToPotentialTargets(this.importTarget);
+    for (const target of potentialTargets) {
+      if (RelationFile.allPathAbsolute.has(target)) {
+        return RelationFile.allPathAbsolute.get(target);
+      }
+    }
+  }
+  static computeUnimportedFiles() {
+    const unimportedFiles = [];
+    const importedByVolatileFile = [];
+    for (const file of RelationFile.allIncludeIfImported) {
+      const importedFile = _RelationImport.allImports.find((ai) => ai.importTargetRelationFile === file);
+      if (!importedFile) {
+        unimportedFiles.push(file);
+      } else if (importedFile.source.includeIfImported) {
+        importedByVolatileFile.push(importedFile);
+      }
+    }
+    return computeDeepUnimportedFiles(importedByVolatileFile, unimportedFiles);
+  }
+};
+function computeDeepUnimportedFiles(importedByVolatileFile, unimportedFiles) {
+  const copyImportedByVolatileFile = Array.from(importedByVolatileFile);
+  let redo = false;
+  for (const relationImport of copyImportedByVolatileFile) {
+    const found = unimportedFiles.find((uf) => uf === relationImport.source);
+    if (found) {
+      redo = true;
+      unimportedFiles.push(relationImport.importTargetRelationFile);
+      importedByVolatileFile = importedByVolatileFile.filter((i) => i !== relationImport);
+    }
+  }
+  if (redo) {
+    computeDeepUnimportedFiles(importedByVolatileFile, unimportedFiles);
+  }
+  return unimportedFiles;
+}
+function importToPotentialTargets(imp) {
+  let subject = imp;
+  const ext = extname(imp);
+  const targets = [];
+  if (ext.match(/^\.[jt]sx?$/)) {
+    subject = subject.replace(/^\.[jt]sx?$/, "");
+  }
+  if (!ext || subject !== imp) {
+    targets.push(...[".js", ".jsx", ".ts", ".tsx", ".cjs", ".mjs"].map((e) => `${subject}${e}`));
+  } else {
+    targets.push(imp);
+  }
+  return targets;
+}
 var reIgnoreFile = /^(chunk-|asset-|#)/gi;
 function toDist(filepath, source, dist) {
   const split = filepath.split(path.sep);
@@ -223,32 +295,16 @@ async function* walk(dir) {
     } else if (d.isFile()) yield entry;
   }
 }
-function importToPotentialTargets(imp) {
-  let subject = imp;
-  const ext = path.extname(imp);
-  const targets = [];
-  if (ext.match(/^\.[jt]sx?$/)) {
-    subject = subject.replace(/^\.[jt]sx?$/, "");
-  }
-  if (!ext || subject !== imp) {
-    targets.push(...[".js", ".jsx", ".ts", ".tsx", ".cjs", ".mjs"].map((e) => `${subject}${e}`));
-  } else {
-    targets.push(imp);
-  }
-  return targets;
-}
 async function main(options, meta) {
   const sources = Array.isArray(options.source) ? options.source : [options.source];
-  const allImports = /* @__PURE__ */ new Set();
+  const allImports = /* @__PURE__ */ new Map();
   const filesContainingIncludeIfImported = /* @__PURE__ */ new Set();
-  function updateAllImports(target, imports) {
+  function updateAllImports(target, imports, includeIfImported) {
+    const rf = new RelationFile(target, includeIfImported);
     if (!imports) return;
     for (const imp of imports.values()) {
       const importTarget = path.resolve(path.dirname(target), imp);
-      const importTargets = importToPotentialTargets(importTarget);
-      for (const imp2 of importTargets) {
-        allImports.add(imp2);
-      }
+      new RelationImport(rf, importTarget);
     }
   }
   const rearranger = new OperationsRearranger();
@@ -298,7 +354,11 @@ Please report this issue to https://github.com/vikejs/bati`
         meta,
         previousOperationSameDestination: previousOp
       });
-      updateAllImports(op.destinationAbsolute, report.context?.imports);
+      updateAllImports(
+        op.destinationAbsolute,
+        report.context?.imports,
+        Boolean(report.context?.flags.has("include-if-imported"))
+      );
     } else if (op.kind === "transform") {
       report = await executeOperationTransform(op, {
         meta,
@@ -308,18 +368,13 @@ Please report this issue to https://github.com/vikejs/bati`
     if (report.content) {
       await safeWriteFile(op.destination, report.content.trimStart());
     }
-    if (report.context?.flags.has("include-if-imported")) {
-      filesContainingIncludeIfImported.add(op.destinationAbsolute);
-    }
     previousOp = {
       ...op,
       ...report
     };
   }
-  for (const target of filesContainingIncludeIfImported) {
-    if (!allImports.has(target)) {
-      await safeRmFile(target, { removeEmptyDir: true });
-    }
+  for (const target of RelationImport.computeUnimportedFiles()) {
+    await safeRmFile(target.pathAbsolute, { removeEmptyDir: true });
   }
 }
 
@@ -1677,7 +1732,7 @@ var createDefaultQueryTester = function(query, options) {
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.281",
+  version: "0.0.286",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.281",
+  "version": "0.0.286",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -20,12 +20,12 @@
     "typescript": "^5.6.2",
     "unplugin-purge-polyfills": "^0.0.6",
     "vite": "^5.4.7",
-    "@batijs/build": "0.0.281",
-    "@batijs/compile": "0.0.281"
+    "@batijs/build": "0.0.286",
+    "@batijs/compile": "0.0.286"
   },
   "dependencies": {
-    "@batijs/core": "0.0.281",
-    "@batijs/features": "0.0.281"
+    "@batijs/core": "0.0.286",
+    "@batijs/features": "0.0.286"
   },
   "bin": "./dist/index.js",
   "exports": {

package/dist/boilerplates/@batijs/auth0/files/global.d.ts

@@ -1,11 +0,0 @@
-import type { RequestContext } from "express-openid-connect";
-
-declare global {
-  namespace Vike {
-    interface PageContext {
-      user?: RequestContext["user"] | null;
-    }
-  }
-}
-
-export {};