zephyr-webpack-plugin 0.0.31 → 0.0.32

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-webpack-plugin",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,6 @@
     "tslib": "^2.3.0",
     "webpack": "^5.93.0",
     "zephyr-agent": "workspace:*",
-    "zephyr-edge-contract": "workspace:*",
     "zephyr-xpack-internal": "workspace:*"
   },
   "devDependencies": {

package/dist/webpack-plugin/with-zephyr.js

@@ -10,15 +10,20 @@ function withZephyr(zephyrPluginOptions) {
 exports.withZephyr = withZephyr;
 async function _zephyr_configuration(config, _zephyrOptions) {
     // create instance of ZephyrEngine to track the application
-    const zephyr_engine = await zephyr_agent_1.ZephyrEngine.create(config.context);
+    const zephyr_engine = await zephyr_agent_1.ZephyrEngine.create({
+        builder: 'webpack',
+        context: config.context,
+    });
     // Resolve dependencies and update the config
     const dependencyPairs = (0, zephyr_xpack_internal_1.extractFederatedDependencyPairs)(config);
     const resolved_dependency_pairs = await zephyr_engine.resolve_remote_dependencies(dependencyPairs);
-    (0, zephyr_xpack_internal_1.mutWebpackFederatedRemotesConfig)(config, resolved_dependency_pairs);
+    (0, zephyr_xpack_internal_1.mutWebpackFederatedRemotesConfig)(zephyr_engine, config, resolved_dependency_pairs);
+    const mfConfig = (0, zephyr_xpack_internal_1.makeCopyOfModuleFederationOptions)(config);
+    (0, zephyr_agent_1.ze_log)(`with-zephyr.mfConfig: ${JSON.stringify(mfConfig, null, 2)}`);
     // inject the ZephyrWebpackPlugin
     config.plugins?.push(new ze_webpack_plugin_1.ZeWebpackPlugin({
         zephyr_engine,
-        mfConfig: (0, zephyr_xpack_internal_1.makeCopyOfModuleFederationOptions)(config),
+        mfConfig: mfConfig,
         wait_for_index_html: _zephyrOptions?.wait_for_index_html,
     }));
     return config;

package/dist/webpack-plugin/with-zephyr.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/webpack-plugin/with-zephyr.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAE5C,2DAAsD;AAGtD,iEAI+B;AAE/B,SAAgB,UAAU,CAAC,mBAAgD;IACzE,OAAO,CAAC,MAAqB,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACvF,CAAC;AAFD,gCAEC;AAED,KAAK,UAAU,qBAAqB,CAClC,MAA4B,EAC5B,cAA2C;IAE3C,2DAA2D;IAC3D,MAAM,aAAa,GAAG,MAAM,2BAAY,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEhE,6CAA6C;IAC7C,MAAM,eAAe,GAAG,IAAA,uDAA+B,EAAC,MAAM,CAAC,CAAC;IAChE,MAAM,yBAAyB,GAC7B,MAAM,aAAa,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC;IACnE,IAAA,wDAAgC,EAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;IAEpE,iCAAiC;IACjC,MAAM,CAAC,OAAO,EAAE,IAAI,CAClB,IAAI,mCAAe,CAAC;QAClB,aAAa;QACb,QAAQ,EAAE,IAAA,yDAAiC,EAAC,MAAM,CAAC;QACnD,mBAAmB,EAAE,cAAc,EAAE,mBAAmB;KACzD,CAAC,CACH,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/webpack-plugin/with-zephyr.ts"],"names":[],"mappings":";;;AACA,+CAAoD;AAEpD,2DAAsD;AAGtD,iEAI+B;AAE/B,SAAgB,UAAU,CAAC,mBAAgD;IACzE,OAAO,CAAC,MAAqB,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACvF,CAAC;AAFD,gCAEC;AAED,KAAK,UAAU,qBAAqB,CAClC,MAA4B,EAC5B,cAA2C;IAE3C,2DAA2D;IAC3D,MAAM,aAAa,GAAG,MAAM,2BAAY,CAAC,MAAM,CAAC;QAC9C,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC,CAAC;IAEH,6CAA6C;IAC7C,MAAM,eAAe,GAAG,IAAA,uDAA+B,EAAC,MAAM,CAAC,CAAC;IAChE,MAAM,yBAAyB,GAC7B,MAAM,aAAa,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC;IAEnE,IAAA,wDAAgC,EAAC,aAAa,EAAE,MAAM,EAAE,yBAAyB,CAAC,CAAC;IAEnF,MAAM,QAAQ,GAAG,IAAA,yDAAiC,EAAC,MAAM,CAAC,CAAC;IAE3D,IAAA,qBAAM,EAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAErE,iCAAiC;IACjC,MAAM,CAAC,OAAO,EAAE,IAAI,CAClB,IAAI,mCAAe,CAAC;QAClB,aAAa;QACb,QAAQ,EAAE,QAAQ;QAClB,mBAAmB,EAAE,cAAc,EAAE,mBAAmB;KACzD,CAAC,CACH,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/webpack-plugin/ze-webpack-plugin.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZeWebpackPlugin = void 0;
-const ze_setup_build_steps_logging_1 = require("./ze-setup-build-steps-logging");
-const ze_setup_ze_deploy_1 = require("./ze-setup-ze-deploy");
+const zephyr_xpack_internal_1 = require("zephyr-xpack-internal");
 const pluginName = 'ZeWebpackPlugin';
 class ZeWebpackPlugin {
     constructor(options) {
@@ -10,8 +9,8 @@ class ZeWebpackPlugin {
     }
     apply(compiler) {
         this._options.zephyr_engine.buildProperties.output = compiler.outputPath;
-        (0, ze_setup_build_steps_logging_1.logBuildSteps)(this._options, compiler);
-        (0, ze_setup_ze_deploy_1.setupZeDeploy)(this._options, compiler);
+        (0, zephyr_xpack_internal_1.logBuildSteps)(this._options, compiler);
+        (0, zephyr_xpack_internal_1.setupZeDeploy)(this._options, compiler);
     }
 }
 exports.ZeWebpackPlugin = ZeWebpackPlugin;

package/dist/webpack-plugin/ze-webpack-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-webpack-plugin.js","sourceRoot":"","sources":["../../src/webpack-plugin/ze-webpack-plugin.ts"],"names":[],"mappings":";;;AAGA,iFAA+D;AAC/D,6DAAqD;AAGrD,MAAM,UAAU,GAAG,iBAAiB,CAAC;AAarC,MAAa,eAAe;IAG1B,YAAY,OAA+D;QACzE,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;QAEzE,IAAA,4CAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACvC,IAAA,kCAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;CACF;AAbD,0CAaC"}
+{"version":3,"file":"ze-webpack-plugin.js","sourceRoot":"","sources":["../../src/webpack-plugin/ze-webpack-plugin.ts"],"names":[],"mappings":";;;AAGA,iEAI+B;AAE/B,MAAM,UAAU,GAAG,iBAAiB,CAAC;AAarC,MAAa,eAAe;IAG1B,YAAY,OAA+D;QACzE,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;QAEzE,IAAA,qCAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACvC,IAAA,qCAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;CACF;AAbD,0CAaC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-webpack-plugin",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,9 +10,8 @@
     "is-ci": "^3.0.1",
     "tslib": "^2.3.0",
     "webpack": "^5.93.0",
-    "zephyr-agent": "0.0.31",
-    "zephyr-edge-contract": "0.0.31",
-    "zephyr-xpack-internal": "0.0.31"
+    "zephyr-xpack-internal": "0.0.32",
+    "zephyr-agent": "0.0.32"
   },
   "devDependencies": {
     "@types/is-ci": "^3.0.4",

package/dist/webpack-plugin/ze-setup-build-steps-logging.d.ts

@@ -1,5 +0,0 @@
-import { Compiler } from 'webpack';
-import { ZephyrWebpackInternalPluginOptions } from './ze-webpack-plugin';
-export declare function logBuildSteps(pluginOptions: ZephyrWebpackInternalPluginOptions, compiler: Compiler): {
-    buildStartedAt: number;
-};

package/dist/webpack-plugin/ze-setup-build-steps-logging.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logBuildSteps = void 0;
-const zephyr_agent_1 = require("zephyr-agent");
-function logBuildSteps(pluginOptions, compiler) {
-    const { pluginName } = pluginOptions;
-    let buildStartedAt = Date.now();
-    compiler.hooks.beforeCompile.tapAsync(pluginName, async (params, cb) => {
-        buildStartedAt = Date.now();
-        (0, zephyr_agent_1.ze_log)('build started at', buildStartedAt);
-        cb();
-    });
-    compiler.hooks.failed.tap(pluginName, (err) => {
-        (0, zephyr_agent_1.ze_log)(`build failed in ${Date.now() - buildStartedAt}ms`);
-        pluginOptions.zephyr_engine.logger.then((logger) => {
-            logger({
-                level: 'error',
-                action: 'build:failed',
-                message: zephyr_agent_1.ZephyrError.format(err),
-            });
-        });
-    });
-    return { buildStartedAt };
-}
-exports.logBuildSteps = logBuildSteps;
-//# sourceMappingURL=ze-setup-build-steps-logging.js.map

package/dist/webpack-plugin/ze-setup-build-steps-logging.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ze-setup-build-steps-logging.js","sourceRoot":"","sources":["../../src/webpack-plugin/ze-setup-build-steps-logging.ts"],"names":[],"mappings":";;;AAEA,+CAAmD;AAEnD,SAAgB,aAAa,CAC3B,aAAiD,EACjD,QAAkB;IAIlB,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAErC,IAAI,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEhC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;QACrE,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC5B,IAAA,qBAAM,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;QAC3C,EAAE,EAAE,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE;QAC5C,IAAA,qBAAM,EAAC,mBAAmB,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,IAAI,CAAC,CAAC;QAE3D,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACjD,MAAM,CAAC;gBACL,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,cAAc;gBACtB,OAAO,EAAE,0BAAW,CAAC,MAAM,CAAC,GAAG,CAAC;aACjC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC;AA7BD,sCA6BC"}

package/dist/webpack-plugin/ze-setup-ze-deploy.d.ts

@@ -1,3 +0,0 @@
-import { Compiler } from 'webpack';
-import { ZephyrWebpackInternalPluginOptions } from './ze-webpack-plugin';
-export declare function setupZeDeploy(pluginOptions: ZephyrWebpackInternalPluginOptions, compiler: Compiler): void;

package/dist/webpack-plugin/ze-setup-ze-deploy.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupZeDeploy = void 0;
-const tslib_1 = require("tslib");
-const process = tslib_1.__importStar(require("node:process"));
-const ze_webpack_upload_agent_1 = require("./ze-webpack-upload-agent");
-const zephyr_xpack_internal_1 = require("zephyr-xpack-internal");
-function setupZeDeploy(pluginOptions, compiler) {
-    const { pluginName } = pluginOptions;
-    compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
-        compilation.hooks.processAssets.tapPromise({
-            name: pluginName,
-            stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT,
-        }, async (assets) => {
-            const stats = compilation.getStats();
-            const stats_json = compilation.getStats().toJson();
-            await pluginOptions.zephyr_engine.start_new_build();
-            process.nextTick(ze_webpack_upload_agent_1.webpack_zephyr_agent, {
-                stats,
-                stats_json,
-                assets,
-                pluginOptions,
-            });
-            if (!pluginOptions.wait_for_index_html) {
-                await (0, zephyr_xpack_internal_1.onDeploymentDone)();
-            }
-            // empty line to separate logs from other plugins
-            console.log();
-        });
-    });
-}
-exports.setupZeDeploy = setupZeDeploy;
-//# sourceMappingURL=ze-setup-ze-deploy.js.map

package/dist/webpack-plugin/ze-setup-ze-deploy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ze-setup-ze-deploy.js","sourceRoot":"","sources":["../../src/webpack-plugin/ze-setup-ze-deploy.ts"],"names":[],"mappings":";;;;AAAA,8DAAwC;AAGxC,uEAAiE;AACjE,iEAAyD;AAGzD,SAAgB,aAAa,CAC3B,aAAiD,EACjD,QAAkB;IAElB,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IACrC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE;QAC7D,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CACxC;YACE,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,2BAA2B;SAChE,EACD,KAAK,EAAE,MAAM,EAAE,EAAE;YACf,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC;YAEnD,MAAM,aAAa,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC;YAEpD,OAAO,CAAC,QAAQ,CAAC,8CAAoB,EAAE;gBACrC,KAAK;gBACL,UAAU;gBACV,MAAM;gBACN,aAAa;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAC;gBACvC,MAAM,IAAA,wCAAgB,GAAE,CAAC;YAC3B,CAAC;YAED,iDAAiD;YACjD,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAjCD,sCAiCC"}

package/dist/webpack-plugin/ze-webpack-upload-agent.d.ts

@@ -1,10 +0,0 @@
-import type { Stats, StatsCompilation } from 'webpack';
-import { type Source } from 'zephyr-edge-contract';
-import { ZephyrWebpackInternalPluginOptions } from './ze-webpack-plugin';
-export interface ZephyrAgentProps {
-    stats: Stats;
-    stats_json: StatsCompilation;
-    pluginOptions: ZephyrWebpackInternalPluginOptions;
-    assets: Record<string, Source>;
-}
-export declare function webpack_zephyr_agent({ stats, stats_json, assets, pluginOptions, }: ZephyrAgentProps): Promise<void>;

package/dist/webpack-plugin/ze-webpack-upload-agent.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpack_zephyr_agent = void 0;
-const zephyr_agent_1 = require("zephyr-agent");
-const zephyr_xpack_internal_1 = require("zephyr-xpack-internal");
-async function webpack_zephyr_agent({ stats, stats_json, assets, pluginOptions, }) {
-    (0, zephyr_agent_1.ze_log)('Initiating: Zephyr Webpack Upload Agent');
-    const zeStart = Date.now();
-    const { wait_for_index_html, zephyr_engine } = pluginOptions;
-    try {
-        const assetsMap = await (0, zephyr_xpack_internal_1.buildWebpackAssetMap)(assets, {
-            wait_for_index_html,
-        });
-        // webpack dash data
-        const { EDGE_URL, PLATFORM } = await zephyr_engine.application_configuration;
-        const dashData = await (0, zephyr_xpack_internal_1.getBuildStats)({
-            stats,
-            stats_json,
-            assets,
-            pluginOptions,
-            EDGE_URL,
-            PLATFORM,
-        });
-        await zephyr_engine.upload_assets({
-            assetsMap,
-            mfConfig: pluginOptions.mfConfig,
-            buildStats: dashData,
-        });
-    }
-    catch (err) {
-        (0, zephyr_agent_1.logFn)('error', zephyr_agent_1.ZephyrError.format(err));
-    }
-    finally {
-        (0, zephyr_xpack_internal_1.emitDeploymentDone)();
-        // todo: log end
-        (0, zephyr_agent_1.ze_log)('Zephyr Webpack Upload Agent: Done in', Date.now() - zeStart, 'ms');
-    }
-}
-exports.webpack_zephyr_agent = webpack_zephyr_agent;
-//# sourceMappingURL=ze-webpack-upload-agent.js.map

package/dist/webpack-plugin/ze-webpack-upload-agent.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ze-webpack-upload-agent.js","sourceRoot":"","sources":["../../src/webpack-plugin/ze-webpack-upload-agent.ts"],"names":[],"mappings":";;;AACA,+CAA0D;AAM1D,iEAI+B;AAUxB,KAAK,UAAU,oBAAoB,CAAC,EACzC,KAAK,EACL,UAAU,EACV,MAAM,EACN,aAAa,GACI;IACjB,IAAA,qBAAM,EAAC,yCAAyC,CAAC,CAAC;IAElD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,EAAE,mBAAmB,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC;IAC7D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAA,4CAAoB,EAAC,MAAM,EAAE;YACnD,mBAAmB;SACpB,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CAAC,yBAAyB,CAAC;QAE7E,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAAa,EAAC;YACnC,KAAK;YACL,UAAU;YACV,MAAM;YACN,aAAa;YACb,QAAQ;YACR,QAAQ;SACT,CAAC,CAAC;QAEH,MAAM,aAAa,CAAC,aAAa,CAAC;YAChC,SAAS;YACT,QAAQ,EAAE,aAAa,CAAC,QAGX;YACb,UAAU,EAAE,QAAuC;SACpD,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,oBAAK,EAAC,OAAO,EAAE,0BAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,CAAC;YAAS,CAAC;QACT,IAAA,0CAAkB,GAAE,CAAC;QACrB,gBAAgB;QAChB,IAAA,qBAAM,EAAC,sCAAsC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC;AA1CD,oDA0CC"}