@wix/himalaya-cli 0.1362.0 → 0.1364.0

package/dist/cli.mjs

@@ -7650,6 +7650,7 @@ function buttonVariant(style) {
 var SYSTEM_FONT_FAMILY, TONAL_ELEVATION_ALPHA, BUTTON_MIN_HIT_TARGET, nonNegative, nonEmpty, own, COLOR_TOKEN_PROPS, TYPOGRAPHY_TOKEN_PROPS, BUTTON_VARIANTS;
 var init_tokens = __esm({
   "../../core/ts/src/tokens.ts"() {
+    "use strict";
     SYSTEM_FONT_FAMILY = "$system";
     TONAL_ELEVATION_ALPHA = [0, 0.05, 0.08, 0.11, 0.12, 0.14];
     BUTTON_MIN_HIT_TARGET = 44;
@@ -7705,6 +7706,7 @@ function resolveTranslation(value, catalog3, sourceCatalog) {
 var BINDING_SIGILS, BINDING_SIGIL_RE, TRANSLATION_PREFIX, TRANSLATION_KEY_RE;
 var init_bindings = __esm({
   "../../core/ts/src/bindings.ts"() {
+    "use strict";
     BINDING_SIGILS = ["service", "flag", "item", "t"];
     BINDING_SIGIL_RE = new RegExp(
       `^\\$(?:${BINDING_SIGILS.filter((s2) => s2 !== "t").join("|")})\\b|^\\$t:`
@@ -13544,12 +13546,10 @@ var init_player_host_manifest = __esm({
       ],
       "unlinked": {
         "ios": [
-          "base44",
           "godot"
         ],
         "macos": [
           "audio_record_background",
-          "base44",
           "browser_auth",
           "godot",
           "iap",
@@ -13560,7 +13560,6 @@ var init_player_host_manifest = __esm({
           "wix_cashier"
         ],
         "android": [
-          "base44",
           "godot"
         ],
         "web": []
@@ -24884,7 +24883,7 @@ function assessPackage(header, host) {
     if (caps.length) out2.push({ reason: "missing_capabilities", missing: caps });
     const comps = missing(req.nativeComponents ?? [], host.nativeComponents);
     if (comps.length) out2.push({ reason: "missing_components", missing: comps });
-    const auth = missing(req.authProviders ?? [], host.authProviders);
+    const auth = missing((req.authProviders ?? []).filter((id) => id !== "none"), host.authProviders);
     if (auth.length) out2.push({ reason: "missing_auth_providers", missing: auth });
   }
   return out2;
@@ -28037,8 +28036,8 @@ var init_shell_capabilities_generated = __esm({
         appDir: "apps/himi-player",
         shared: true,
         extensible: false,
-        built: ["animation", "audio_record_background", "biometrics", "calendar", "calls", "camera", "clipboard", "contacts", "haptic", "iap", "location", "media_playback", "motion", "on_device_ai", "photos", "push", "speech"],
-        serves: ["animation", "app_info", "audio_record", "audio_record_background", "biometrics", "browser_auth", "calendar", "calls", "camera", "clipboard", "contacts", "file_picker", "files", "haptic", "himi_apps", "iap", "keyboard", "local_database", "location", "media_playback", "motion", "on_device_ai", "open_url", "pdf", "photos", "presigned_upload", "push", "release_control", "secure_storage", "share", "speaker_diarization", "speech", "stream", "theme", "ui", "wix_api", "wix_cashier", "wix_platform"]
+        built: ["animation", "audio_record_background", "base44", "biometrics", "calendar", "calls", "camera", "clipboard", "contacts", "haptic", "iap", "location", "media_playback", "motion", "on_device_ai", "photos", "push", "speech"],
+        serves: ["animation", "app_info", "audio_record", "audio_record_background", "base44", "biometrics", "browser_auth", "calendar", "calls", "camera", "clipboard", "contacts", "file_picker", "files", "haptic", "himi_apps", "iap", "keyboard", "local_database", "location", "media_playback", "motion", "on_device_ai", "open_url", "pdf", "photos", "presigned_upload", "push", "release_control", "secure_storage", "share", "speaker_diarization", "speech", "stream", "theme", "ui", "wix_api", "wix_cashier", "wix_platform"]
       }
     };
   }
@@ -137339,7 +137338,9 @@ async function buildFromLoaded(preloaded, dest, opts = {}) {
     playerRequirements: {
       capabilities: [...requiredCapabilities].sort(),
       nativeComponents: [...requiredNativeComponents].sort(),
-      authProviders: [config.auth.providerId].filter(Boolean).sort()
+      // `none` is the scaffold's spelling of "no auth" (`new-app --auth=none`), not a provider a
+      // host must carry — recording it blocked every such app in the Player picker (#3695).
+      authProviders: [config.auth.providerId].filter((id) => id && id !== "none").sort()
     },
     // #4091 — the app takes its Wix identity from a HOST (Spaces Lite) instead of signing in
     // itself (#4088 `hostProvided` on its auth provider). A host that lends its identity only
@@ -169974,7 +169975,8 @@ function missingClaims(requirements, offered) {
   const out2 = {};
   for (const kind of HOST_CLAIM_KINDS) {
     const has = new Set(offered[kind]);
-    out2[kind] = [...new Set(requirements[kind].filter((id) => !has.has(id)))];
+    const required3 = kind === "authProviders" ? requirements[kind].filter((id) => id !== "none") : requirements[kind];
+    out2[kind] = [...new Set(required3.filter((id) => !has.has(id)))];
   }
   return out2;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1362.0",
+  "version": "0.1364.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -71,5 +71,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "6f8e9ebff2033817c8121233af0096191f0d147fc9d49e65d9e6f02d"
+  "falconPackageHash": "d3c28af7c96bcc51af2111ceb585221c63a75150cacb4a2e9ec7facc"
 }

package/templates/beauty-salon/tier5-src/himi-branded-lite-plans/index.ts

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {

package/templates/branded-lite/tier5-src/himi-branded-lite-plans/index.ts

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {

package/templates/gym-fitness/tier5-src/himi-branded-lite-plans/index.ts

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {

package/templates/nonprofit-cause/tier5-src/himi-branded-lite-plans/index.ts

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {

package/templates/podcast-creator/tier5-src/himi-branded-lite-plans/index.ts

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {

package/templates/yoga-studio/tier5-src/himi-branded-lite-plans/index.ts

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {