@sanity/runtime-cli 17.16.0-next.gfe46ad0 → 17.17.0

package/README.md

@@ -90,7 +90,7 @@ EXAMPLES
   $ sanity-run blueprints add function --name my-function --fn-type document-create --fn-type document-update --lang js
 ```
 
-_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -127,7 +127,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -183,7 +183,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --new-stack-name <new-name>
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -221,7 +221,7 @@ EXAMPLES
   $ sanity-run blueprints destroy --stack <name-or-id> --project-id <projectId> --force --no-wait
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -253,7 +253,7 @@ EXAMPLES
   $ sanity-run blueprints doctor --fix
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -291,7 +291,7 @@ EXAMPLES
   $ sanity-run blueprints info --organization-id <orgId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -355,7 +355,7 @@ EXAMPLES
   $ sanity-run blueprints init old-stack --type <json|js|ts> --project-id <projectId> --stack-id <existingStackId>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -401,7 +401,7 @@ EXAMPLES
   $ sanity-run blueprints logs --before 2026-05-01T00:00:00Z
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints mint-deploy-token`
 
@@ -446,7 +446,7 @@ EXAMPLES
   $ sanity-run blueprints mint-deploy-token --organization-id <orgId>
 ```
 
-_See code: [src/commands/blueprints/mint-deploy-token.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/mint-deploy-token.ts)_
+_See code: [src/commands/blueprints/mint-deploy-token.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/mint-deploy-token.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -479,7 +479,7 @@ EXAMPLES
   $ sanity-run blueprints plan --organization-id <orgId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints promote`
 
@@ -515,7 +515,7 @@ EXAMPLES
   $ sanity-run blueprints promote --new-stack-name <new-name>
 ```
 
-_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/promote.ts)_
+_See code: [src/commands/blueprints/promote.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/promote.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -556,7 +556,7 @@ EXAMPLES
   $ sanity-run blueprints stacks --organization-id <organizationId> --include-projects
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -608,7 +608,7 @@ EXAMPLES
   $ sanity-run functions add --name my-function --type document-create --type document-update --lang js
 ```
 
-_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -643,7 +643,7 @@ EXAMPLES
   $ sanity-run functions dev --timeout 60
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -676,7 +676,7 @@ EXAMPLES
   $ sanity-run functions env add --stack <name-or-id> MyFunction API_URL https://api.example.com/
 ```
 
-_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -706,7 +706,7 @@ EXAMPLES
   $ sanity-run functions env list --stack <name-or-id> MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -738,7 +738,7 @@ EXAMPLES
   $ sanity-run functions env remove --stack <name-or-id> MyFunction API_URL
 ```
 
-_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs [NAME]`
 
@@ -778,7 +778,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test [NAME]`
 
@@ -836,7 +836,7 @@ EXAMPLES
   $ sanity-run functions test <name> --event update --data-before '{ "title": "before" }' --data-after '{ "title": "after" }'
 ```
 
-_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v17.16.0-next.gfe46ad0/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v17.17.0/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/config.js

@@ -38,7 +38,10 @@ const apiUrls = {
     staging: 'https://api.sanity.work/',
     default: 'http://api.sanity/',
 };
-const apiUrl = sanityEnv ? (apiUrls[sanityEnv] ?? sanityEnv) : apiUrls.default;
+const ensureTrailingSlash = (url) => (url.endsWith('/') ? url : `${url}/`);
+const apiUrl = sanityEnv
+    ? (apiUrls[sanityEnv] ?? ensureTrailingSlash(sanityEnv))
+    : apiUrls.default;
 const studioDomains = {
     production: 'sanity.studio',
     staging: 'studio.sanity.work',

package/dist/cores/functions/logs.d.ts

@@ -15,3 +15,10 @@ export interface FunctionLogsOptions extends DeployedBlueprintConfig {
     helpText: string;
 }
 export declare function functionLogsCore(options: FunctionLogsOptions): Promise<CoreResult>;
+/**
+ * Formats a date as `[YYYY-MM-DD, HH:mm:ss]` in either UTC or local time.
+ * The shape is identical in both cases so `--utc` only changes the timezone.
+ * @param date
+ * @param utc
+ */
+export declare function formatTimestamp(date: Date, utc: boolean | undefined): [string, string];

package/dist/cores/functions/logs.js

@@ -45,7 +45,7 @@ async function deleteLogs({ name, externalId, auth, force, log, }) {
     spinner.succeed('Logs deleted');
     return { success: true };
 }
-async function streamLogs({ name, externalId, auth, log, }) {
+async function streamLogs({ name, externalId, auth, utc, log, }) {
     const spinner = log.ora(`Setting up streaming logs session for function ${niceId(name)}`).start();
     try {
         spinner.stop();
@@ -58,7 +58,7 @@ async function streamLogs({ name, externalId, auth, log, }) {
             alreadyOpened = true;
         };
         const renderLog = (logEntry) => {
-            log(formatLog(logEntry, true));
+            log(formatLog(logEntry, utc));
         };
         streamLogsAction(externalId, auth, renderLog, onOpen, (error) => log.error(`${styleText('red', 'Error:')} ${error}`), log);
         // Return a special key for streaming mode
@@ -96,8 +96,8 @@ async function getLogs({ name, externalId, auth, limit, json, utc, log, }) {
         }
     }
     else {
-        const cleaned = filteredLogs.map(({ time, level, message, operationName, attempt, requestId, executionArn, }) => {
-            const isDurable = executionArn !== undefined;
+        const cleaned = filteredLogs.map(({ time, level, message, operationName, attempt, requestId, executionArn, executionId, }) => {
+            const isDurable = executionArn !== undefined || executionId !== undefined;
             const isStep = operationName !== undefined || attempt !== undefined;
             const durableContext = isDurable ? (isStep ? 'step' : 'handler') : undefined;
             return {
@@ -120,12 +120,10 @@ async function getLogs({ name, externalId, auth, limit, json, utc, log, }) {
  * @param utc
  */
 function formatLog(entry, utc) {
-    const { time, level, message, operationName, attempt, executionArn } = entry;
-    const date = new Date(time);
-    const [dateString, timeString] = utc
-        ? date.toISOString().slice(0, 19).split('T')
-        : [date.toLocaleDateString(), date.toLocaleTimeString()];
-    const durableAnnotation = durableLogAnnotation({ operationName, attempt, executionArn });
+    const { time, level, message, operationName, attempt, executionArn, executionId } = entry;
+    const execId = executionId || executionArn;
+    const [dateString, timeString] = formatTimestamp(new Date(time), utc);
+    const durableAnnotation = durableLogAnnotation({ operationName, attempt, executionId: execId });
     return [
         styleText('bold', dateString),
         styleText(['bold', 'blue'], timeString),
@@ -134,20 +132,35 @@ function formatLog(entry, utc) {
         message,
     ].join(' ');
 }
+/**
+ * Formats a date as `[YYYY-MM-DD, HH:mm:ss]` in either UTC or local time.
+ * The shape is identical in both cases so `--utc` only changes the timezone.
+ * @param date
+ * @param utc
+ */
+export function formatTimestamp(date, utc) {
+    if (utc)
+        return date.toISOString().slice(0, 19).split('T');
+    const pad = (n) => n.toString().padStart(2, '0');
+    const dateString = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+    const timeString = `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+    return [dateString, timeString];
+}
 /**
  * Log annotation for durable functions.
  * @param operationName
  * @param attempt
- * @param executionArn
+ * @param executionId
  */
-function durableLogAnnotation({ operationName, attempt, executionArn, }) {
+function durableLogAnnotation({ operationName, attempt, executionArn, executionId, }) {
     /**
-     * executionArn is included on durable function logs, but not on regular function logs.
-     * If executionArn is defined, we can assume the log is from a durable function.
-     * If executionArn is defined and operationName and attempt are undefined, the logger is in the handler context
+     * executionId is included on durable function logs, but not on regular function logs.
+     * If executionId is defined, we can assume the log is from a durable function.
+     * If executionId is defined and operationName and attempt are undefined, the logger is in the handler context
      */
+    const execId = executionId || executionArn;
     const annotationParts = [
-        executionArn !== undefined && operationName === undefined && attempt === undefined
+        execId !== undefined && operationName === undefined && attempt === undefined
             ? 'handler'
             : undefined,
         ...(operationName ? [operationName] : []),

package/dist/server/static/vendor/vendor.bundle.js

@@ -1,4 +1,4 @@
-//#region node_modules/@lezer/common/dist/index.js
+// node_modules/@lezer/common/dist/index.js
 /**
 The default maximum length of a `TreeBuffer` node.
 */
@@ -1517,8 +1517,7 @@ var StringInput = class {
 	}
 };
 new NodeProp({ perNode: true });
-//#endregion
-//#region node_modules/@lezer/lr/dist/index.js
+// node_modules/@lezer/lr/dist/index.js
 /**
 A parse stack. These are used internally by the parser to track
 parsing progress. They also provide some properties and methods
@@ -2963,8 +2962,7 @@ function getSpecializer(spec) {
 	}
 	return spec.get;
 }
-//#endregion
-//#region node_modules/@lezer/highlight/dist/index.js
+// node_modules/@lezer/highlight/dist/index.js
 var nextTagID = 0;
 /**
 Highlighting tags are markers that denote a highlighting category.
@@ -3836,8 +3834,7 @@ tagHighlighter([
 		class: "tok-punctuation"
 	}
 ]);
-//#endregion
-//#region node_modules/@lezer/json/dist/index.js
+// node_modules/@lezer/json/dist/index.js
 var jsonHighlighting = styleTags({
 	String: tags.string,
 	Number: tags.number,
@@ -3886,8 +3883,7 @@ var parser = LRParser.deserialize({
 	topRules: { "JsonText": [0, 1] },
 	tokenPrec: 0
 });
-//#endregion
-//#region node_modules/@marijn/find-cluster-break/src/index.js
+// node_modules/@marijn/find-cluster-break/src/index.js
 var rangeFrom = [];
 var rangeTo = [];
 (() => {
@@ -3957,8 +3953,7 @@ function surrogateHigh$1(ch) {
 function codePointSize$1(code) {
 	return code < 65536 ? 1 : 2;
 }
-//#endregion
-//#region node_modules/@codemirror/state/dist/index.js
+// node_modules/@codemirror/state/dist/index.js
 /**
 The data structure for documents. @nonabstract
 */
@@ -7368,8 +7363,7 @@ function findColumn(string, col, tabSize, strict) {
 	}
 	return strict === true ? -1 : string.length;
 }
-//#endregion
-//#region node_modules/style-mod/src/style-mod.js
+// node_modules/style-mod/src/style-mod.js
 var C = "ͼ";
 var COUNT = typeof Symbol == "undefined" ? "__ͼ" : Symbol.for(C);
 var SET = typeof Symbol == "undefined" ? "__styleSet" + Math.floor(Math.random() * 1e8) : Symbol("styleSet");
@@ -7460,8 +7454,7 @@ var StyleSet = class {
 		if (this.styleTag && this.styleTag.getAttribute("nonce") != nonce) this.styleTag.setAttribute("nonce", nonce);
 	}
 };
-//#endregion
-//#region node_modules/w3c-keyname/index.js
+// node_modules/w3c-keyname/index.js
 var base = {
 	8: "Backspace",
 	9: "Tab",
@@ -7561,8 +7554,7 @@ function keyName(event) {
 	if (name == "Down") name = "ArrowDown";
 	return name;
 }
-//#endregion
-//#region node_modules/crelt/index.js
+// node_modules/crelt/index.js
 function crelt() {
 	var elt = arguments[0];
 	if (typeof elt == "string") elt = document.createElement(elt);
@@ -7584,8 +7576,7 @@ function add(elt, child) {
 	else if (Array.isArray(child)) for (var i = 0; i < child.length; i++) add(elt, child[i]);
 	else throw new RangeError("Unsupported child node: " + child);
 }
-//#endregion
-//#region node_modules/@codemirror/view/dist/index.js
+// node_modules/@codemirror/view/dist/index.js
 var nav = typeof navigator != "undefined" ? navigator : {
 	userAgent: "",
 	vendor: "",
@@ -17373,8 +17364,7 @@ line](https://codemirror.net/6/docs/ref/#view.highlightActiveLine).
 function highlightActiveLineGutter() {
 	return activeLineGutterHighlighter;
 }
-//#endregion
-//#region node_modules/@codemirror/language/dist/index.js
+// node_modules/@codemirror/language/dist/index.js
 var _a;
 /**
 Node prop stored in a parser's top syntax node to provide the
@@ -19120,8 +19110,7 @@ function createTokenType(extra, tagStr) {
 	return type.id;
 }
 Direction.RTL, Direction.LTR;
-//#endregion
-//#region node_modules/@codemirror/lang-json/dist/index.js
+// node_modules/@codemirror/lang-json/dist/index.js
 /**
 A language provider that provides JSON parsing.
 */
@@ -19146,8 +19135,7 @@ JSON language support.
 function json() {
 	return new LanguageSupport(jsonLanguage);
 }
-//#endregion
-//#region node_modules/@enhance/store/index.mjs
+// node_modules/@enhance/store/index.mjs
 var _state = {};
 var dirtyProps = [];
 var listeners = [];
@@ -19217,8 +19205,7 @@ function notify() {
 	});
 	dirtyProps.length = 0;
 }
-//#endregion
-//#region node_modules/@codemirror/commands/dist/index.js
+// node_modules/@codemirror/commands/dist/index.js
 /**
 Comment or uncomment the current selection. Will use line comments
 if available, otherwise falling back to block comments.
@@ -20929,8 +20916,7 @@ var defaultKeymap = /*@__PURE__*/ [
 		run: toggleTabFocusMode
 	}
 ].concat(standardKeymap);
-//#endregion
-//#region node_modules/@codemirror/search/dist/index.js
+// node_modules/@codemirror/search/dist/index.js
 var basicNormalize = typeof String.prototype.normalize == "function" ? (x) => x.normalize("NFKD") : (x) => x;
 /**
 A search cursor provides an iterator over text matches in a
@@ -22070,8 +22056,7 @@ var searchExtensions = [
 	/*@__PURE__*/ Prec.low(searchHighlighter),
 	baseTheme$2
 ];
-//#endregion
-//#region node_modules/@codemirror/autocomplete/dist/index.js
+// node_modules/@codemirror/autocomplete/dist/index.js
 /**
 An instance of this is passed to completion source functions.
 */
@@ -23549,8 +23534,7 @@ var completionKeymap = [
 	}
 ];
 var completionKeymapExt = /*@__PURE__*/ Prec.highest(/*@__PURE__*/ keymap.computeN([completionConfig], (state) => state.facet(completionConfig).defaultKeymap ? [completionKeymap] : []));
-//#endregion
-//#region node_modules/@codemirror/lint/dist/index.js
+// node_modules/@codemirror/lint/dist/index.js
 var SelectedDiagnostic = class {
 	constructor(from, to, diagnostic) {
 		this.from = from;
@@ -24112,8 +24096,7 @@ var lintExtensions = [
 	lintHover,
 	baseTheme
 ];
-//#endregion
-//#region node_modules/codemirror/dist/index.js
+// node_modules/codemirror/dist/index.js
 /**
 This is an extension value that just pulls together a number of
 extensions that you might want in a basic editor. It is meant as a
@@ -24179,8 +24162,7 @@ var basicSetup = /*@__PURE__*/ (() => [
 		...lintKeymap
 	])
 ])();
-//#endregion
-//#region node_modules/pretty-bytes/index.js
+// node_modules/pretty-bytes/index.js
 var BYTE_UNITS = [
 	"B",
 	"kB",
@@ -24296,8 +24278,7 @@ function prettyBytes(number, options) {
 	}
 	return applyFixedWidth(prefix + toLocaleString(number, options.locale, localeOptions) + separator + UNITS[exponent], options.fixedWidth);
 }
-//#endregion
-//#region node_modules/parse-ms/index.js
+// node_modules/parse-ms/index.js
 var toZeroIfInfinity = (value) => Number.isFinite(value) ? value : 0;
 function parseNumber(milliseconds) {
 	return {
@@ -24330,8 +24311,7 @@ function parseMilliseconds(milliseconds) {
 	}
 	throw new TypeError("Expected a finite number or bigint");
 }
-//#endregion
-//#region node_modules/pretty-ms/index.js
+// node_modules/pretty-ms/index.js
 var isZero = (value) => value === 0 || value === 0n;
 var pluralize = (word, count) => count === 1 || count === 1n ? word : `${word}s`;
 var SECOND_ROUNDING_EPSILON = 1e-7;
@@ -24410,5 +24390,4 @@ function prettyMilliseconds(milliseconds, options) {
 	if (typeof options.unitCount === "number") result = result.slice(0, Math.max(options.unitCount, 1));
 	return sign + result.join(separator);
 }
-//#endregion
 export { Compartment, EditorState, EditorView, HighlightStyle, Store, basicSetup, json, prettyBytes, prettyMilliseconds, syntaxHighlighting, tags };

package/dist/utils/bundles/prepare-asset.js

@@ -5,6 +5,7 @@ import path, { basename, dirname, join } from 'node:path';
 import { pipeline } from 'node:stream/promises';
 import { createGzip } from 'node:zlib';
 import { buildApp, buildStudio, compareDependencyVersions, } from '@sanity/cli-build/_internal/build';
+import { buildStudioSchemasAndManifests } from '@sanity/cli-build/_internal/extract';
 import { getLocalPackageVersion } from '@sanity/cli-core';
 import { pack } from 'tar-fs';
 export const BUNDLE_SPECS = {
@@ -105,8 +106,15 @@ export async function prepareBundleAsset({ blueprintFileDir, resolvedResource, }
     }
 }
 async function buildStudioBundle({ resource, appId, workDir, outDir, output, eventListener, }) {
+    // this has been checked before we got here but this helps the type checker
+    if (!appId)
+        throw new Error(`Unable to determine appId for ${resource.type} resource '${resource.name}'`);
+    // currently we only support hard-coded project, support for dynamic project id to be added
+    const projectId = resource.project;
+    if (!projectId || projectId.startsWith('$.'))
+        throw new Error(`Unable to determine project for ${resource.type} resource '${resource.name}'`);
     let mismatchedPackages;
-    await buildStudio({
+    const { mfManifest } = await buildStudio({
         appId,
         autoUpdatesEnabled: resource.autoUpdates.enabled,
         checkAppId() { },
@@ -118,10 +126,12 @@ async function buildStudioBundle({ resource, appId, workDir, outDir, output, eve
         determineBasePath() {
             return resource.basePath ?? '/';
         },
-        // a studio is a standalone app, not a workbench module-federation app
         isApp: false,
         isBlueprints: true,
-        isWorkbenchApp: false,
+        // federated so the build emits mf-manifest.json for Brett; like `sanity build` for a
+        // `defineApplication` studio, this drops the auto-updates import map
+        isWorkbenchApp: true,
+        workbenchAppId: appId,
         minify: resource.minify ?? true,
         outDir,
         output,
@@ -135,6 +145,21 @@ async function buildStudioBundle({ resource, appId, workDir, outDir, output, eve
         workDir,
         eventListener,
     });
+    if (mfManifest) {
+        resource.mfManifest = mfManifest;
+    }
+    const { schemaInputs } = await buildStudioSchemasAndManifests(appId, {
+        configPath: resource.root,
+        isExternal: false,
+        outPath: outDir,
+        projectId,
+        schemaRequired: false,
+        verbose: false,
+        workDir,
+    });
+    if (schemaInputs) {
+        resource.schemaInputs = schemaInputs;
+    }
     return { mismatchedPackages };
 }
 async function buildApplicationBundle({ resource, appId, workDir, outDir, output, eventListener, }) {
@@ -143,7 +168,7 @@ async function buildApplicationBundle({ resource, appId, workDir, outDir, output
     if (extraWindow) {
         throw new Error(`Application resource '${resource.name}' declares more than one window view; at most one is allowed`);
     }
-    await buildApp({
+    const { mfManifest } = await buildApp({
         ...sharedBuildAppOptions({ appId, workDir, outDir, output, eventListener }),
         appId,
         appTitle: resource.title,
@@ -154,11 +179,14 @@ async function buildApplicationBundle({ resource, appId, workDir, outDir, output
             webWorkers: resource.webWorkers,
         },
     });
+    if (mfManifest) {
+        resource.mfManifest = mfManifest;
+    }
     // a workbench app never auto-updates, so no dependency mismatches are compared
     return {};
 }
 async function buildInstallationConfigBundle({ resource, workDir, outDir, output, eventListener, }) {
-    await buildApp({
+    const { mfManifest } = await buildApp({
         ...sharedBuildAppOptions({ appId: undefined, workDir, outDir, output, eventListener }),
         appId: undefined,
         appTitle: undefined,
@@ -166,6 +194,9 @@ async function buildInstallationConfigBundle({ resource, workDir, outDir, output
         workbenchAppId: undefined,
         exposes: { config: { appType: resource.appType, fields: resource.fields } },
     });
+    if (mfManifest) {
+        resource.mfManifest = mfManifest;
+    }
     return {};
 }
 // Options a workbench build (application or installation config) always sets the
@@ -248,6 +279,8 @@ function createSilentOutput() {
             return undefined;
         },
         log() { },
+        logDiagnostic(_message) { },
+        logJson(_json) { },
         warn(input) {
             return input;
         },

package/dist/utils/functions/transpile/function.js

@@ -37,6 +37,9 @@ export async function transpileFunction({ resource, functionPath, entryPoint, in
         const bundle = !!find.file('pnpm-workspace.yaml') || installer === 'pnpm';
         const result = await viteBuild({
             root: fnRootDir,
+            // Don't pick up the surrounding project's public/ folder or vite.config.*
+            publicDir: false,
+            configFile: false,
             logLevel: 'silent',
             build: {
                 target: 'node20',

package/dist/utils/types.d.ts

@@ -294,9 +294,10 @@ export interface FunctionLog {
     attempt?: number;
     operationId?: string;
     executionArn?: string;
+    executionId?: string;
 }
 /** @internal */
-export type FunctionLogJson = Omit<FunctionLog, 'executionArn' | 'operationId' | 'operationName'> & {
+export type FunctionLogJson = Omit<FunctionLog, 'executionArn' | 'executionId' | 'operationId' | 'operationName'> & {
     durableContext?: 'handler' | 'step';
     step?: string;
 };