zephyr-agent 0.0.15 → 0.0.17

package/dist/lib/payload-builders/ze-get-dash-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-get-dash-data.js","sourceRoot":"","sources":["../../../src/lib/payload-builders/ze-get-dash-data.ts"],"names":[],"mappings":";;;AAAA,+DAI8B;AAE9B,SAAgB,aAAa,CAAC,EAC5B,aAAa,EACb,SAAS,GACU;IACnB,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,uCAAgB,EAAC,aAAa,CAAC,CAAC;IAEhD,OAAO;QACL,EAAE,EAAE,aAAa,CAAC,eAAe;QACjC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI;QAC5B,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;QACvB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,GAAG,EAAE;YACxC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,OAAO;SACxC,CAAC;QACF,OAAO;QACP,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,OAAO,EAAE;YACP,IAAI,EAAE,aAAa,CAAC,IAAI;SACzB;QACD,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;QACnB,oBAAoB,EAAE,EAAE;QACxB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,EAAE;QACb,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,MAAM;QAC7B,mBAAmB;QACnB,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,MAAM;KACpC,CAAC;AACJ,CAAC;AA9BD,sCA8BC"}
+{"version":3,"file":"ze-get-dash-data.js","sourceRoot":"","sources":["../../../src/lib/payload-builders/ze-get-dash-data.ts"],"names":[],"mappings":";;;AAAA,+DAAoH;AAEpH,SAAgB,aAAa,CAAC,EAAE,aAAa,EAAE,SAAS,EAAsB;IAC5E,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,uCAAgB,EAAC,aAAa,CAAC,CAAC;IAEhD,OAAO;QACL,EAAE,EAAE,aAAa,CAAC,eAAe;QACjC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI;QAC5B,WAAW,EAAE,EAAE;QACf,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;QACvB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,GAAG,EAAE;YACxC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,OAAO;SACxC,CAAC;QACF,OAAO;QACP,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,OAAO,EAAE;YACP,IAAI,EAAE,aAAa,CAAC,IAAI;SACzB;QACD,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;QACnB,oBAAoB,EAAE,EAAE;QACxB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,EAAE;QACb,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC;AAzBD,sCAyBC"}

package/dist/lib/remote-logs/ze-log-event.d.ts

@@ -1,17 +1,12 @@
+import type { ZephyrPluginOptions } from 'zephyr-edge-contract';
+export declare const logFn: (level: string, msg: unknown) => void;
 export interface LogEventOptions {
     level: string;
     action: string;
     message: string;
+    ignore?: boolean;
     meta?: Record<string, unknown>;
 }
-export interface LoggerOptions {
-    application_uid: string;
-    zeConfig: {
-        buildId: string | undefined;
-    };
-    isCI: boolean;
-    app: Record<string, unknown>;
-    git: Record<string, unknown>;
-}
 export type LogEvent = (options: LogEventOptions) => void;
-export declare function logger(options: LoggerOptions): (...logs: LogEventOptions[]) => void;
+export type ZeLogger = (...logs: LogEventOptions[]) => void;
+export declare function logger(options: ZephyrPluginOptions): ZeLogger;

package/dist/lib/remote-logs/ze-log-event.js

@@ -1,63 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = void 0;
+exports.logger = exports.logFn = void 0;
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
+const promise_1 = require("../util/promise");
 const strip_ansi_1 = require("../util/strip-ansi");
-const log = (level, msg) => {
+const logFn = (level, msg) => {
     if (zephyr_edge_contract_1.is_debug_enabled) {
         (0, zephyr_edge_contract_1.ze_log)(msg);
         return;
     }
+    const str = String(msg);
+    const padded = str
+        .split('\n')
+        .map((m) => `${toLevelPrefix(level)}  ${m.trim()}`)
+        .join('\n');
     switch (level) {
         case 'warn':
-            console.warn(`${zephyr_edge_contract_1.brightYellowBgName}  ${msg}`);
+            console.warn(padded);
+            break;
+        case 'debug':
+            console.debug(padded);
             break;
         case 'error':
-            console.error(`${zephyr_edge_contract_1.brightRedBgName}  ${msg}`);
+            console.error(padded);
             break;
         default:
-            console.log(`${zephyr_edge_contract_1.brightBlueBgName}  ${msg}`);
+            console.log(padded);
     }
 };
+exports.logFn = logFn;
+function toLevelPrefix(level) {
+    switch (level) {
+        case 'warn':
+            return zephyr_edge_contract_1.brightYellowBgName;
+        case 'debug':
+            return zephyr_edge_contract_1.brightGreenBgName;
+        case 'error':
+            return zephyr_edge_contract_1.brightRedBgName;
+        default:
+            return zephyr_edge_contract_1.brightBlueBgName;
+    }
+}
 function logger(options) {
+    // lazy loads the application configuration and token
+    const loadLogData = (0, promise_1.PromiseLazyLoad)(() => {
+        return Promise.all([(0, get_application_configuration_1.getApplicationConfiguration)({ application_uid: options.application_uid }), (0, zephyr_edge_contract_1.getToken)()]);
+    });
+    const url = new URL(zephyr_edge_contract_1.ze_api_gateway.logs, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
     return function logEvent(...logs) {
-        Promise.all([(0, get_application_configuration_1.getApplicationConfiguration)({ application_uid: options.application_uid }), (0, zephyr_edge_contract_1.getToken)()]).then(([{ username, user_uuid }, token]) => {
-            for (const { level, action, message, meta } of logs) {
-                if (!level && !action) {
-                    throw new Error('log level and action type must be provided');
-                }
-                const newMeta = Object.assign({}, meta, {
-                    isCI: options.isCI,
-                    app: options.app,
-                    git: options.git,
-                });
-                const newMessage = message.trim();
-                const data = JSON.stringify({
-                    application_uid: options.application_uid,
-                    userId: user_uuid,
-                    username,
-                    zeBuildId: options.zeConfig.buildId,
-                    logLevel: level,
-                    actionType: action,
-                    git: options.git,
-                    message: (0, strip_ansi_1.stripAnsi)(newMessage),
-                    meta: newMeta,
-                    createdAt: Date.now(),
-                });
-                const reqOptions = {
-                    method: 'POST',
-                    headers: {
-                        Authorization: `Bearer ${token}`,
-                        'Content-Type': 'application/json',
-                        'Content-Length': data.length,
-                    },
-                };
-                log(level, newMessage);
-                const url = new URL(zephyr_edge_contract_1.ze_api_gateway.logs, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
-                void (0, zephyr_edge_contract_1.request)(url, reqOptions, data).catch(() => void 0);
+        // Prints logs to the console as fast as possible
+        for (const log of logs) {
+            if (!log.level && !log.action) {
+                throw new Error('log level and action type must be provided');
             }
-        });
+            (0, exports.logFn)(log.level, log.message);
+        }
+        // Then attempt to upload logs,
+        loadLogData()
+            .then(([config, token]) => (0, zephyr_edge_contract_1.request)(url, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${token}`,
+                'Content-Type': 'application/json',
+            },
+        }, JSON.stringify(logs
+            // some logs are empty to give newline effect in terminal
+            .filter((l) => l.message.length && !l.ignore)
+            .map((log) => ({
+            application_uid: options.application_uid,
+            userId: config.user_uuid,
+            username: config.username,
+            zeBuildId: options.zeConfig.buildId,
+            logLevel: log.level,
+            actionType: log.action,
+            git: options.git,
+            message: (0, strip_ansi_1.stripAnsi)(log.message.trim()),
+            meta: Object.assign({}, log.meta, { isCI: options.isCI, app: options.app, git: options.git }),
+            createdAt: Date.now(),
+        })))))
+            // This is ok to fail silently
+            .catch(() => void 0);
     };
 }
 exports.logger = logger;

package/dist/lib/remote-logs/ze-log-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/remote-logs/ze-log-event.ts"],"names":[],"mappings":";;;AAAA,+DAU8B;AAC9B,8GAAyG;AACzG,mDAA+C;AAE/C,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,GAAY,EAAQ,EAAE;IAChD,IAAI,uCAAgB,EAAE,CAAC;QACrB,IAAA,6BAAM,EAAC,GAAG,CAAC,CAAC;QACZ,OAAO;IACT,CAAC;IAED,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,MAAM;YACT,OAAO,CAAC,IAAI,CAAC,GAAG,yCAAkB,KAAK,GAAG,EAAE,CAAC,CAAC;YAC9C,MAAM;QACR,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,sCAAe,KAAK,GAAG,EAAE,CAAC,CAAC;YAC5C,MAAM;QACR;YACE,OAAO,CAAC,GAAG,CAAC,GAAG,uCAAgB,KAAK,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAqBF,SAAgB,MAAM,CAAC,OAAsB;IAC3C,OAAO,SAAS,QAAQ,CAAC,GAAG,IAAuB;QACjD,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,2DAA2B,EAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,IAAA,+BAAQ,GAAE,CAAC,CAAC,CAAC,IAAI,CACvG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YACnC,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;gBACpD,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;gBAChE,CAAC;gBAED,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE;oBACtC,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;iBACjB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;oBAC1B,eAAe,EAAE,OAAO,CAAC,eAAe;oBACxC,MAAM,EAAE,SAAS;oBACjB,QAAQ;oBACR,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO;oBACnC,QAAQ,EAAE,KAAK;oBACf,UAAU,EAAE,MAAM;oBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,OAAO,EAAE,IAAA,sBAAS,EAAC,UAAU,CAAC;oBAC9B,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG;oBACjB,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE;wBACP,aAAa,EAAE,UAAU,KAAK,EAAE;wBAChC,cAAc,EAAE,kBAAkB;wBAClC,gBAAgB,EAAE,IAAI,CAAC,MAAM;qBAC9B;iBACF,CAAC;gBAEF,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBAEvB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,qCAAc,CAAC,IAAI,EAAE,IAAA,sCAAe,GAAE,CAAC,CAAC;gBAE5D,KAAK,IAAA,8BAAO,EAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA/CD,wBA+CC"}
+{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/remote-logs/ze-log-event.ts"],"names":[],"mappings":";;;AACA,+DAW8B;AAC9B,8GAAyG;AACzG,6CAAkD;AAClD,mDAA+C;AAExC,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,GAAY,EAAQ,EAAE;IACzD,IAAI,uCAAgB,EAAE,CAAC;QACrB,IAAA,6BAAM,EAAC,GAAG,CAAC,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACxB,MAAM,MAAM,GAAG,GAAG;SACf,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;SAClD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,MAAM;YACT,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrB,MAAM;QACR,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACtB,MAAM;QACR,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACtB,MAAM;QACR;YACE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;AACH,CAAC,CAAC;AAzBW,QAAA,KAAK,SAyBhB;AAEF,SAAS,aAAa,CAAC,KAAa;IAClC,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,MAAM;YACT,OAAO,yCAAkB,CAAC;QAC5B,KAAK,OAAO;YACV,OAAO,wCAAiB,CAAC;QAC3B,KAAK,OAAO;YACV,OAAO,sCAAe,CAAC;QACzB;YACE,OAAO,uCAAgB,CAAC;IAC5B,CAAC;AACH,CAAC;AAcD,SAAgB,MAAM,CAAC,OAA4B;IACjD,qDAAqD;IACrD,MAAM,WAAW,GAAG,IAAA,yBAAe,EAAC,GAAG,EAAE;QACvC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,2DAA2B,EAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,IAAA,+BAAQ,GAAE,CAAC,CAAC,CAAC;IAC9G,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,qCAAc,CAAC,IAAI,EAAE,IAAA,sCAAe,GAAE,CAAC,CAAC;IAE5D,OAAO,SAAS,QAAQ,CAAC,GAAG,IAAI;QAC9B,iDAAiD;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,CAAC;YAED,IAAA,aAAK,EAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QAED,+BAA+B;QAC/B,WAAW,EAAE;aACV,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CACxB,IAAA,8BAAO,EACL,GAAG,EACH;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,KAAK,EAAE;gBAChC,cAAc,EAAE,kBAAkB;aACnC;SACF,EACD,IAAI,CAAC,SAAS,CACZ,IAAI;YACF,yDAAyD;aACxD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;aAC5C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACb,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,MAAM,EAAE,MAAM,CAAC,SAAS;YACxB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO;YACnC,QAAQ,EAAE,GAAG,CAAC,KAAK;YACnB,UAAU,EAAE,GAAG,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,IAAA,sBAAS,EAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACtC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;YAC7F,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAC,CACN,CACF,CACF;YACD,8BAA8B;aAC7B,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC;AApDD,wBAoDC"}

package/dist/lib/upload/strategies/cloudflare/upload-build-stats-and-enable-envs.d.ts

@@ -6,7 +6,5 @@ interface UploadBuildStatsAndEnableEnvsOptions {
     getDashData: (options: GetDashDataOptions) => ZephyrBuildStats;
     versionUrl: string;
 }
-export declare function uploadBuildStatsAndEnableEnvs({ appConfig, pluginOptions, getDashData, versionUrl, }: UploadBuildStatsAndEnableEnvsOptions): Promise<void | {
-    value: import("zephyr-edge-contract").ZeUploadBuildStats;
-}>;
+export declare function uploadBuildStatsAndEnableEnvs({ appConfig, pluginOptions, getDashData, versionUrl, }: UploadBuildStatsAndEnableEnvsOptions): Promise<boolean>;
 export {};

package/dist/lib/upload/strategies/cloudflare/upload.d.ts

@@ -1,2 +1,9 @@
-import { CloudflareOptions } from 'zephyr-edge-contract';
+interface CloudflareOptions {
+    edgeUrl: string;
+    api_token: string;
+    accountId: string;
+    projectName?: string;
+}
+/** @deprecated */
 export declare function upload(outputPath: string, { api_token, accountId, projectName }: CloudflareOptions): Promise<string>;
+export {};

package/dist/lib/upload/strategies/cloudflare/upload.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
 const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const process_1 = tslib_1.__importDefault(require("process"));
+const node_process_1 = tslib_1.__importDefault(require("node:process"));
+/** @deprecated */
 function upload(outputPath_1, _a) {
     return tslib_1.__awaiter(this, arguments, void 0, function* (outputPath, { api_token, accountId, projectName }) {
-        process_1.default.env['CLOUDFLARE_API_TOKEN'] = api_token;
+        node_process_1.default.env['CLOUDFLARE_API_TOKEN'] = api_token;
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const wrangler = require('wrangler');
         if (!wrangler) {
-            (0, zephyr_edge_contract_1.ze_error)('Wrangler dependency is needed for Cloudflare deployment. Please install dependencies without --no-optional flag.');
+            (0, zephyr_edge_contract_1.ze_error)('ERR_NO_WRANGLER', 'Wrangler dependency is needed for Cloudflare deployment. Please install dependencies without --no-optional flag.');
             throw new Error('Wrangler dependency not installed.');
         }
         const result = yield wrangler.unstable_pages.deploy({
@@ -18,7 +19,7 @@ function upload(outputPath_1, _a) {
             accountId,
             projectName: projectName,
         });
-        process_1.default.env['CLOUDFLARE_API_TOKEN'] = undefined;
+        node_process_1.default.env['CLOUDFLARE_API_TOKEN'] = undefined;
         return result.url;
     });
 }

package/dist/lib/upload/strategies/cloudflare/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../../src/lib/upload/strategies/cloudflare/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAAmE;AACnE,8DAA8B;AAE9B,SAAsB,MAAM;iEAAC,UAAkB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAqB;QACvG,iBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAA,+BAAQ,EAAC,kHAAkH,CAAC,CAAC;YAC7H,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,UAAU;YACrB,SAAS;YACT,WAAW,EAAE,WAAqB;SACnC,CAAC,CAAC;QAEH,iBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,OAAO,MAAM,CAAC,GAAG,CAAC;IACpB,CAAC;CAAA;AApBD,wBAoBC"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../../src/lib/upload/strategies/cloudflare/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAAgD;AAChD,wEAAmC;AASnC,kBAAkB;AAClB,SAAsB,MAAM;iEAAC,UAAkB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAqB;QACvG,sBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAA,+BAAQ,EACN,iBAAiB,EACjB,kHAAkH,CACnH,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,UAAU;YACrB,SAAS;YACT,WAAW,EAAE,WAAqB;SACnC,CAAC,CAAC;QAEH,sBAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,SAAS,CAAC;QAEhD,OAAO,MAAM,CAAC,GAAG,CAAC;IACpB,CAAC;CAAA;AAvBD,wBAuBC"}

package/dist/lib/upload/strategies/cloudflare/upsert-assets-to-files.js

@@ -16,7 +16,7 @@ function saveAssetsToFilesIfNotExist(dir, assetsMap) {
                 yield (0, promises_1.mkdir)(dir, { recursive: true });
             }
             catch (error) {
-                (0, zephyr_edge_contract_1.ze_error)(`Error creating dist folder: ${error.message}`);
+                (0, zephyr_edge_contract_1.ze_error)('ERR_CREATE_DIST_FOLDER', `Error creating dist folder: ${error.message}`);
                 throw new Error('Unable to create dist folder.');
             }
         }

package/dist/lib/upload/strategies/cloudflare/upsert-assets-to-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"upsert-assets-to-files.js","sourceRoot":"","sources":["../../../../../src/lib/upload/strategies/cloudflare/upsert-assets-to-files.ts"],"names":[],"mappings":";;;;AAAA,+DAA0E;AAC1E,0CAAkE;AAClE,+BAAoC;AAEpC,SAAsB,2BAA2B,CAAC,GAAW,EAAE,SAA2B;;QACxF,IAAI,CAAC;YACH,MAAM,IAAA,iBAAM,EAAC,GAAG,EAAE,oBAAS,CAAC,IAAI,GAAG,oBAAS,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,6BAAM,EAAC,qCAAqC,CAAC,CAAC;YAC9C,IAAI,CAAC;gBACH,MAAM,IAAA,gBAAK,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAA,+BAAQ,EAAC,+BAAgC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;gBACpE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7D,MAAM,QAAQ,GAAG,GAAG,GAAG,GAAG,UAAG,GAAG,IAAI,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,QAAQ,CAAC,IAAI,CAAC,IAAA,gBAAK,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,oBAAS,EAAC,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/H,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,IAAA,oBAAS,EAAC,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;CAAA;AAxBD,kEAwBC"}
+{"version":3,"file":"upsert-assets-to-files.js","sourceRoot":"","sources":["../../../../../src/lib/upload/strategies/cloudflare/upsert-assets-to-files.ts"],"names":[],"mappings":";;;;AAAA,+DAA0E;AAC1E,0CAAkE;AAClE,+BAAoC;AAEpC,SAAsB,2BAA2B,CAAC,GAAW,EAAE,SAA2B;;QACxF,IAAI,CAAC;YACH,MAAM,IAAA,iBAAM,EAAC,GAAG,EAAE,oBAAS,CAAC,IAAI,GAAG,oBAAS,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,6BAAM,EAAC,qCAAqC,CAAC,CAAC;YAC9C,IAAI,CAAC;gBACH,MAAM,IAAA,gBAAK,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAA,+BAAQ,EAAC,wBAAwB,EAAE,+BAAgC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC9F,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7D,MAAM,QAAQ,GAAG,GAAG,GAAG,GAAG,UAAG,GAAG,IAAI,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,QAAQ,CAAC,IAAI,CAAC,IAAA,gBAAK,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,oBAAS,EAAC,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/H,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,IAAA,oBAAS,EAAC,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;CAAA;AAxBD,kEAwBC"}

package/dist/lib/upload/strategies/cloudflare.strategy.d.ts

@@ -1,3 +1,2 @@
-import { ZeUploadBuildStats } from 'zephyr-edge-contract';
-import { UploadOptions } from '../upload';
-export declare function cloudflareStrategy({ pluginOptions, getDashData, appConfig, zeStart, assets: { assetsMap, missingAssets, count }, }: UploadOptions): Promise<ZeUploadBuildStats | undefined>;
+import type { UploadOptions } from '../upload';
+export declare function cloudflareStrategy({ pluginOptions, getDashData, appConfig, assets: { assetsMap, missingAssets, count }, }: UploadOptions): Promise<string>;

package/dist/lib/upload/strategies/cloudflare.strategy.js

@@ -2,14 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cloudflareStrategy = void 0;
 const tslib_1 = require("tslib");
-const process = tslib_1.__importStar(require("process"));
-const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const payload_builders_1 = require("../../payload-builders");
 const actions_1 = require("../../actions");
+const payload_builders_1 = require("../../payload-builders");
 const cloudflare_1 = require("./cloudflare");
-const ze_log_event_1 = require("../../remote-logs/ze-log-event");
 function cloudflareStrategy(_a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ pluginOptions, getDashData, appConfig, zeStart, assets: { assetsMap, missingAssets, count }, }) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ pluginOptions, getDashData, appConfig, assets: { assetsMap, missingAssets, count }, }) {
         const snapshot = (0, payload_builders_1.createSnapshot)({
             options: pluginOptions,
             assets: assetsMap,
@@ -20,33 +17,16 @@ function cloudflareStrategy(_a) {
             (0, actions_1.zeUploadSnapshot)({ pluginOptions, snapshot, appConfig }),
             (0, cloudflare_1.uploadAssets)({ assetsMap, missingAssets, pluginOptions, count }),
         ]);
-        process.nextTick(() => (0, cloudflare_1.uploadBuildStatsAndEnableEnvs)({
+        // Waits for the reply to check upload problems, but the reply is a simply
+        // 200 OK sent before any processing
+        yield (0, cloudflare_1.uploadBuildStatsAndEnableEnvs)({
             appConfig,
             pluginOptions,
             getDashData,
             versionUrl,
-        }));
-        (0, ze_log_event_1.logger)(pluginOptions)({
-            level: 'info',
-            action: 'build:deploy:done',
-            message: `Build deployed in ${(0, zephyr_edge_contract_1.yellow)(`${Date.now() - zeStart}`)}ms`,
         });
-        return;
+        return versionUrl;
     });
 }
 exports.cloudflareStrategy = cloudflareStrategy;
-// @todo: should be moved to deployment worker
-/*  await zeEnableSnapshotOnEdge({
-    pluginOptions,
-    envs_jwt: envs.value,
-    zeStart,
-  });
-
-  await uploadToPages({
-    uploadConfig,
-    pluginOptions,
-    outputPath,
-    assetsMap,
-    envs: envs.value,
-  });*/
 //# sourceMappingURL=cloudflare.strategy.js.map

package/dist/lib/upload/strategies/cloudflare.strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare.strategy.js","sourceRoot":"","sources":["../../../../src/lib/upload/strategies/cloudflare.strategy.ts"],"names":[],"mappings":";;;;AAAA,yDAAmC;AAEnC,+DAAkE;AAElE,6DAAwD;AACxD,2CAAiD;AAEjD,6CAA2E;AAC3E,iEAAwD;AAExD,SAAsB,kBAAkB;iEAAC,EACvC,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,GAC7B;QACd,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC;YAC9B,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrC,IAAA,0BAAgB,EAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;YACxD,IAAA,yBAAY,EAAC,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;SACjE,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CACpB,IAAA,0CAA6B,EAAC;YAC5B,SAAS;YACT,aAAa;YACb,WAAW;YACX,UAAU;SACX,CAAC,CACH,CAAC;QAEF,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;YACpB,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,mBAAmB;YAC3B,OAAO,EAAE,qBAAqB,IAAA,6BAAM,EAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,IAAI;SACpE,CAAC,CAAC;QAEH,OAAO;IACT,CAAC;CAAA;AAnCD,gDAmCC;AAED,8CAA8C;AAC9C;;;;;;;;;;;;OAYO"}
+{"version":3,"file":"cloudflare.strategy.js","sourceRoot":"","sources":["../../../../src/lib/upload/strategies/cloudflare.strategy.ts"],"names":[],"mappings":";;;;AAAA,2CAAiD;AACjD,6DAAwD;AAExD,6CAA2E;AAE3E,SAAsB,kBAAkB;iEAAC,EACvC,aAAa,EACb,WAAW,EACX,SAAS,EACT,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,GAC7B;QACd,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC;YAC9B,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrC,IAAA,0BAAgB,EAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;YACxD,IAAA,yBAAY,EAAC,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;SACjE,CAAC,CAAC;QAEH,0EAA0E;QAC1E,oCAAoC;QACpC,MAAM,IAAA,0CAA6B,EAAC;YAClC,SAAS;YACT,aAAa;YACb,WAAW;YACX,UAAU;SACX,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;CAAA;AA5BD,gDA4BC"}

package/dist/lib/upload/strategies/netlify.strategy.d.ts

@@ -1,3 +1,2 @@
-import { ZeUploadBuildStats } from 'zephyr-edge-contract';
-import { UploadOptions } from '../upload';
-export declare function netlifyStrategy({ pluginOptions, getDashData, appConfig, zeStart, assets: { assetsMap, missingAssets, count }, }: UploadOptions): Promise<ZeUploadBuildStats | undefined>;
+import type { UploadOptions } from '../upload';
+export declare function netlifyStrategy({ pluginOptions, getDashData, appConfig, assets: { assetsMap, missingAssets, count }, }: UploadOptions): Promise<string>;

package/dist/lib/upload/strategies/netlify.strategy.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.netlifyStrategy = void 0;
 const tslib_1 = require("tslib");
-const zephyr_edge_contract_1 = require("zephyr-edge-contract");
+const actions_1 = require("../../actions");
 const distributed_hash_control_1 = require("../../dvcs/distributed-hash-control");
 const payload_builders_1 = require("../../payload-builders");
-const actions_1 = require("../../actions");
 function netlifyStrategy(_a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ pluginOptions, getDashData, appConfig, zeStart, assets: { assetsMap, missingAssets, count }, }) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ pluginOptions, getDashData, appConfig, assets: { assetsMap, missingAssets, count }, }) {
         const snapshot = (0, payload_builders_1.createSnapshot)({
             options: pluginOptions,
             assets: assetsMap,
@@ -18,22 +17,15 @@ function netlifyStrategy(_a) {
             (0, actions_1.zeUploadSnapshot)({ pluginOptions, snapshot, appConfig }),
             uploadAssets({ assetsMap, missingAssets, pluginOptions, count }),
         ]);
-        const envs = yield uploadBuildStatsAndEnableEnvs({
+        // Waits for the reply to check upload problems, but the reply is a simply
+        // 200 OK sent before any processing
+        yield uploadBuildStatsAndEnableEnvs({
             appConfig,
             pluginOptions,
             getDashData,
             versionUrl,
         });
-        if (!envs) {
-            (0, zephyr_edge_contract_1.ze_error)('ZE20016', 'Did not receive envs from build stats upload.');
-            return undefined;
-        }
-        yield (0, actions_1.zeEnableSnapshotOnEdge)({
-            pluginOptions,
-            envs_jwt: envs.value,
-            zeStart,
-        });
-        return envs.value;
+        return versionUrl;
     });
 }
 exports.netlifyStrategy = netlifyStrategy;

package/dist/lib/upload/strategies/netlify.strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"netlify.strategy.js","sourceRoot":"","sources":["../../../../src/lib/upload/strategies/netlify.strategy.ts"],"names":[],"mappings":";;;;AAAA,+DAQ8B;AAE9B,kFAAuE;AACvE,6DAA4E;AAC5E,2CAA6G;AAG7G,SAAsB,eAAe;iEAAC,EACpC,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,GAC7B;QACd,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC;YAC9B,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrC,IAAA,0BAAgB,EAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;YACxD,YAAY,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;SACjE,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,6BAA6B,CAAC;YAC/C,SAAS;YACT,aAAa;YACb,WAAW;YACX,UAAU;SACX,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAA,+BAAQ,EAAC,SAAS,EAAE,+CAA+C,CAAC,CAAC;YAErE,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,IAAA,gCAAsB,EAAC;YAC3B,aAAa;YACb,QAAQ,EAAE,IAAI,CAAC,KAAK;YACpB,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CAAA;AAvCD,0CAuCC;AASD,SAAe,YAAY;iEAAC,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAuB;QACjG,MAAM,cAAc,GAAG,MAAM,IAAA,wBAAc,EAAC,aAAa,EAAE;YACzD,aAAa;YACb,SAAS;YACT,KAAK;SACN,CAAC,CAAC;QACH,IAAI,cAAc,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAM,IAAA,2CAAgB,EAAC,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AASD,SAAe,6BAA6B;iEAAC,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAwC;QACtI,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;QAC3D,QAAQ,CAAC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAEtC,OAAO,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;CAAA"}
+{"version":3,"file":"netlify.strategy.js","sourceRoot":"","sources":["../../../../src/lib/upload/strategies/netlify.strategy.ts"],"names":[],"mappings":";;;;AACA,2CAAqF;AACrF,kFAAuE;AACvE,6DAAiF;AAGjF,SAAsB,eAAe;iEAAC,EACpC,aAAa,EACb,WAAW,EACX,SAAS,EACT,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,GAC7B;QACd,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC;YAC9B,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrC,IAAA,0BAAgB,EAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;YACxD,YAAY,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;SACjE,CAAC,CAAC;QAEH,0EAA0E;QAC1E,oCAAoC;QACpC,MAAM,6BAA6B,CAAC;YAClC,SAAS;YACT,aAAa;YACb,WAAW;YACX,UAAU;SACX,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;CAAA;AA5BD,0CA4BC;AASD,SAAe,YAAY;iEAAC,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAuB;QACjG,MAAM,cAAc,GAAG,MAAM,IAAA,wBAAc,EAAC,aAAa,EAAE;YACzD,aAAa;YACb,SAAS;YACT,KAAK;SACN,CAAC,CAAC;QACH,IAAI,cAAc,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAM,IAAA,2CAAgB,EAAC,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AASD,SAAe,6BAA6B;iEAAC,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAwC;QACtI,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;QAC3D,QAAQ,CAAC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAEtC,OAAO,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;CAAA"}

package/dist/lib/upload/upload-file.d.ts

@@ -1,6 +1,6 @@
-import { UploadableAsset } from 'zephyr-edge-contract';
-export declare function uploadFile({ hash, asset, application_uid, }: {
+import { type UploadableAsset, type ZeApplicationConfig } from 'zephyr-edge-contract';
+export interface UploadFileProps {
     hash: string;
     asset: UploadableAsset;
-    application_uid: string;
-}): Promise<unknown>;
+}
+export declare function uploadFile({ hash, asset }: UploadFileProps, { EDGE_URL, jwt }: ZeApplicationConfig): Promise<unknown>;

package/dist/lib/upload/upload-file.js

@@ -3,13 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFile = void 0;
 const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const get_application_configuration_1 = require("../application-configuration/get-application-configuration");
-function uploadFile(_a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ hash, asset, application_uid, }) {
+function uploadFile(_a, _b) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ hash, asset }, { EDGE_URL, jwt }) {
         const type = 'file';
-        const { EDGE_URL, jwt } = yield (0, get_application_configuration_1.getApplicationConfiguration)({
-            application_uid,
-        });
         const options = {
             method: 'POST',
             headers: {

package/dist/lib/upload/upload-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-file.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-file.ts"],"names":[],"mappings":";;;;AACA,+DAAgE;AAChE,8GAAyG;AAEzG,SAAsB,UAAU;iEAAC,EAC/B,IAAI,EACJ,KAAK,EACL,eAAe,GAKhB;QACC,MAAM,IAAI,GAAG,MAAM,CAAC;QAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC1D,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACpC,aAAa,EAAE,KAAK,CAAC,IAAI;gBACzB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,0BAA0B;aAC3C;SACF,CAAC;QAEF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,IAAA,8BAAO,EAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;CAAA;AA9BD,gCA8BC"}
+{"version":3,"file":"upload-file.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-file.ts"],"names":[],"mappings":";;;;AACA,+DAA+F;AAO/F,SAAsB,UAAU;iEAAC,EAAE,IAAI,EAAE,KAAK,EAAmB,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAuB;QACvG,MAAM,IAAI,GAAG,MAAM,CAAC;QAEpB,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACpC,aAAa,EAAE,KAAK,CAAC,IAAI;gBACzB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,0BAA0B;aAC3C;SACF,CAAC;QAEF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,IAAA,8BAAO,EAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;CAAA;AAlBD,gCAkBC"}

package/dist/lib/upload/upload-snapshot.js

@@ -22,10 +22,10 @@ function uploadSnapshot(_a) {
                 can_write_jwt: jwt,
             },
         };
-        const res = yield (0, zephyr_edge_contract_1.request)(url, options, data).catch((err) => (0, zephyr_edge_contract_1.ze_error)('ZE10018', 'Failed to upload snapshot.', err));
+        const res = yield (0, zephyr_edge_contract_1.request)(url, options, data).catch((err) => (0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_SNAPSHOTS', 'Failed to upload snapshot.', err));
         (0, zephyr_edge_contract_1.ze_log)('Snapshot uploaded...');
         if (!res || typeof res === 'string') {
-            (0, zephyr_edge_contract_1.ze_error)('ZE10018', 'Failed to upload snapshot.', res);
+            (0, zephyr_edge_contract_1.ze_error)('ERR_FAILED_UPLOAD_SNAPSHOTS', 'Failed to upload snapshot.', res);
             return;
         }
         return res;

package/dist/lib/upload/upload-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-snapshot.ts"],"names":[],"mappings":";;;;AACA,+DAM8B;AAC9B,8GAAyG;AAEzG,SAAsB,cAAc;iEAAC,EACnC,IAAI,EACJ,eAAe,GAIhB;QACC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC1D,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,UAAU,CAAC;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACxC,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,GAAG;aACnB;SACF,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAO,EAAoB,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,KAAK,CACpE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,+BAAQ,EAAC,SAAS,EAAE,4BAA4B,EAAE,GAAG,CAAC,CAChE,CAAC;QACF,IAAA,6BAAM,EAAC,sBAAsB,CAAC,CAAC;QAE/B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAA,+BAAQ,EAAC,SAAS,EAAE,4BAA4B,EAAE,GAAG,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AApCD,wCAoCC"}
+{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/upload/upload-snapshot.ts"],"names":[],"mappings":";;;;AACA,+DAA8F;AAC9F,8GAAyG;AAEzG,SAAsB,cAAc;iEAAC,EACnC,IAAI,EACJ,eAAe,GAIhB;QACC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;YAC1D,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,UAAU,CAAC;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAsB;YACjC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACxC,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,GAAG;aACnB;SACF,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAO,EAAoB,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC7E,IAAA,+BAAQ,EAAC,6BAA6B,EAAE,4BAA4B,EAAE,GAAG,CAAC,CAC3E,CAAC;QACF,IAAA,6BAAM,EAAC,sBAAsB,CAAC,CAAC;QAE/B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAA,+BAAQ,EAAC,6BAA6B,EAAE,4BAA4B,EAAE,GAAG,CAAC,CAAC;YAC3E,OAAO;QACT,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AApCD,wCAoCC"}

package/dist/lib/upload/upload.d.ts

@@ -1,5 +1,5 @@
-import { UploadProviderConfig, ZeApplicationConfig, ZeBuildAsset, ZeBuildAssetsMap, ZephyrBuildStats, ZephyrPluginOptions } from 'zephyr-edge-contract';
-import { GetDashDataOptions } from '../payload-builders';
+import { type ZeApplicationConfig, type ZeBuildAsset, type ZeBuildAssetsMap, type ZephyrBuildStats, type ZephyrPluginOptions } from 'zephyr-edge-contract';
+import type { GetDashDataOptions } from '../payload-builders';
 export declare function upload(options: UploadOptions): Promise<void>;
 export interface UploadOptions {
     appConfig: ZeApplicationConfig;
@@ -7,7 +7,6 @@ export interface UploadOptions {
     pluginOptions: ZephyrPluginOptions;
     getDashData: (options: GetDashDataOptions) => ZephyrBuildStats;
     zeStart: number;
-    uploadConfig: UploadProviderConfig;
 }
 export interface AssetsOptions {
     assetsMap: ZeBuildAssetsMap;

package/dist/lib/upload/upload.js

@@ -3,31 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
 const tslib_1 = require("tslib");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
+const ze_log_event_1 = require("../remote-logs/ze-log-event");
 const strategies_1 = require("./strategies");
 function upload(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let deployResult = undefined;
-        switch (options.uploadConfig.type) {
+        const logEvent = (0, ze_log_event_1.logger)(options.pluginOptions);
+        let versionUrl;
+        switch (options.appConfig.PLATFORM) {
             case zephyr_edge_contract_1.UploadProviderType.CLOUDFLARE:
-                deployResult = yield (0, strategies_1.cloudflareStrategy)(options);
+                versionUrl = yield (0, strategies_1.cloudflareStrategy)(options);
                 break;
             case zephyr_edge_contract_1.UploadProviderType.NETLIFY:
-                deployResult = yield (0, strategies_1.netlifyStrategy)(options);
+                versionUrl = yield (0, strategies_1.netlifyStrategy)(options);
                 break;
             default:
                 throw new Error('Unsupported upload provider.');
         }
-        if (deployResult) {
-            const _a = getInfoForBuildStats(deployResult), { application_uid } = _a, rest = tslib_1.__rest(_a, ["application_uid"]);
-            yield zephyr_edge_contract_1.appDeployResultCache.setAppDeployResult(application_uid, rest);
-        }
+        logEvent({
+            level: 'trace',
+            action: 'deploy:url',
+            message: `Deployed to ${(0, zephyr_edge_contract_1.cyanBright)('Zephyr')}'s edge in ${(0, zephyr_edge_contract_1.yellow)(`${Date.now() - options.zeStart}`)}ms.\n\n${(0, zephyr_edge_contract_1.cyanBright)(versionUrl)}`,
+        });
+        // FIXME: Now only possible if:
+        // https://zephyr-cloud.slack.com/archives/C05NRK2SUSE/p1725400546897959
+        // if (deployResult) {
+        //   await appDeployResultCache.setAppDeployResult(result.app_version.application_uid, { urls: result.urls });
+        // }
+        // empty line to separate logs from other plugins
+        console.log();
     });
 }
 exports.upload = upload;
-function getInfoForBuildStats(result) {
-    return {
-        application_uid: result.app_version.application_uid,
-        urls: result.urls,
-    };
-}
 //# sourceMappingURL=upload.js.map

package/dist/lib/upload/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/lib/upload/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAU8B;AAC9B,6CAAmE;AAGnE,SAAsB,MAAM,CAAC,OAAsB;;QACjD,IAAI,YAAY,GAAmC,SAAS,CAAC;QAC7D,QAAQ,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAClC,KAAK,yCAAkB,CAAC,UAAU;gBAChC,YAAY,GAAG,MAAM,IAAA,+BAAkB,EAAC,OAAO,CAAC,CAAC;gBACjD,MAAM;YACR,KAAK,yCAAkB,CAAC,OAAO;gBAC7B,YAAY,GAAG,MAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,CAAC;gBAC9C,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,KAA+B,oBAAoB,CAAC,YAAY,CAAC,EAAjE,EAAE,eAAe,OAAgD,EAA3C,IAAI,sBAA1B,mBAA4B,CAAqC,CAAC;YACxE,MAAM,2CAAoB,CAAC,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;CAAA;AAjBD,wBAiBC;AAkBD,SAAS,oBAAoB,CAAC,MAA0B;IAItD,OAAO;QACL,eAAe,EAAE,MAAM,CAAC,WAAW,CAAC,eAAe;QACnD,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/lib/upload/upload.ts"],"names":[],"mappings":";;;;AAAA,+DAS8B;AAE9B,8DAAqD;AACrD,6CAAmE;AAEnE,SAAsB,MAAM,CAAC,OAAsB;;QACjD,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAE/C,IAAI,UAAkB,CAAC;QAEvB,QAAQ,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACnC,KAAK,yCAAkB,CAAC,UAAU;gBAChC,UAAU,GAAG,MAAM,IAAA,+BAAkB,EAAC,OAAO,CAAC,CAAC;gBAC/C,MAAM;YACR,KAAK,yCAAkB,CAAC,OAAO;gBAC7B,UAAU,GAAG,MAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,CAAC;gBAC5C,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpD,CAAC;QAED,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,eAAe,IAAA,iCAAU,EAAC,QAAQ,CAAC,cAAc,IAAA,6BAAM,EAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,UAAU,IAAA,iCAAU,EAAC,UAAU,CAAC,EAAE;SACtI,CAAC,CAAC;QAEH,+BAA+B;QAC/B,wEAAwE;QACxE,sBAAsB;QACtB,8GAA8G;QAC9G,IAAI;QAEJ,iDAAiD;QACjD,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC;CAAA;AA9BD,wBA8BC"}

package/dist/lib/util/promise.d.ts

@@ -0,0 +1,22 @@
+/**
+ * ES 2023 Promise.withResolvers() polyfill
+ *
+ * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers
+ */
+export declare function PromiseWithResolvers<T>(): {
+    promise: Promise<T>;
+    resolve: (value: T | PromiseLike<T>) => void;
+    reject: (reason?: unknown) => void;
+};
+/**
+ * Creates a `[error, value]` tuple from a promise.
+ *
+ * @link https://www.npmjs.com/package/tuple-it
+ */
+export declare function PromiseTuple<P>(maybePromise: PromiseLike<P> | P): Promise<[Error] | [null, P]>;
+/**
+ * Lazy loads a promise.
+ *
+ * @link https://github.com/sindresorhus/p-lazy
+ */
+export declare function PromiseLazyLoad<const T, const P = void>(promise: (params: P) => Promise<T>): (params: P) => Promise<T>;

package/dist/lib/util/promise.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PromiseLazyLoad = exports.PromiseTuple = exports.PromiseWithResolvers = void 0;
+const tslib_1 = require("tslib");
+/**
+ * ES 2023 Promise.withResolvers() polyfill
+ *
+ * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers
+ */
+function PromiseWithResolvers() {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return { promise, resolve, reject };
+}
+exports.PromiseWithResolvers = PromiseWithResolvers;
+/**
+ * Creates a `[error, value]` tuple from a promise.
+ *
+ * @link https://www.npmjs.com/package/tuple-it
+ */
+function PromiseTuple(maybePromise) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            // await because then is not present on non-Promise objects
+            return [null, yield maybePromise];
+        }
+        catch (err) {
+            // Wrapping into Error avoids the need to check
+            // `if (error !== undefined)` in favor of a simpler `if (error)`
+            if (err instanceof Error) {
+                return [err];
+            }
+            const error = new Error('Promise rejected without an error');
+            error.data = err;
+            return [error];
+        }
+    });
+}
+exports.PromiseTuple = PromiseTuple;
+/**
+ * Lazy loads a promise.
+ *
+ * @link https://github.com/sindresorhus/p-lazy
+ */
+function PromiseLazyLoad(promise) {
+    let _data;
+    return (params) => {
+        if (!_data) {
+            _data = promise(params);
+        }
+        return _data;
+    };
+}
+exports.PromiseLazyLoad = PromiseLazyLoad;
+//# sourceMappingURL=promise.js.map

package/dist/lib/util/promise.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../src/lib/util/promise.ts"],"names":[],"mappings":";;;;AAAA;;;;GAIG;AACH,SAAgB,oBAAoB;IAClC,IAAI,OAA6C,CAAC;IAClD,IAAI,MAAmC,CAAC;IAExC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC1C,OAAO,GAAG,GAAG,CAAC;QACd,MAAM,GAAG,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC;AAVD,oDAUC;AAED;;;;GAIG;AACH,SAAsB,YAAY,CAAI,YAAgC;;QACpE,IAAI,CAAC;YACH,2DAA2D;YAC3D,OAAO,CAAC,IAAI,EAAE,MAAM,YAAY,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,+CAA+C;YAC/C,gEAAgE;YAChE,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,CAAC;YACf,CAAC;YAED,MAAM,KAAK,GAAQ,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAClE,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;CAAA;AAfD,oCAeC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAA0B,OAAkC;IACzF,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,MAAS,EAAE,EAAE;QACnB,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAVD,0CAUC"}