@hot-updater/supabase 0.36.5 → 0.36.7

package/dist/iac/index.cjs

@@ -6495,7 +6495,7 @@ var PublicSupabaseBucketError = class extends _hot_updater_cli_tools.InitError {
 		super([
 			`Supabase bucket "${bucketName}" is public.`,
 			"Make the bucket private in Supabase Storage, then rerun init.",
-			"Alternatively, rerun without --env-file to approve the change interactively."
+			"Alternatively, rerun without --from-env-file to approve the change interactively."
 		].join("\n"));
 		this.bucketName = bucketName;
 	}
@@ -7001,16 +7001,17 @@ const resolveBareSpecifierImportTarget = async (specifier, searchFrom) => {
 };
 const buildEdgeFunctionImports = async (targetDir) => {
 	const imports = {};
-	const visitedWorkspacePackages = /* @__PURE__ */ new Set();
+	const vendoredWorkspacePackages = /* @__PURE__ */ new Map();
 	const addWorkspacePackage = async ({ importSpecifier, packageName, exportName }) => {
 		const visitKey = `${packageName}:${exportName}`;
-		if (visitedWorkspacePackages.has(visitKey)) return;
-		visitedWorkspacePackages.add(visitKey);
+		const existingPackage = vendoredWorkspacePackages.get(visitKey);
+		if (existingPackage) return existingPackage;
 		const vendoredPackage = await prepareVendoredPackageImport({
 			targetDir,
 			packageName,
 			exportName
 		});
+		vendoredWorkspacePackages.set(visitKey, vendoredPackage);
 		imports[importSpecifier] = vendoredPackage.importMapPath;
 		const nestedSpecifiers = await collectBareImportSpecifiers(vendoredPackage.sourceEntryPath);
 		for (const nestedSpecifier of nestedSpecifiers) {
@@ -7025,17 +7026,26 @@ const buildEdgeFunctionImports = async (targetDir) => {
 			}
 			imports[nestedSpecifier] = await resolveBareSpecifierImportTarget(nestedSpecifier, vendoredPackage.packageRoot);
 		}
+		return vendoredPackage;
 	};
 	await addWorkspacePackage({
 		importSpecifier: "@hot-updater/server",
 		packageName: "@hot-updater/server",
 		exportName: "."
 	});
-	await addWorkspacePackage({
+	const supabasePackage = await addWorkspacePackage({
 		importSpecifier: "@hot-updater/supabase",
 		packageName: "@hot-updater/supabase",
 		exportName: "./edge"
 	});
+	const edgeFunctionEntryPath = path.default.join(targetDir, "index.ts");
+	if (await pathExists(edgeFunctionEntryPath)) {
+		const edgeFunctionSpecifiers = await collectBareImportSpecifiers(edgeFunctionEntryPath);
+		for (const specifier of edgeFunctionSpecifiers) {
+			if (imports[specifier]) continue;
+			imports[specifier] = await resolveBareSpecifierImportTarget(specifier, supabasePackage.packageRoot);
+		}
+	}
 	return imports;
 };
 const resolveEdgeFunctionDenoConfig = async (targetDir) => {
@@ -7182,9 +7192,9 @@ const deployEdgeFunction = async (accessToken, workdir, projectId, functionName)
 	const targetDir = path.default.resolve(functionsDir, functionName);
 	if (!targetDir.startsWith(`${functionsDir}${path.default.sep}`)) throw new Error("Supabase Edge Function path escaped its output directory.");
 	await fs_promises.default.mkdir(targetDir, { recursive: true });
-	const denoConfig = await resolveEdgeFunctionDenoConfig(targetDir);
 	const targetPath = path.default.join(targetDir, "index.ts");
 	await fs_promises.default.writeFile(targetPath, edgeFunctionsCode);
+	const denoConfig = await resolveEdgeFunctionDenoConfig(targetDir);
 	await fs_promises.default.writeFile(path.default.join(targetDir, "deno.json"), `${JSON.stringify(denoConfig, null, 2)}\n`);
 	await _hot_updater_cli_tools.p.tasks([{
 		title: "Supabase edge function deploy. This may take a few minutes.",

package/dist/iac/index.mjs

@@ -6490,7 +6490,7 @@ var PublicSupabaseBucketError = class extends InitError {
 		super([
 			`Supabase bucket "${bucketName}" is public.`,
 			"Make the bucket private in Supabase Storage, then rerun init.",
-			"Alternatively, rerun without --env-file to approve the change interactively."
+			"Alternatively, rerun without --from-env-file to approve the change interactively."
 		].join("\n"));
 		this.bucketName = bucketName;
 	}
@@ -6996,16 +6996,17 @@ const resolveBareSpecifierImportTarget = async (specifier, searchFrom) => {
 };
 const buildEdgeFunctionImports = async (targetDir) => {
 	const imports = {};
-	const visitedWorkspacePackages = /* @__PURE__ */ new Set();
+	const vendoredWorkspacePackages = /* @__PURE__ */ new Map();
 	const addWorkspacePackage = async ({ importSpecifier, packageName, exportName }) => {
 		const visitKey = `${packageName}:${exportName}`;
-		if (visitedWorkspacePackages.has(visitKey)) return;
-		visitedWorkspacePackages.add(visitKey);
+		const existingPackage = vendoredWorkspacePackages.get(visitKey);
+		if (existingPackage) return existingPackage;
 		const vendoredPackage = await prepareVendoredPackageImport({
 			targetDir,
 			packageName,
 			exportName
 		});
+		vendoredWorkspacePackages.set(visitKey, vendoredPackage);
 		imports[importSpecifier] = vendoredPackage.importMapPath;
 		const nestedSpecifiers = await collectBareImportSpecifiers(vendoredPackage.sourceEntryPath);
 		for (const nestedSpecifier of nestedSpecifiers) {
@@ -7020,17 +7021,26 @@ const buildEdgeFunctionImports = async (targetDir) => {
 			}
 			imports[nestedSpecifier] = await resolveBareSpecifierImportTarget(nestedSpecifier, vendoredPackage.packageRoot);
 		}
+		return vendoredPackage;
 	};
 	await addWorkspacePackage({
 		importSpecifier: "@hot-updater/server",
 		packageName: "@hot-updater/server",
 		exportName: "."
 	});
-	await addWorkspacePackage({
+	const supabasePackage = await addWorkspacePackage({
 		importSpecifier: "@hot-updater/supabase",
 		packageName: "@hot-updater/supabase",
 		exportName: "./edge"
 	});
+	const edgeFunctionEntryPath = path.join(targetDir, "index.ts");
+	if (await pathExists(edgeFunctionEntryPath)) {
+		const edgeFunctionSpecifiers = await collectBareImportSpecifiers(edgeFunctionEntryPath);
+		for (const specifier of edgeFunctionSpecifiers) {
+			if (imports[specifier]) continue;
+			imports[specifier] = await resolveBareSpecifierImportTarget(specifier, supabasePackage.packageRoot);
+		}
+	}
 	return imports;
 };
 const resolveEdgeFunctionDenoConfig = async (targetDir) => {
@@ -7177,9 +7187,9 @@ const deployEdgeFunction = async (accessToken, workdir, projectId, functionName)
 	const targetDir = path.resolve(functionsDir, functionName);
 	if (!targetDir.startsWith(`${functionsDir}${path.sep}`)) throw new Error("Supabase Edge Function path escaped its output directory.");
 	await fs.mkdir(targetDir, { recursive: true });
-	const denoConfig = await resolveEdgeFunctionDenoConfig(targetDir);
 	const targetPath = path.join(targetDir, "index.ts");
 	await fs.writeFile(targetPath, edgeFunctionsCode);
+	const denoConfig = await resolveEdgeFunctionDenoConfig(targetDir);
 	await fs.writeFile(path.join(targetDir, "deno.json"), `${JSON.stringify(denoConfig, null, 2)}\n`);
 	await p.tasks([{
 		title: "Supabase edge function deploy. This may take a few minutes.",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/supabase",
   "type": "module",
-  "version": "0.36.5",
+  "version": "0.36.7",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -53,12 +53,12 @@
   ],
   "dependencies": {
     "@supabase/supabase-js": "2.76.1",
-    "hono": "4.12.9",
+    "hono": "4.12.34",
     "uuidv7": "^1.0.2",
-    "@hot-updater/core": "0.36.5",
-    "@hot-updater/plugin-core": "0.36.5",
-    "@hot-updater/cli-tools": "0.36.5",
-    "@hot-updater/server": "0.36.5"
+    "@hot-updater/core": "0.36.7",
+    "@hot-updater/cli-tools": "0.36.7",
+    "@hot-updater/plugin-core": "0.36.7",
+    "@hot-updater/server": "0.36.7"
   },
   "devDependencies": {
     "@electric-sql/pglite": "0.4.1",
@@ -68,10 +68,10 @@
     "execa": "9.5.2",
     "@types/node": "^20",
     "mime": "^4.0.4",
-    "@hot-updater/js": "0.36.5",
-    "@hot-updater/mock": "0.36.5",
-    "@hot-updater/test-utils": "0.36.5",
-    "@hot-updater/postgres": "0.36.5"
+    "@hot-updater/js": "0.36.7",
+    "@hot-updater/mock": "0.36.7",
+    "@hot-updater/test-utils": "0.36.7",
+    "@hot-updater/postgres": "0.36.7"
   },
   "scripts": {
     "build": "tsdown",

package/supabase/edge-functions/index.ts

@@ -4,7 +4,7 @@ import {
   supabaseEdgeFunctionDatabase,
   supabaseEdgeFunctionStorage,
 } from "@hot-updater/supabase";
-import { Hono } from "npm:hono";
+import { Hono } from "hono";
 
 declare global {
   var HotUpdater: {

package/supabase/edge-functions/runtime.docker.integration.spec.ts

@@ -13,7 +13,7 @@ import {
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
-import { transformEnv } from "@hot-updater/cli-tools";
+import { resolvePackageVersion, transformEnv } from "@hot-updater/cli-tools";
 import {
   type Bundle,
   type GetBundlesArgs,
@@ -935,6 +935,9 @@ const writeSupabaseRuntimeFiles = async ({
       "@hot-updater/supabase": pathToFileURL(
         path.join(runtimeRoot, "hot-updater-supabase-edge.ts"),
       ).href,
+      hono: `npm:hono@${resolvePackageVersion("hono", {
+        searchFrom: path.join(WORKSPACE_ROOT, "plugins/supabase"),
+      })}`,
     },
   };