@hot-updater/vercel 1.2.0-rc.6 → 1.2.0-rc.8

package/dist/function/index.mjs

@@ -17698,7 +17698,7 @@ const postgres = (config) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.2.0-rc.6";
+const HOT_UPDATER_SERVER_VERSION = "1.2.0-rc.8";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 const createVersionRouteHandlers = (plugins = []) => {

package/dist/index.d.cts

@@ -1,14 +1,15 @@
-import { StorageAdapterWith } from "@hot-updater/plugin-core";
+import { Lazy, StorageAdapterWith } from "@hot-updater/plugin-core";
 import { PostgresConfig, postgres } from "@hot-updater/postgres";
 //#region src/vercelBlobStorage.d.ts
 interface VercelBlobStorageConfig {
   /**
    * The Blob store's read-write token, `vercel_blob_rw_<storeId>_<secret>`:
    * the `BLOB_READ_WRITE_TOKEN` Vercel adds to a project the store connects
-   * to. Or a function that returns it, such as one that reads it with
-   * `secretEnv`: called on first use, so a config loads without the token.
+   * to. Or a function that returns it, such as `secret("<name>")` in
+   * `hot-updater.config.ts`: called on first use, so a config loads without
+   * the token.
    */
-  token: string | (() => string | Promise<string>);
+  token: Lazy<string>;
   /** Base path where bundles will be stored in the store. */
   basePath?: string;
   /**

package/dist/index.d.mts

@@ -1,14 +1,15 @@
-import { StorageAdapterWith } from "@hot-updater/plugin-core";
+import { Lazy, StorageAdapterWith } from "@hot-updater/plugin-core";
 import { PostgresConfig, postgres } from "@hot-updater/postgres";
 //#region src/vercelBlobStorage.d.ts
 interface VercelBlobStorageConfig {
   /**
    * The Blob store's read-write token, `vercel_blob_rw_<storeId>_<secret>`:
    * the `BLOB_READ_WRITE_TOKEN` Vercel adds to a project the store connects
-   * to. Or a function that returns it, such as one that reads it with
-   * `secretEnv`: called on first use, so a config loads without the token.
+   * to. Or a function that returns it, such as `secret("<name>")` in
+   * `hot-updater.config.ts`: called on first use, so a config loads without
+   * the token.
    */
-  token: string | (() => string | Promise<string>);
+  token: Lazy<string>;
   /** Base path where bundles will be stored in the store. */
   basePath?: string;
   /**

package/dist/init/index.cjs

@@ -6268,29 +6268,29 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region iac/configTemplate.ts
-const getConfigScaffold = (build, { secretEnv } = { secretEnv: false }) => {
-	const read = (reader, name) => secretEnv ? `async () =>
-      (await ${reader}()).${name}` : `process.env.${name}!`;
-	const storageConfig = {
+/**
+* The config init and the agent scaffold write: the Blob token and the
+* database URL are read with `secret()`, from the environment and
+* `.env.hotupdater`, then the config's `secrets` adapter.
+*/
+const getConfigScaffold = (build) => {
+	const builder = new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage({
 		imports: [{
 			pkg: "@hot-updater/vercel",
 			named: ["vercelBlobStorage"]
 		}],
 		configString: `vercelBlobStorage({
-    token: ${read("storageSecrets", "HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN")},
+    token: secret("HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN"),
   })`
-	};
-	const databaseConfig = {
+	}).setDatabase({
 		imports: [{
 			pkg: "@hot-updater/vercel",
 			named: ["postgres"]
 		}],
 		configString: `postgres({
-    connectionString: ${read("databaseSecrets", "HOT_UPDATER_VERCEL_DATABASE_URL")},
+    connectionString: secret("HOT_UPDATER_VERCEL_DATABASE_URL"),
   })`
-	};
-	const helperStatements = secretEnv ? [(0, _hot_updater_cli_tools.secretEnvHelper)("storageSecrets", ["HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN"]), (0, _hot_updater_cli_tools.secretEnvHelper)("databaseSecrets", ["HOT_UPDATER_VERCEL_DATABASE_URL"])] : [];
-	const builder = new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setPlugins({
+	}).setPlugins({
 		imports: [{
 			pkg: "hot-updater/plugins",
 			named: [
@@ -6300,12 +6300,11 @@ const getConfigScaffold = (build, { secretEnv } = { secretEnv: false }) => {
 			]
 		}],
 		configString: "[apiKeys(), insights(), remoteConfig()]"
-	});
-	if (secretEnv) builder.addImport({
+	}).addImport({
 		pkg: "hot-updater",
-		named: ["secretEnv"]
-	}).setIntermediateCode(helperStatements.map(({ code }) => code).join("\n\n"));
-	return (0, _hot_updater_cli_tools.createHotUpdaterConfigScaffoldFromBuilder)(builder, { helperStatements });
+		named: ["secret"]
+	});
+	return (0, _hot_updater_cli_tools.createHotUpdaterConfigScaffoldFromBuilder)(builder);
 };
 //#endregion
 //#region iac/init/index.ts
@@ -7144,7 +7143,7 @@ const runInit = async ({ build, envFile, secretsEnv }) => {
 		await database.dispose?.();
 	}
 	_hot_updater_cli_tools.p.log.success("Generated '.env.hotupdater' file with Vercel settings.");
-	await (0, _hot_updater_cli_tools.writeHotUpdaterFiles)(getConfigScaffold(build, { secretEnv: true }), {
+	await (0, _hot_updater_cli_tools.writeHotUpdaterFiles)(getConfigScaffold(build), {
 		cwd,
 		settings: "Vercel"
 	});

package/dist/init/index.mjs

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import fs from "fs/promises";
 import os from "os";
 import path from "path";
-import { ConfigBuilder, InitError, LegacyInfrastructureError, assembleServer, assertInfrastructureGenerationPayload, confirmInitInputPersistence, createHotUpdaterConfigScaffoldFromBuilder, createMigrator, getCwd, getHotUpdaterInitInputEnv, getInitProviderEnvVars, getInitProviderTextPromptValues, link, makeEnv, p, printAppSetup, provisionClientCredential, readHotUpdaterInitEnv, secretEnvHelper, shouldAutoSelectOnlyInitResource, writeHotUpdaterFiles } from "@hot-updater/cli-tools";
+import { ConfigBuilder, InitError, LegacyInfrastructureError, assembleServer, assertInfrastructureGenerationPayload, confirmInitInputPersistence, createHotUpdaterConfigScaffoldFromBuilder, createMigrator, getCwd, getHotUpdaterInitInputEnv, getInitProviderEnvVars, getInitProviderTextPromptValues, link, makeEnv, p, printAppSetup, provisionClientCredential, readHotUpdaterInitEnv, shouldAutoSelectOnlyInitResource, writeHotUpdaterFiles } from "@hot-updater/cli-tools";
 import { postgres } from "@hot-updater/postgres";
 import { apiKeys, insights, remoteConfig } from "@hot-updater/server/plugins";
 import { fileURLToPath } from "node:url";
@@ -6262,29 +6262,29 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region iac/configTemplate.ts
-const getConfigScaffold = (build, { secretEnv } = { secretEnv: false }) => {
-	const read = (reader, name) => secretEnv ? `async () =>
-      (await ${reader}()).${name}` : `process.env.${name}!`;
-	const storageConfig = {
+/**
+* The config init and the agent scaffold write: the Blob token and the
+* database URL are read with `secret()`, from the environment and
+* `.env.hotupdater`, then the config's `secrets` adapter.
+*/
+const getConfigScaffold = (build) => {
+	const builder = new ConfigBuilder().setBuildType(build).setStorage({
 		imports: [{
 			pkg: "@hot-updater/vercel",
 			named: ["vercelBlobStorage"]
 		}],
 		configString: `vercelBlobStorage({
-    token: ${read("storageSecrets", "HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN")},
+    token: secret("HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN"),
   })`
-	};
-	const databaseConfig = {
+	}).setDatabase({
 		imports: [{
 			pkg: "@hot-updater/vercel",
 			named: ["postgres"]
 		}],
 		configString: `postgres({
-    connectionString: ${read("databaseSecrets", "HOT_UPDATER_VERCEL_DATABASE_URL")},
+    connectionString: secret("HOT_UPDATER_VERCEL_DATABASE_URL"),
   })`
-	};
-	const helperStatements = secretEnv ? [secretEnvHelper("storageSecrets", ["HOT_UPDATER_VERCEL_BLOB_READ_WRITE_TOKEN"]), secretEnvHelper("databaseSecrets", ["HOT_UPDATER_VERCEL_DATABASE_URL"])] : [];
-	const builder = new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setPlugins({
+	}).setPlugins({
 		imports: [{
 			pkg: "hot-updater/plugins",
 			named: [
@@ -6294,12 +6294,11 @@ const getConfigScaffold = (build, { secretEnv } = { secretEnv: false }) => {
 			]
 		}],
 		configString: "[apiKeys(), insights(), remoteConfig()]"
-	});
-	if (secretEnv) builder.addImport({
+	}).addImport({
 		pkg: "hot-updater",
-		named: ["secretEnv"]
-	}).setIntermediateCode(helperStatements.map(({ code }) => code).join("\n\n"));
-	return createHotUpdaterConfigScaffoldFromBuilder(builder, { helperStatements });
+		named: ["secret"]
+	});
+	return createHotUpdaterConfigScaffoldFromBuilder(builder);
 };
 //#endregion
 //#region iac/init/index.ts
@@ -7138,7 +7137,7 @@ const runInit = async ({ build, envFile, secretsEnv }) => {
 		await database.dispose?.();
 	}
 	p.log.success("Generated '.env.hotupdater' file with Vercel settings.");
-	await writeHotUpdaterFiles(getConfigScaffold(build, { secretEnv: true }), {
+	await writeHotUpdaterFiles(getConfigScaffold(build), {
 		cwd,
 		settings: "Vercel"
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/vercel",
   "type": "module",
-  "version": "1.2.0-rc.6",
+  "version": "1.2.0-rc.8",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -41,11 +41,11 @@
     "@vercel/cli-auth": "0.3.10",
     "@vercel/cli-config": "0.3.1",
     "pg": "8.13.1",
-    "@hot-updater/cli-tools": "1.2.0-rc.6",
-    "@hot-updater/plugin-core": "1.2.0-rc.6",
-    "@hot-updater/postgres": "1.2.0-rc.6",
-    "@hot-updater/protocol": "1.2.0-rc.6",
-    "@hot-updater/server": "1.2.0-rc.6"
+    "@hot-updater/cli-tools": "1.2.0-rc.8",
+    "@hot-updater/plugin-core": "1.2.0-rc.8",
+    "@hot-updater/postgres": "1.2.0-rc.8",
+    "@hot-updater/server": "1.2.0-rc.8",
+    "@hot-updater/protocol": "1.2.0-rc.8"
   },
   "devDependencies": {
     "@types/node": "^20",
@@ -54,7 +54,7 @@
     "execa": "9.5.2",
     "kysely": "0.28.17",
     "vitest": "4.1.4",
-    "@hot-updater/test-utils": "1.2.0-rc.6"
+    "@hot-updater/test-utils": "1.2.0-rc.8"
   },
   "scripts": {
     "build": "tsdown",