zephyr-webpack-plugin 0.0.7 → 0.0.9

package/src/lib/actions/ze-upload-build-stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;AAAA,+DAK8B;AAEvB,KAAK,UAAU,kBAAkB,CACtC,QAAiB;IAEjB,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,mCAAY,CAAC,cAAc,EAC3B,0CAAmB,CACpB,CAAC;IACF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;YACpC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC9B,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,GAAG,KAAK;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CACX,oEAAoE,CACrE,CAAC;IACJ,CAAC;IACD,OAAO;AACT,CAAC;AA9BD,gDA8BC"}
+{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;AAAA,+DAQ8B;AAEvB,KAAK,UAAU,kBAAkB,CACtC,QAAiB;IAEjB,IAAA,6BAAM,EAAC,iCAAiC,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;IAC/B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,mCAAY,CAAC,cAAc,EAAE,0CAAmB,CAAC,CAAC;IACtE,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAO,EAAgC,GAAG,EAAE;QAC5D,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,SAAS,GAAG,KAAK;YAChC,MAAM,EAAE,kBAAkB;SAC3B;KACF,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;SACzB,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,CAAC,KAAK,CACX,iIAAiI,CAClI,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC;QACpF,IAAA,+BAAQ,EAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QACjC,OAAO,IAAA,+BAAQ,EAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;IAEvD,IAAA,6BAAM,EAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;IAC9C,OAAO,GAAG,CAAC;AACb,CAAC;AA5BD,gDA4BC"}

package/src/lib/actions/ze-upload-snapshot.js

@@ -2,36 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zeUploadSnapshot = void 0;
 const ze_log_event_1 = require("../utils/ze-log-event");
+const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const upload_snapshot_1 = require("../upload/upload-snapshot");
 async function zeUploadSnapshot(pluginOptions, snapshot) {
+    (0, zephyr_edge_contract_1.ze_log)('Uploading snapshot.');
     const { buildEnv } = pluginOptions;
     const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
     const snapUploadMs = Date.now();
-    // logEvent({
-    //   level: 'info',
-    //   action: 'snapshot:upload:started',
-    //   message: `started uploading of ${buildEnv} snapshot to zephyr`,
-    // });
     let error;
     const edgeTodo = await (0, upload_snapshot_1.uploadSnapshot)({
         body: snapshot,
         application_uid: pluginOptions.application_uid,
-    }).catch((err) => (error = err));
+    }).catch((err) => {
+        error = err;
+        (0, zephyr_edge_contract_1.ze_error)('Failed to upload snapshot', err);
+    });
     if (!edgeTodo || error) {
         logEvent({
             level: 'error',
             action: 'snapshot:upload:failed',
             message: `failed uploading of ${buildEnv} snapshot to zephyr`,
         });
+        (0, zephyr_edge_contract_1.ze_error)('Failed to upload snapshot', error);
         return;
     }
-    else {
-        logEvent({
-            level: 'info',
-            action: 'snapshot:upload:done',
-            message: `uploaded ${buildEnv} snapshot in ${Date.now() - snapUploadMs}ms`,
-        });
-    }
+    logEvent({
+        level: 'info',
+        action: 'snapshot:upload:done',
+        message: `uploaded ${buildEnv} snapshot in ${Date.now() - snapUploadMs}ms`,
+    });
     return edgeTodo;
 }
 exports.zeUploadSnapshot = zeUploadSnapshot;

package/src/lib/actions/ze-upload-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAG/C,+DAA2D;AAEpD,KAAK,UAAU,gBAAgB,CACpC,aAAqC,EACrC,QAAkB;IAElB,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEhC,aAAa;IACb,mBAAmB;IACnB,uCAAuC;IACvC,oEAAoE;IACpE,MAAM;IAEN,IAAI,KAAK,CAAC;IACV,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAc,EAAC;QACpC,IAAI,EAAE,QAAQ;QACd,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;IAEjC,IAAI,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC;QACvB,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,wBAAwB;YAChC,OAAO,EAAE,uBAAuB,QAAQ,qBAAqB;SAC9D,CAAC,CAAC;QACH,OAAO;IACT,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,sBAAsB;YAC9B,OAAO,EAAE,YAAY,QAAQ,gBAC3B,IAAI,CAAC,GAAG,EAAE,GAAG,YACf,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAtCD,4CAsCC"}
+{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAC/C,+DAAqF;AAErF,+DAA2D;AAEpD,KAAK,UAAU,gBAAgB,CACpC,aAAqC,EACrC,QAAkB;IAElB,IAAA,6BAAM,EAAC,qBAAqB,CAAC,CAAC;IAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEhC,IAAI,KAAK,CAAC;IACV,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAc,EAAC;QACpC,IAAI,EAAE,QAAQ;QACd,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,KAAK,GAAG,GAAG,CAAC;QACZ,IAAA,+BAAQ,EAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC;QACvB,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,wBAAwB;YAChC,OAAO,EAAE,uBAAuB,QAAQ,qBAAqB;SAC9D,CAAC,CAAC;QACH,IAAA,+BAAQ,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,QAAQ,CAAC;QACP,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,sBAAsB;QAC9B,OAAO,EAAE,YAAY,QAAQ,gBAC3B,IAAI,CAAC,GAAG,EAAE,GAAG,YACf,IAAI;KACL,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC;AArCD,4CAqCC"}

package/src/lib/dependency-resolution/replace-remotes-with-delegates.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceRemotesWithDelegates = void 0;
 const zephyr_delegate_1 = require("../../delegate-module/zephyr-delegate");
+const is_mf_plugin_1 = require("../utils/is-mf-plugin");
 async function replaceRemotesWithDelegates(_config, { org, project }) {
     // this is WebpackOptionsNormalized type but this type is not exported
     const config = _config;
     const depsResolutionTasks = config.plugins
-        ?.filter((plugin) => plugin?.constructor.name.indexOf('ModuleFederationPlugin') !== -1)
+        ?.filter(is_mf_plugin_1.isModuleFederationPlugin)
         ?.map(async (mfConfig) => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return await (0, zephyr_delegate_1.replace_remote_in_mf_config)(mfConfig, { org, project });

package/src/lib/dependency-resolution/replace-remotes-with-delegates.js.map

@@ -1 +1 @@
-{"version":3,"file":"replace-remotes-with-delegates.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/dependency-resolution/replace-remotes-with-delegates.ts"],"names":[],"mappings":";;;AAAA,2EAG+C;AASxC,KAAK,UAAU,2BAA2B,CAC/C,OAAgB,EAChB,EAAE,GAAG,EAAE,OAAO,EAAkB;IAEhC,sEAAsE;IACtE,MAAM,MAAM,GAAG,OAAwB,CAAC;IACxC,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO;QACxC,EAAE,MAAM,CACN,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CACpE;QACD,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACvB,8DAA8D;QAC9D,OAAO,MAAM,IAAA,6CAA2B,EAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC;AAjBD,kEAiBC"}
+{"version":3,"file":"replace-remotes-with-delegates.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/dependency-resolution/replace-remotes-with-delegates.ts"],"names":[],"mappings":";;;AAAA,2EAG+C;AAE/C,wDAAiE;AAQ1D,KAAK,UAAU,2BAA2B,CAC/C,OAAgB,EAChB,EAAE,GAAG,EAAE,OAAO,EAAkB;IAEhC,sEAAsE;IACtE,MAAM,MAAM,GAAG,OAAwB,CAAC;IACxC,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO;QACxC,EAAE,MAAM,CAAC,uCAAwB,CAAC;QAClC,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACvB,8DAA8D;QAC9D,OAAO,MAAM,IAAA,6CAA2B,EAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC;AAdD,kEAcC"}

package/src/lib/payload-builders/ze-build-assets-map.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zeBuildAssetsMap = void 0;
 const ze_log_event_1 = require("../utils/ze-log-event");
+const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const get_ze_build_asset_1 = require("../../utils/get-ze-build-asset");
 const resolve_index_html_1 = require("../../hacks/resolve-index-html");
 function getAssetType(asset) {
@@ -22,6 +23,7 @@ function extractBuffer(asset) {
     }
 }
 async function zeBuildAssetsMap(pluginOptions, assets) {
+    (0, zephyr_edge_contract_1.ze_log)('Building assets map from webpack assets.');
     const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
     const buildAssetMap = Object.keys(assets).reduce((memo, filepath) => {
         const asset = assets[filepath];
@@ -38,6 +40,7 @@ async function zeBuildAssetsMap(pluginOptions, assets) {
         memo[assetMap.hash] = assetMap;
         return memo;
     }, {});
+    (0, zephyr_edge_contract_1.ze_log)('Assets map built. Checking for index.html waiter.');
     if (pluginOptions.wait_for_index_html) {
         const index_html_content = await (0, resolve_index_html_1.onIndexHtmlResolved)();
         const index_html_asset = (0, get_ze_build_asset_1.getZeBuildAsset)({
@@ -45,6 +48,7 @@ async function zeBuildAssetsMap(pluginOptions, assets) {
             content: index_html_content,
         });
         buildAssetMap[index_html_asset.hash] = index_html_asset;
+        (0, zephyr_edge_contract_1.ze_log)('Index.html added to assets map.');
     }
     return buildAssetMap;
 }

package/src/lib/payload-builders/ze-build-assets-map.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-build-assets-map.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/payload-builders/ze-build-assets-map.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAE/C,uEAAiE;AAEjE,uEAAqE;AAErE,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;AAChC,CAAC;AAED,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACtC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,cAAc,CAAC;QACpB,KAAK,cAAc,CAAC;QACpB,KAAK,WAAW,CAAC;QACjB,KAAK,cAAc;YACjB,OAAO,KAAK,EAAE,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,eAAe;YAClB,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB;YACE,OAAO,KAAK,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CACpC,aAAqC,EACrC,MAA8B;IAE9B,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IAEvC,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QAClE,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,QAAQ,CAAC;gBACP,MAAM,EAAE,oCAAoC;gBAC5C,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,uBAAuB,YAAY,CAAC,KAAK,CAAC,EAAE;aACtD,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,oCAAe,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAE/B,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAsB,CAAC,CAAC;IAE3B,IAAI,aAAa,CAAC,mBAAmB,EAAE,CAAC;QACtC,MAAM,kBAAkB,GAAG,MAAM,IAAA,wCAAmB,GAAE,CAAC;QACvD,MAAM,gBAAgB,GAAG,IAAA,oCAAe,EAAC;YACvC,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,kBAAkB;SAC5B,CAAC,CAAC;QACH,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC;IAC1D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAnCD,4CAmCC"}
+{"version":3,"file":"ze-build-assets-map.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/payload-builders/ze-build-assets-map.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAC/C,+DAAsF;AACtF,uEAAiE;AAEjE,uEAAqE;AAErE,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;AAChC,CAAC;AAED,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACtC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,cAAc,CAAC;QACpB,KAAK,cAAc,CAAC;QACpB,KAAK,WAAW,CAAC;QACjB,KAAK,cAAc;YACjB,OAAO,KAAK,EAAE,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,eAAe;YAClB,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB;YACE,OAAO,KAAK,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CACpC,aAAqC,EACrC,MAA8B;IAE9B,IAAA,6BAAM,EAAC,0CAA0C,CAAC,CAAC;IAEnD,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QAClE,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,QAAQ,CAAC;gBACP,MAAM,EAAE,oCAAoC;gBAC5C,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,uBAAuB,YAAY,CAAC,KAAK,CAAC,EAAE;aACtD,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,oCAAe,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAE/B,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAsB,CAAC,CAAC;IAE3B,IAAA,6BAAM,EAAC,mDAAmD,CAAC,CAAC;IAC5D,IAAI,aAAa,CAAC,mBAAmB,EAAE,CAAC;QACtC,MAAM,kBAAkB,GAAG,MAAM,IAAA,wCAAmB,GAAE,CAAC;QACvD,MAAM,gBAAgB,GAAG,IAAA,oCAAe,EAAC;YACvC,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,kBAAkB;SAC5B,CAAC,CAAC;QACH,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC;QACxD,IAAA,6BAAM,EAAC,iCAAiC,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAtCD,4CAsCC"}

package/src/lib/payload-builders/ze-build-snapshot.js

@@ -4,6 +4,7 @@ exports.createSnapshot = void 0;
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const isCI = require("is-ci");
 function createSnapshot({ options, assets, username, email, }) {
+    (0, zephyr_edge_contract_1.ze_log)('Creating snapshot object.');
     const version_postfix = isCI
         ? `${options.git.branch}.${options.zeConfig.buildId}`
         : `${options.zeConfig.user}.${options.zeConfig.buildId}`;

package/src/lib/payload-builders/ze-build-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-build-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/payload-builders/ze-build-snapshot.ts"],"names":[],"mappings":";;;AAAA,+DAM8B;AAE9B,8BAA8B;AAE9B,SAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,MAAM,EACN,QAAQ,EACR,KAAK,GAMN;IACC,MAAM,eAAe,GAAG,IAAI;QAC1B,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE;QACrD,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC3D,OAAO;QACL,eAAe,EAAE,IAAA,wCAAiB,EAAC,OAAO,CAAC,GAAG,CAAC;QAC/C,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,EAAE;QACpD,WAAW,EAAE,IAAA,uCAAgB,EAAC,OAAO,CAAC;QACtC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ;QACjC,GAAG,EAAE;YACH,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAQ;YAChC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;YAC1B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;YACzB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;SACrB;QACD,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,KAAK;SACN;QACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,IAAY,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;YACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAmC,CACpC;KACF,CAAC;AACJ,CAAC;AA1CD,wCA0CC"}
+{"version":3,"file":"ze-build-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/payload-builders/ze-build-snapshot.ts"],"names":[],"mappings":";;;AAAA,+DAM8B;AAE9B,8BAA8B;AAE9B,SAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,MAAM,EACN,QAAQ,EACR,KAAK,GAMN;IACC,IAAA,6BAAM,EAAC,2BAA2B,CAAC,CAAC;IACpC,MAAM,eAAe,GAAG,IAAI;QAC1B,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE;QACrD,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC3D,OAAO;QACL,eAAe,EAAE,IAAA,wCAAiB,EAAC,OAAO,CAAC,GAAG,CAAC;QAC/C,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,EAAE;QACpD,WAAW,EAAE,IAAA,uCAAgB,EAAC,OAAO,CAAC;QACtC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ;QACjC,GAAG,EAAE;YACH,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAQ;YAChC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;YAC1B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;YACzB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;SACrB;QACD,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,KAAK;SACN;QACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,IAAY,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;YACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAmC,CACpC;KACF,CAAC;AACJ,CAAC;AA3CD,wCA2CC"}

package/src/lib/upload/upload-envs.js

@@ -2,23 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadEnvs = void 0;
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const ze_http_request_1 = require("../utils/ze-http-request");
 async function uploadEnvs({ body, application_uid, }) {
+    (0, zephyr_edge_contract_1.ze_log)(`Uploading envs to Zephyr, for ${application_uid}`);
     const type = 'envs';
     const data = JSON.stringify(body);
     const { EDGE_URL, jwt } = await (0, zephyr_edge_contract_1.getApplicationConfiguration)({
         application_uid,
     });
+    const url = new URL('/upload', EDGE_URL);
+    url.searchParams.append('type', type);
     const options = {
-        path: `/upload?type=${type}`,
         method: 'POST',
         headers: {
             can_write_jwt: jwt,
+            'Content-Type': 'application/json',
             'Content-Length': data.length.toString(),
         },
     };
-    options.headers['Content-Type'] = 'application/json';
-    return (0, ze_http_request_1.request)(EDGE_URL, options, data);
+    return (0, zephyr_edge_contract_1.request)(EDGE_URL, options, data);
 }
 exports.uploadEnvs = uploadEnvs;
 //# sourceMappingURL=upload-envs.js.map

package/src/lib/upload/upload-envs.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-envs.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/upload/upload-envs.ts"],"names":[],"mappings":";;;AAAA,+DAG8B;AAC9B,8DAAmE;AAE5D,KAAK,UAAU,UAAU,CAAC,EAC/B,IAAI,EACJ,eAAe,GAIhB;IACC,MAAM,IAAI,GAAG,MAAM,CAAC;IACpB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAElC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAyD;QACpE,IAAI,EAAE,gBAAgB,IAAI,EAAE;QAC5B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,GAAG;YAClB,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;SACzC;KACF,CAAC;IAEF,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;IAErD,OAAO,IAAA,yBAAO,EAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC;AA1BD,gCA0BC"}
+{"version":3,"file":"upload-envs.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/upload/upload-envs.ts"],"names":[],"mappings":";;;AACA,+DAAwG;AAEjG,KAAK,UAAU,UAAU,CAAC,EACE,IAAI,EACJ,eAAe,GAIjD;IACC,IAAA,6BAAM,EAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,MAAM,CAAC;IACpB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAElC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,MAAM,OAAO,GAAsB;QACjC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,GAAG;YAClB,cAAc,EAAE,kBAAkB;YAClC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;SACzC;KACF,CAAC;IAEF,OAAO,IAAA,8BAAO,EAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC;AA3BD,gCA2BC"}

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFile = void 0;
-const ze_http_request_1 = require("../utils/ze-http-request");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 async function uploadFile({ id, asset, application_uid, }) {
     const type = 'file';
@@ -16,16 +15,18 @@ async function uploadFile({ id, asset, application_uid, }) {
         application_uid,
     });
     const options = {
-        path: `/upload?type=${type}&id=${id}`,
         method: 'POST',
         headers: {
+            'x-file-size': asset.size.toString(),
+            'x-file-path': asset.path,
+            'x-file-meta': JSON.stringify(meta),
             can_write_jwt: jwt,
         },
     };
-    // options.headers['Content-Type'] = 'application/octet';
-    options.headers['x-file-path'] = asset.path;
-    options.headers['x-file-meta'] = JSON.stringify(meta);
-    return (0, ze_http_request_1.request)(EDGE_URL, options, asset.buffer);
+    const url = new URL('/upload', EDGE_URL);
+    url.searchParams.append('type', type);
+    url.searchParams.append('id', id);
+    return (0, zephyr_edge_contract_1.request)(url, options, asset.buffer);
 }
 exports.uploadFile = uploadFile;
 //# sourceMappingURL=upload-file.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"upload-file.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/upload/upload-file.ts"],"names":[],"mappings":";;;AAAA,8DAAmE;AACnE,+DAG8B;AAEvB,KAAK,UAAU,UAAU,CAAC,EAC/B,EAAE,EACF,KAAK,EACL,eAAe,GAKhB;IACC,MAAM,IAAI,GAAG,MAAM,CAAC;IACpB,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAyD;QACpE,IAAI,EAAE,gBAAgB,IAAI,OAAO,EAAE,EAAE;QACrC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,GAAG;SACnB;KACF,CAAC;IAEF,yDAAyD;IACzD,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAC5C,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEtD,OAAO,IAAA,yBAAO,EAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;AAClD,CAAC;AAnCD,gCAmCC"}
+{"version":3,"file":"upload-file.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/upload/upload-file.ts"],"names":[],"mappings":";;;AACA,+DAA6F;AAEtF,KAAK,UAAU,UAAU,CAAC,EACE,EAAE,EACF,KAAK,EACL,eAAe,GAKjD;IACC,MAAM,IAAI,GAAG,MAAM,CAAC;IACpB,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAsB;QACjC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;YACpC,aAAa,EAAE,KAAK,CAAC,IAAI;YACzB,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YACnC,aAAa,EAAE,GAAG;SACnB;KACF,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,IAAA,8BAAO,EAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AApCD,gCAoCC"}

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

@@ -2,25 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadSnapshot = void 0;
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const ze_http_request_1 = require("../utils/ze-http-request");
 async function uploadSnapshot({ body, application_uid, }) {
+    (0, zephyr_edge_contract_1.ze_log)('Starting upload of snapshot');
     const { EDGE_URL, jwt } = await (0, zephyr_edge_contract_1.getApplicationConfiguration)({
         application_uid,
     });
     const type = 'snapshot';
     const data = JSON.stringify(body);
+    const url = new URL('/upload', EDGE_URL);
+    url.searchParams.append('type', type);
     const options = {
-        path: `/upload?type=${type}`,
         method: 'POST',
         headers: {
             'Content-Length': data.length.toString(),
+            'Content-Type': 'application/json',
             can_write_jwt: jwt,
         },
     };
-    options.headers['Content-Type'] = 'application/json';
-    const res = await (0, ze_http_request_1.request)(EDGE_URL, options, data);
+    const res = await (0, zephyr_edge_contract_1.request)(url, options, data)
+        .catch((err) => (0, zephyr_edge_contract_1.ze_error)('Failed to upload snapshot', err));
+    (0, zephyr_edge_contract_1.ze_log)('Snapshot uploaded');
     if (!res || typeof res === 'string') {
-        console.error(res);
+        (0, zephyr_edge_contract_1.ze_error)('Failed to upload snapshot', res);
         return;
     }
     return res;

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

@@ -1 +1 @@
-{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/upload/upload-snapshot.ts"],"names":[],"mappings":";;;AAAA,+DAK8B;AAC9B,8DAAmE;AAE5D,KAAK,UAAU,cAAc,CAAC,EACnC,IAAI,EACJ,eAAe,GAIhB;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,UAAU,CAAC;IACxB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,OAAO,GAAyD;QACpE,IAAI,EAAE,gBAAgB,IAAI,EAAE;QAC5B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxC,aAAa,EAAE,GAAG;SACnB;KACF,CAAC;IAEF,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;IAErD,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAO,EAAoB,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAEtE,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO;IACT,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAhCD,wCAgCC"}
+{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/upload/upload-snapshot.ts"],"names":[],"mappings":";;;AACA,+DAO8B;AAGvB,KAAK,UAAU,cAAc,CAAC,EACE,IAAI,EACJ,eAAe,GAIrD;IACC,IAAA,6BAAM,EAAC,6BAA6B,CAAC,CAAC;IACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,UAAU,CAAC;IACxB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,MAAM,OAAO,GAAsB;QACjC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxC,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,GAAG;SACnB;KACF,CAAC;IAEF,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAO,EAAoB,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC;SAC7D,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,+BAAQ,EAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,IAAA,6BAAM,EAAC,mBAAmB,CAAC,CAAC;IAE5B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAA,+BAAQ,EAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAnCD,wCAmCC"}

package/src/lib/utils/is-mf-plugin.d.ts

@@ -0,0 +1,4 @@
+import { Configuration } from 'webpack';
+type Plugin = NonNullable<Configuration['plugins']>[number];
+export declare function isModuleFederationPlugin(plugin?: Plugin): boolean;
+export {};

package/src/lib/utils/is-mf-plugin.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isModuleFederationPlugin = void 0;
+function isModuleFederationPlugin(plugin) {
+    if (!plugin || typeof plugin !== 'object')
+        return false;
+    return (plugin.constructor.name.indexOf('ModuleFederationPlugin') !== -1 ||
+        plugin['name']?.indexOf('ModuleFederationPlugin') !== -1);
+}
+exports.isModuleFederationPlugin = isModuleFederationPlugin;
+//# sourceMappingURL=is-mf-plugin.js.map

package/src/lib/utils/is-mf-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-mf-plugin.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/is-mf-plugin.ts"],"names":[],"mappings":";;;AAIA,SAAgB,wBAAwB,CAAC,MAAe;IACtD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACxD,OAAO,CACL,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CACzD,CAAC;AACJ,CAAC;AAND,4DAMC"}

package/src/lib/utils/ze-log-event.js

@@ -1,15 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = void 0;
-const ze_http_request_1 = require("./ze-http-request");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const log = (v) => console.log(v);
+const zephyr_edge_contract_2 = require("zephyr-edge-contract");
+const debug_1 = require("debug");
+const log = (level, msg) => {
+    if (level === 'error') {
+        return (0, debug_1.enabled)('zephyr:*') ? (0, zephyr_edge_contract_2.ze_error)(msg) : console.error(msg);
+    }
+    return (0, debug_1.enabled)('zephyr:*') ? (0, zephyr_edge_contract_2.ze_log)(msg) : console.log(msg);
+};
 function logger(options) {
     return function logEvent({ level, action, message, meta }) {
         const application_uid = options.application_uid;
         Promise.all([
-            (0, zephyr_edge_contract_1.getApplicationConfiguration)({ application_uid }),
-            (0, zephyr_edge_contract_1.getToken)()
+            (0, zephyr_edge_contract_2.getApplicationConfiguration)({ application_uid }),
+            (0, zephyr_edge_contract_2.getToken)()
         ])
             .then(([application_config, token]) => {
             const { username, user_uuid } = application_config;
@@ -23,7 +29,7 @@ function logger(options) {
             meta = Object.assign({}, meta, {
                 isCI: options.isCI,
                 app: options.app,
-                git: options.git
+                git: options.git,
             });
             const data = JSON.stringify({
                 application_uid,
@@ -35,19 +41,19 @@ function logger(options) {
                 git,
                 message,
                 meta,
-                createdAt
+                createdAt,
             });
             const reqOptions = {
-                path: `/v2/application/logs`,
                 method: 'POST',
                 headers: {
                     Authorization: 'Bearer ' + token,
                     'Content-Type': 'application/json',
-                    'Content-Length': data.length
-                }
+                    'Content-Length': data.length,
+                },
             };
-            log(`[zephyr]: ${message}`);
-            (0, ze_http_request_1.request)(zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT, reqOptions, data).catch(() => void 0);
+            log(level, `[zephyr]: ${message}`);
+            const url = new URL(`/v2/application/logs`, zephyr_edge_contract_2.ZEPHYR_API_ENDPOINT);
+            (0, zephyr_edge_contract_1.request)(url, reqOptions, data).catch(() => void 0);
         });
     };
 }

package/src/lib/utils/ze-log-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/ze-log-event.ts"],"names":[],"mappings":";;;AAAA,uDAA4C;AAC5C,+DAAkG;AAElG,MAAM,GAAG,GAAG,CAAC,CAAU,EAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAmBjD,SAAgB,MAAM,CAAC,OAAsB;IAC3C,OAAO,SAAS,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAmB;QACxE,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC;YACV,IAAA,kDAA2B,EAAC,EAAE,eAAe,EAAE,CAAC;YAChD,IAAA,+BAAQ,GAAE;SAAC,CAAC;aACX,IAAI,CACH,CAAC,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAC3B,kBAAkB,CAAC;YACrB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,CAAC;YAED,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,KAAK,QAAQ,KAAK,SAAS,MAAM,OAAO,EAAE,CAAC;YAChF,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE;gBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC1B,eAAe;gBACf,MAAM,EAAE,SAAS;gBACjB,QAAQ;gBACR,SAAS;gBACT,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,MAAM;gBAClB,GAAG;gBACH,OAAO;gBACP,IAAI;gBACJ,SAAS;aACV,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG;gBACjB,IAAI,EAAE,sBAAsB;gBAC5B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,aAAa,EAAE,SAAS,GAAG,KAAK;oBAChC,cAAc,EAAE,kBAAkB;oBAClC,gBAAgB,EAAE,IAAI,CAAC,MAAM;iBAC9B;aACF,CAAC;YAEF,GAAG,CAAC,aAAa,OAAO,EAAE,CAAC,CAAC;YAC5B,IAAA,yBAAO,EAAC,0CAAmB,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,CAAC,CACF,CAAC;IACN,CAAC,CAAC;AACJ,CAAC;AArDD,wBAqDC"}
+{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/ze-log-event.ts"],"names":[],"mappings":";;;AAAA,+DAA+C;AAC/C,+DAAoH;AACpH,iCAAgC;AAEhC,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,GAAY,EAAQ,EAAE;IAChD,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;QACtB,OAAO,IAAA,eAAO,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,+BAAQ,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,IAAA,eAAO,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,6BAAM,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAC9D,CAAC,CAAC;AAmBF,SAAgB,MAAM,CAAC,OAAsB;IAC3C,OAAO,SAAS,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAmB;QACxE,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC;YACV,IAAA,kDAA2B,EAAC,EAAE,eAAe,EAAE,CAAC;YAChD,IAAA,+BAAQ,GAAE;SAAC,CAAC;aACX,IAAI,CACH,CAAC,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAC3B,kBAAkB,CAAC;YACrB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,CAAC;YAED,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,KAAK,QAAQ,KAAK,SAAS,MAAM,OAAO,EAAE,CAAC;YAChF,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE;gBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC1B,eAAe;gBACf,MAAM,EAAE,SAAS;gBACjB,QAAQ;gBACR,SAAS;gBACT,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,MAAM;gBAClB,GAAG;gBACH,OAAO;gBACP,IAAI;gBACJ,SAAS;aACV,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG;gBACjB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,aAAa,EAAE,SAAS,GAAG,KAAK;oBAChC,cAAc,EAAE,kBAAkB;oBAClC,gBAAgB,EAAE,IAAI,CAAC,MAAM;iBAC9B;aACF,CAAC;YAEF,GAAG,CAAC,KAAK,EAAE,aAAa,OAAO,EAAE,CAAC,CAAC;YACnC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,sBAAsB,EAAE,0CAAmB,CAAC,CAAC;YACjE,IAAA,8BAAO,EAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QACrD,CAAC,CACF,CAAC;IACN,CAAC,CAAC;AACJ,CAAC;AArDD,wBAqDC"}

package/src/lib/with-zephyr.js

@@ -4,11 +4,12 @@ exports.withZephyr = void 0;
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const ze_util_read_package_json_1 = require("./utils/ze-util-read-package-json");
 const ze_util_get_git_info_1 = require("./utils/ze-util-get-git-info");
+const is_mf_plugin_1 = require("./utils/is-mf-plugin");
 const ze_webpack_plugin_1 = require("./ze-webpack-plugin");
 const resolve_remote_dependencies_1 = require("./dependency-resolution/resolve-remote-dependencies");
 function getCopyOfMFOptions(config) {
     return config.plugins
-        ?.filter((plugin) => plugin?.constructor.name.indexOf('ModuleFederationPlugin') !== -1)
+        ?.filter(is_mf_plugin_1.isModuleFederationPlugin)
         .map((mf) => {
         const _mf = mf;
         if (!_mf?._options)
@@ -19,17 +20,24 @@ function getCopyOfMFOptions(config) {
 }
 function withZephyr(_zephyrOptions) {
     return async function configure(config) {
+        (0, zephyr_edge_contract_1.ze_log)('Configuring with Zephyr');
         const packageJson = (0, ze_util_read_package_json_1.getPackageJson)(config.context);
+        (0, zephyr_edge_contract_1.ze_log)('Loaded Package JSON', packageJson);
         if (!packageJson)
             return config;
         const gitInfo = (0, ze_util_get_git_info_1.getGitInfo)();
+        (0, zephyr_edge_contract_1.ze_log)('Loaded Git Info', gitInfo);
         if (!gitInfo?.app.org || !gitInfo?.app.project || !packageJson?.name)
             return config;
+        (0, zephyr_edge_contract_1.ze_log)('Resolving remote dependencies');
         await (0, resolve_remote_dependencies_1.resolve_remote_dependencies)(config, {
             org: gitInfo.app.org,
             project: gitInfo.app.project,
         });
+        (0, zephyr_edge_contract_1.ze_log)('Remote dependencies resolved');
+        (0, zephyr_edge_contract_1.ze_log)('doing zephyr copy of mf options');
         const mfConfigs = getCopyOfMFOptions(config);
+        (0, zephyr_edge_contract_1.ze_log)('Adding Zephyr Webpack Plugin');
         config.plugins?.push(new ze_webpack_plugin_1.ZeWebpackPlugin({
             application_uid: (0, zephyr_edge_contract_1.createFullAppName)({
                 org: gitInfo.app.org,

package/src/lib/with-zephyr.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/with-zephyr.ts"],"names":[],"mappings":";;;AACA,+DAAyD;AAEzD,iFAAmE;AACnE,uEAA0D;AAC1D,2DAAsD;AACtD,qGAAkG;AAGlG,SAAS,kBAAkB,CAAC,MAAqB;IAC/C,OAAO,MAAM,CAAC,OAAO;QACnB,EAAE,MAAM,CACN,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CACpE;SACA,GAAG,CAAC,CAAC,EAAW,EAAE,EAAE;QACnB,MAAM,GAAG,GAAG,EAA2B,CAAC;QACxC,IAAI,CAAC,GAAG,EAAE,QAAQ;YAAE,OAAO;QAE3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAED,SAAgB,UAAU,CAAC,cAAoC;IAC7D,OAAO,KAAK,UAAU,SAAS,CAC7B,MAAqB;QAErB,MAAM,WAAW,GAAG,IAAA,0CAAc,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW;YAAE,OAAO,MAAM,CAAC;QAEhC,MAAM,OAAO,GAAG,IAAA,iCAAU,GAAE,CAAC;QAE7B,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,IAAI;YAClE,OAAO,MAAM,CAAC;QAEhB,MAAM,IAAA,yDAA2B,EAAC,MAAM,EAAE;YACxC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;YACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;SAC7B,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,EAAE,IAAI,CAClB,IAAI,mCAAe,CAAC;YAClB,eAAe,EAAE,IAAA,wCAAiB,EAAC;gBACjC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;gBACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;gBAC5B,IAAI,EAAE,WAAW,EAAE,IAAI;aACxB,CAAC;YACF,GAAG,EAAE;gBACH,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;gBACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;aAC7B;YACD,GAAG,EAAE,OAAO,EAAE,GAAG;YACjB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC1D,mBAAmB,EAAE,cAAc,EAAE,mBAAmB;SACzD,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAvCD,gCAuCC;AAED,6DAA6D;AAC7D,SAAS,kCAAkC;IACzC,2BAA2B;IAC3B,0CAA0C;IAC1C,sDAAsD;IACtD,qBAAqB;IACrB,wBAAwB;IACxB;;;;;;;;;;;;;;;;;;aAkBS;AACX,CAAC"}
+{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/with-zephyr.ts"],"names":[],"mappings":";;;AACA,+DAAiE;AAEjE,iFAAmE;AACnE,uEAA0D;AAC1D,uDAAgE;AAChE,2DAAsD;AACtD,qGAAkG;AAGlG,SAAS,kBAAkB,CAAC,MAAqB;IAC/C,OAAO,MAAM,CAAC,OAAO;QACnB,EAAE,MAAM,CAAC,uCAAwB,CAAC;SACjC,GAAG,CAAC,CAAC,EAAW,EAAE,EAAE;QACnB,MAAM,GAAG,GAAG,EAA2B,CAAC;QACxC,IAAI,CAAC,GAAG,EAAE,QAAQ;YAAE,OAAO;QAE3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAED,SAAgB,UAAU,CAAC,cAAoC;IAC7D,OAAO,KAAK,UAAU,SAAS,CAC7B,MAAqB;QAErB,IAAA,6BAAM,EAAC,yBAAyB,CAAC,CAAC;QAElC,MAAM,WAAW,GAAG,IAAA,0CAAc,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD,IAAA,6BAAM,EAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW;YAAE,OAAO,MAAM,CAAC;QAEhC,MAAM,OAAO,GAAG,IAAA,iCAAU,GAAE,CAAC;QAC7B,IAAA,6BAAM,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAEnC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,IAAI;YAClE,OAAO,MAAM,CAAC;QAEhB,IAAA,6BAAM,EAAC,+BAA+B,CAAC,CAAC;QACxC,MAAM,IAAA,yDAA2B,EAAC,MAAM,EAAE;YACxC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;YACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;SAC7B,CAAC,CAAC;QACH,IAAA,6BAAM,EAAC,8BAA8B,CAAC,CAAC;QAEvC,IAAA,6BAAM,EAAC,iCAAiC,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE7C,IAAA,6BAAM,EAAC,8BAA8B,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,EAAE,IAAI,CAClB,IAAI,mCAAe,CAAC;YAClB,eAAe,EAAE,IAAA,wCAAiB,EAAC;gBACjC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;gBACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;gBAC5B,IAAI,EAAE,WAAW,EAAE,IAAI;aACxB,CAAC;YACF,GAAG,EAAE;gBACH,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;gBACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;aAC7B;YACD,GAAG,EAAE,OAAO,EAAE,GAAG;YACjB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC1D,mBAAmB,EAAE,cAAc,EAAE,mBAAmB;SACzD,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAhDD,gCAgDC;AAED,6DAA6D;AAC7D,SAAS,kCAAkC;IACzC,2BAA2B;IAC3B,0CAA0C;IAC1C,sDAAsD;IACtD,qBAAqB;IACrB,wBAAwB;IACxB;;;;;;;;;;;;;;;;;;aAkBS;AACX,CAAC"}

package/src/lib/ze-agent/index.js

@@ -9,11 +9,10 @@ const ze_upload_assets_1 = require("../actions/ze-upload-assets");
 const ze_upload_build_stats_1 = require("../actions/ze-upload-build-stats");
 const ze_enable_snapshot_on_edge_1 = require("../actions/ze-enable-snapshot-on-edge");
 const ze_log_event_1 = require("../utils/ze-log-event");
-const process = require("node:process");
 const lifecycle_events_1 = require("./lifecycle-events");
 const get_dashboard_data_1 = require("../../federation-dashboard-legacy/get-dashboard-data");
-process.on('message', zephyr_agent);
 async function zephyr_agent({ stats, stats_json, assets, pluginOptions, }) {
+    (0, zephyr_edge_contract_1.ze_log)('zephyr agent started.');
     const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
     const { EDGE_URL, username, email } = await (0, zephyr_edge_contract_1.getApplicationConfiguration)({
         application_uid: pluginOptions.application_uid,
@@ -26,17 +25,17 @@ async function zephyr_agent({ stats, stats_json, assets, pluginOptions, }) {
         username,
         email,
     });
-    const missingAssets = await (0, ze_upload_snapshot_1.zeUploadSnapshot)(pluginOptions, snapshot).catch((_) => void _);
+    const missingAssets = await (0, ze_upload_snapshot_1.zeUploadSnapshot)(pluginOptions, snapshot)
+        .catch((err) => (0, zephyr_edge_contract_1.ze_error)('Failed to upload snapshot.', err));
     if (typeof missingAssets === 'undefined')
-        return;
+        return (0, zephyr_edge_contract_1.ze_error)('Snapshot upload gave no result, exiting');
     const assetsUploadSuccess = await (0, ze_upload_assets_1.zeUploadAssets)(pluginOptions, {
         missingAssets,
         assetsMap,
         count: Object.keys(assets).length,
     });
     if (!assetsUploadSuccess)
-        return;
-    // eslint-disable-next-line
+        return (0, zephyr_edge_contract_1.ze_error)('Failed to upload assets.', assetsUploadSuccess);
     const dashData = (0, get_dashboard_data_1.getDashboardData)({
         stats,
         stats_json,
@@ -46,7 +45,7 @@ async function zephyr_agent({ stats, stats_json, assets, pluginOptions, }) {
     });
     const envs = await (0, ze_upload_build_stats_1.zeUploadBuildStats)(dashData);
     if (!envs)
-        return;
+        return (0, zephyr_edge_contract_1.ze_error)('Did not receive envs from build stats upload. Exiting.');
     await (0, ze_enable_snapshot_on_edge_1.zeEnableSnapshotOnEdge)(pluginOptions, snapshot, envs.value);
     logEvent({
         level: 'info',

package/src/lib/ze-agent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/ze-agent/index.ts"],"names":[],"mappings":";;;AAAA,+DAA2E;AAC3E,iFAA2E;AAC3E,6EAAuE;AACvE,sEAAiE;AACjE,kEAA6D;AAC7D,4EAAsE;AACtE,sFAA+E;AAE/E,wDAA+C;AAE/C,wCAAwC;AACxC,yDAAwD;AACxD,6FAAwF;AAExF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AAS7B,KAAK,UAAU,YAAY,CAAC,EACjC,KAAK,EACL,UAAU,EACV,MAAM,EACN,aAAa,GACI;IACjB,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QACtE,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,SAAS,GAAG,MAAM,IAAA,sCAAgB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAA,kCAAc,EAAC;QAC9B,OAAO,EAAE,aAAa;QACtB,MAAM,EAAE,SAAS;QACjB,QAAQ;QACR,KAAK;KACN,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAgB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,KAAK,CACzE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CACd,CAAC;IACF,IAAI,OAAO,aAAa,KAAK,WAAW;QAAE,OAAO;IAEjD,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAc,EAAC,aAAa,EAAE;QAC9D,aAAa;QACb,SAAS;QACT,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,mBAAmB;QAAE,OAAO;IAEjC,2BAA2B;IAC3B,MAAM,QAAQ,GAAG,IAAA,qCAAgB,EAAC;QAChC,KAAK;QACL,UAAU;QACV,MAAM;QACN,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAA,0CAAkB,EAAC,QAAQ,CAAC,CAAC;IAEhD,IAAI,CAAC,IAAI;QAAE,OAAO;IAElB,MAAM,IAAA,mDAAsB,EAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAElE,QAAQ,CAAC;QACP,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,mBAAmB;QAC3B,OAAO,EAAE,qBAAqB,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,IAAI;KACvD,CAAC,CAAC;IAEH,IAAA,qCAAkB,GAAE,CAAC;AACvB,CAAC;AApDD,oCAoDC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/ze-agent/index.ts"],"names":[],"mappings":";;;AAAA,+DAA6F;AAC7F,iFAA2E;AAC3E,6EAAuE;AACvE,sEAAiE;AACjE,kEAA6D;AAC7D,4EAAsE;AACtE,sFAA+E;AAE/E,wDAA+C;AAE/C,yDAAwD;AACxD,6FAAwF;AASjF,KAAK,UAAU,YAAY,CAAC,EACjC,KAAK,EACL,UAAU,EACV,MAAM,EACN,aAAa,GACI;IACjB,IAAA,6BAAM,EAAC,uBAAuB,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;QACtE,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,SAAS,GAAG,MAAM,IAAA,sCAAgB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAA,kCAAc,EAAC;QAC9B,OAAO,EAAE,aAAa;QACtB,MAAM,EAAE,SAAS;QACjB,QAAQ;QACR,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAgB,EAAC,aAAa,EAAE,QAAQ,CAAC;SAClE,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,+BAAQ,EAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC,CAAC;IAG/D,IAAI,OAAO,aAAa,KAAK,WAAW;QAAE,OAAO,IAAA,+BAAQ,EAAC,yCAAyC,CAAC,CAAC;IAErG,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAc,EAAC,aAAa,EAAE;QAC9D,aAAa;QACb,SAAS;QACT,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM;KAClC,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB;QAAE,OAAO,IAAA,+BAAQ,EAAC,0BAA0B,EAAE,mBAAmB,CAAC,CAAC;IAE3F,MAAM,QAAQ,GAAG,IAAA,qCAAgB,EAAC;QAChC,KAAK;QACL,UAAU;QACV,MAAM;QACN,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,IAAA,0CAAkB,EAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAA,+BAAQ,EAAC,wDAAwD,CAAC,CAAC;IAErF,MAAM,IAAA,mDAAsB,EAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAElE,QAAQ,CAAC;QACP,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,mBAAmB;QAC3B,OAAO,EAAE,qBAAqB,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,IAAI;KACvD,CAAC,CAAC;IAEH,IAAA,qCAAkB,GAAE,CAAC;AACvB,CAAC;AAvDD,oCAuDC"}

package/src/lib/ze-agent/lifecycle-events.js

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onDeploymentDone = exports.emitDeploymentDone = void 0;
 const node_events_1 = require("node:events");
+const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const _lifecycle_events = new node_events_1.EventEmitter();
 const _deployment_done = 'deployment-done';
 function emitDeploymentDone() {
+    (0, zephyr_edge_contract_1.ze_log)('Deployment done');
     _lifecycle_events.emit(_deployment_done);
 }
 exports.emitDeploymentDone = emitDeploymentDone;
 async function onDeploymentDone() {
     return new Promise((resolve) => {
+        (0, zephyr_edge_contract_1.ze_log)('Waiting for deployment done');
         _lifecycle_events.once(_deployment_done, resolve);
     });
 }

package/src/lib/ze-agent/lifecycle-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle-events.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/ze-agent/lifecycle-events.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAE3C,MAAM,iBAAiB,GAAG,IAAI,0BAAY,EAAE,CAAC;AAE7C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAE3C,SAAgB,kBAAkB;IAChC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AAC3C,CAAC;AAFD,gDAEC;AAEM,KAAK,UAAU,gBAAgB;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,4CAIC"}
+{"version":3,"file":"lifecycle-events.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/ze-agent/lifecycle-events.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,+DAA8C;AAE9C,MAAM,iBAAiB,GAAG,IAAI,0BAAY,EAAE,CAAC;AAE7C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAE3C,SAAgB,kBAAkB;IAChC,IAAA,6BAAM,EAAC,iBAAiB,CAAC,CAAC;IAC1B,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AAC3C,CAAC;AAHD,gDAGC;AAEM,KAAK,UAAU,gBAAgB;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAA,6BAAM,EAAC,6BAA6B,CAAC,CAAC;QACtC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC;AALD,4CAKC"}

package/src/lib/ze-setup-build-id.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupZephyrConfig = exports.getBuildId = void 0;
-const ze_http_request_1 = require("./utils/ze-http-request");
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
 const ze_log_event_1 = require("./utils/ze-log-event");
 async function getBuildId(application_uid) {
@@ -10,14 +9,12 @@ async function getBuildId(application_uid) {
     });
     const token = await (0, zephyr_edge_contract_1.getToken)();
     const options = {
-        path: `/`,
-        method: 'GET',
         headers: {
             can_write_jwt: jwt,
             Authorization: 'Bearer ' + token,
         },
     };
-    const resp = await (0, ze_http_request_1.request)(BUILD_ID_ENDPOINT, options);
+    const resp = await (0, zephyr_edge_contract_1.request)(BUILD_ID_ENDPOINT, options);
     if (typeof resp === 'string') {
         throw new Error(resp);
     }
@@ -28,16 +25,21 @@ async function getBuildId(application_uid) {
 }
 exports.getBuildId = getBuildId;
 function setupZephyrConfig(pluginOptions, compiler) {
+    (0, zephyr_edge_contract_1.ze_log)('Setting Get Zephyr Config hook');
     const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
     const { pluginName, zeConfig, application_uid } = pluginOptions;
     compiler.hooks.beforeCompile.tapAsync(pluginName, async (params, cb) => {
+        (0, zephyr_edge_contract_1.ze_log)('Going to check auth token or get it');
         await (0, zephyr_edge_contract_1.checkAuth)();
+        (0, zephyr_edge_contract_1.ze_log)('Got auth token, going to get application configuration');
         const { username, email, EDGE_URL } = await (0, zephyr_edge_contract_1.getApplicationConfiguration)({
             application_uid,
         });
+        (0, zephyr_edge_contract_1.ze_log)('Got application configuration', { username, email, EDGE_URL });
         zeConfig.user = username;
         zeConfig.edge_url = EDGE_URL;
         zeConfig.buildId = void 0;
+        (0, zephyr_edge_contract_1.ze_log)('Going to get build id');
         const buildId = await getBuildId(application_uid).catch((err) => {
             logEvent({
                 level: 'error',
@@ -46,14 +48,16 @@ function setupZephyrConfig(pluginOptions, compiler) {
         ${err.message}\n`,
             });
         });
-        if (buildId) {
-            zeConfig.buildId = buildId;
-            logEvent({
-                level: 'info',
-                action: 'build:get-build-id:done',
-                message: `received build number '${buildId}' for '${zeConfig.user}'`,
-            });
+        if (!buildId) {
+            (0, zephyr_edge_contract_1.ze_error)('Could not get build id');
+            return cb(new Error('Could not get build id'));
         }
+        zeConfig.buildId = buildId;
+        logEvent({
+            level: 'info',
+            action: 'build:get-build-id:done',
+            message: `received build number '${buildId}' for '${zeConfig.user}'`,
+        });
         return cb();
     });
 }

package/src/lib/ze-setup-build-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-setup-build-id.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-build-id.ts"],"names":[],"mappings":";;;AACA,6DAAkD;AAGlD,+DAI8B;AAC9B,uDAA8C;AAEvC,KAAK,UAAU,UAAU,CAC9B,eAAuB;IAEvB,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,EAAE,GACzC,MAAM,IAAA,kDAA2B,EAAC;QAChC,eAAe;KAChB,CAAC,CAAC;IACL,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;IAE/B,MAAM,OAAO,GAAG;QACd,IAAI,EAAE,GAAG;QACT,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,aAAa,EAAE,GAAG;YAClB,aAAa,EAAE,SAAS,GAAG,KAAK;SACjC;KACF,CAAC;IAMF,MAAM,IAAI,GAAG,MAAM,IAAA,yBAAO,EAAc,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAEpE,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,CAAC,EAAE,CAAC;QACtE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,OAAQ,IAA+B,CAAC,SAAS,CAAC,CAAC;AACrD,CAAC;AAhCD,gCAgCC;AAED,SAAgB,iBAAiB,CAC/B,aAAqC,EACrC,QAAkB;IAElB,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;QACrE,MAAM,IAAA,gCAAS,GAAE,CAAC;QAClB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;YACtE,eAAe;SAChB,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;QACzB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC7B,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;QAE1B,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9D,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE,qCAAqC,KAAK;UACjD,GAAG,CAAC,OAAO,IAAI;aAClB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,EAAE,CAAC;YACZ,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;YAC3B,QAAQ,CAAC;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,yBAAyB;gBACjC,OAAO,EAAE,0BAA0B,OAAO,UAAU,QAAQ,CAAC,IAAI,GAAG;aACrE,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAnCD,8CAmCC"}
+{"version":3,"file":"ze-setup-build-id.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-build-id.ts"],"names":[],"mappings":";;;AACA,+DAAmH;AAEnH,uDAA8C;AAEvC,KAAK,UAAU,UAAU,CAC9B,eAAuB;IAEvB,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,EAAE,GACzC,MAAM,IAAA,kDAA2B,EAAC;QAChC,eAAe;KAChB,CAAC,CAAC;IACL,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;IAE/B,MAAM,OAAO,GAAG;QACd,OAAO,EAAE;YACP,aAAa,EAAE,GAAG;YAClB,aAAa,EAAE,SAAS,GAAG,KAAK;SACjC;KACF,CAAC;IAMF,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAO,EAAc,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAEpE,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,CAAC,EAAE,CAAC;QACtE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,OAAQ,IAA+B,CAAC,SAAS,CAAC,CAAC;AACrD,CAAC;AA9BD,gCA8BC;AAED,SAAgB,iBAAiB,CAC/B,aAAqC,EACrC,QAAkB;IAElB,IAAA,6BAAM,EAAC,gCAAgC,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC;IAEhE,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;QACrE,IAAA,6BAAM,EAAC,qCAAqC,CAAC,CAAC;QAC9C,MAAM,IAAA,gCAAS,GAAE,CAAC;QAElB,IAAA,6BAAM,EAAC,wDAAwD,CAAC,CAAC;QACjE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,kDAA2B,EAAC;YACtE,eAAe;SAChB,CAAC,CAAC;QACH,IAAA,6BAAM,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvE,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;QACzB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC7B,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;QAE1B,IAAA,6BAAM,EAAC,uBAAuB,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9D,QAAQ,CAAC;gBACP,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE,qCAAqC,KAAK;UACjD,GAAG,CAAC,OAAO,IAAI;aAClB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAA,+BAAQ,EAAC,wBAAwB,CAAC,CAAC;YACnC,OAAO,EAAE,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;QAC3B,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,yBAAyB;YACjC,OAAO,EAAE,0BAA0B,OAAO,UAAU,QAAQ,CAAC,IAAI,GAAG;SACrE,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AA7CD,8CA6CC"}