zephyr-xpack-internal 0.0.0-canary-20250324122603 → 0.0.0-canary-20250414122517
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/basehref/basehref-integration.d.ts +34 -0
- package/dist/basehref/basehref-integration.js +87 -0
- package/dist/basehref/basehref-integration.js.map +1 -0
- package/dist/federation-dashboard-legacy/get-build-stats.d.ts +2 -1
- package/dist/federation-dashboard-legacy/get-build-stats.js +2 -2
- package/dist/federation-dashboard-legacy/get-build-stats.js.map +1 -1
- package/dist/hooks/ze-setup-ze-deploy.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/xpack-extract/create-mf-runtime-code.d.ts +2 -2
- package/dist/xpack-extract/create-mf-runtime-code.js +5 -1
- package/dist/xpack-extract/create-mf-runtime-code.js.map +1 -1
- package/dist/xpack-extract/mut-webpack-federated-remotes-config.d.ts +1 -1
- package/dist/xpack-extract/mut-webpack-federated-remotes-config.js +1 -1
- package/dist/xpack-extract/mut-webpack-federated-remotes-config.js.map +1 -1
- package/dist/xpack-extract/ze-xpack-upload-agent.js +2 -1
- package/dist/xpack-extract/ze-xpack-upload-agent.js.map +1 -1
- package/dist/xpack.types.d.ts +4 -0
- package/package.json +3 -3
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { ZephyrEngine } from 'zephyr-agent';
|
|
2
|
+
/** Interface for options that might contain baseHref settings */
|
|
3
|
+
export interface BaseHrefOptions {
|
|
4
|
+
baseHref?: string;
|
|
5
|
+
publicPath?: string;
|
|
6
|
+
}
|
|
7
|
+
/** Options that might be passed to HTML Webpack Plugin */
|
|
8
|
+
export interface HtmlPluginOptions {
|
|
9
|
+
base?: string | {
|
|
10
|
+
href?: string;
|
|
11
|
+
target?: string;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
/** Interface for webpack/rspack compiler */
|
|
15
|
+
export interface WebpackLikeCompiler {
|
|
16
|
+
options: {
|
|
17
|
+
output?: {
|
|
18
|
+
publicPath?: any;
|
|
19
|
+
};
|
|
20
|
+
plugins?: any[];
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Extracts baseHref from available sources with priority:
|
|
25
|
+
*
|
|
26
|
+
* 1. Plugin options
|
|
27
|
+
* 2. HTML Plugin
|
|
28
|
+
* 3. Output.publicPath
|
|
29
|
+
*
|
|
30
|
+
* @param zephyr_engine - ZephyrEngine instance
|
|
31
|
+
* @param compiler - The webpack/rspack compiler object
|
|
32
|
+
* @param pluginOptions - Options passed to the plugin
|
|
33
|
+
*/
|
|
34
|
+
export declare function detectAndStoreBaseHref(zephyr_engine: ZephyrEngine, compiler: WebpackLikeCompiler, pluginOptions?: BaseHrefOptions): void;
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.detectAndStoreBaseHref = detectAndStoreBaseHref;
|
|
4
|
+
/**
|
|
5
|
+
* Extract baseHref from plugin options
|
|
6
|
+
*
|
|
7
|
+
* @param options - Plugin options that might contain baseHref
|
|
8
|
+
* @returns The baseHref value or undefined if not found
|
|
9
|
+
*/
|
|
10
|
+
function extractBaseHrefFromPluginOptions(options) {
|
|
11
|
+
return options?.baseHref;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Extract baseHref from HTML plugin options
|
|
15
|
+
*
|
|
16
|
+
* @param plugins - Array of plugins
|
|
17
|
+
* @returns The baseHref value or undefined if not found
|
|
18
|
+
*/
|
|
19
|
+
function extractBaseHrefFromHtmlPlugin(plugins) {
|
|
20
|
+
// Find HTML plugin
|
|
21
|
+
const htmlPlugin = plugins.find((plugin) => plugin?.constructor?.name === 'HtmlWebpackPlugin' ||
|
|
22
|
+
plugin?.constructor?.name === 'HtmlRspackPlugin');
|
|
23
|
+
if (!htmlPlugin || !htmlPlugin.options) {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
// Extract base from HTML plugin options
|
|
27
|
+
const { base } = htmlPlugin.options;
|
|
28
|
+
if (typeof base === 'string') {
|
|
29
|
+
return base;
|
|
30
|
+
}
|
|
31
|
+
else if (typeof base === 'object' && base?.href) {
|
|
32
|
+
return base.href;
|
|
33
|
+
}
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Extract baseHref from output.publicPath
|
|
38
|
+
*
|
|
39
|
+
* @param compiler - The webpack/rspack compiler object
|
|
40
|
+
* @returns The publicPath value or undefined if not found
|
|
41
|
+
*/
|
|
42
|
+
function extractBaseHrefFromPublicPath(compiler) {
|
|
43
|
+
const publicPath = compiler.options.output?.publicPath;
|
|
44
|
+
// Skip 'auto' value which is a special case in webpack
|
|
45
|
+
if (publicPath === 'auto' || publicPath === undefined) {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
// Handle string publicPath directly
|
|
49
|
+
if (typeof publicPath === 'string') {
|
|
50
|
+
return publicPath;
|
|
51
|
+
}
|
|
52
|
+
// If publicPath is a function, we can't evaluate it here
|
|
53
|
+
// Just log a warning and return undefined
|
|
54
|
+
if (typeof publicPath === 'function') {
|
|
55
|
+
console.warn('Warning: publicPath is a function, cannot extract baseHref automatically.');
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
return undefined;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Extracts baseHref from available sources with priority:
|
|
62
|
+
*
|
|
63
|
+
* 1. Plugin options
|
|
64
|
+
* 2. HTML Plugin
|
|
65
|
+
* 3. Output.publicPath
|
|
66
|
+
*
|
|
67
|
+
* @param zephyr_engine - ZephyrEngine instance
|
|
68
|
+
* @param compiler - The webpack/rspack compiler object
|
|
69
|
+
* @param pluginOptions - Options passed to the plugin
|
|
70
|
+
*/
|
|
71
|
+
function detectAndStoreBaseHref(zephyr_engine, compiler, pluginOptions) {
|
|
72
|
+
// Check for baseHref in plugin options (highest priority)
|
|
73
|
+
let baseHref = extractBaseHrefFromPluginOptions(pluginOptions);
|
|
74
|
+
// Check for baseHref in HTML plugin options (medium priority)
|
|
75
|
+
if (!baseHref && compiler.options?.plugins) {
|
|
76
|
+
baseHref = extractBaseHrefFromHtmlPlugin(compiler.options.plugins);
|
|
77
|
+
}
|
|
78
|
+
// Check for baseHref in output.publicPath (lowest priority)
|
|
79
|
+
if (!baseHref) {
|
|
80
|
+
baseHref = extractBaseHrefFromPublicPath(compiler);
|
|
81
|
+
}
|
|
82
|
+
// Store the baseHref in ZephyrEngine.buildProperties
|
|
83
|
+
if (baseHref !== undefined) {
|
|
84
|
+
zephyr_engine.buildProperties.baseHref = baseHref;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=basehref-integration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"basehref-integration.js","sourceRoot":"","sources":["../../src/basehref/basehref-integration.ts"],"names":[],"mappings":";;AA4GA,wDAsBC;AA1GD;;;;;GAKG;AACH,SAAS,gCAAgC,CAAC,OAAyB;IACjE,OAAO,OAAO,EAAE,QAAQ,CAAC;AAC3B,CAAC;AAED;;;;;GAKG;AACH,SAAS,6BAA6B,CAAC,OAAc;IACnD,mBAAmB;IACnB,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAC7B,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,EAAE,WAAW,EAAE,IAAI,KAAK,mBAAmB;QACjD,MAAM,EAAE,WAAW,EAAE,IAAI,KAAK,kBAAkB,CACnD,CAAC;IAEF,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,wCAAwC;IACxC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,OAA4B,CAAC;IAEzD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;GAKG;AACH,SAAS,6BAA6B,CACpC,QAA6B;IAE7B,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC;IAEvD,uDAAuD;IACvD,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,oCAAoC;IACpC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,yDAAyD;IACzD,0CAA0C;IAC1C,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE,CAAC;QACrC,OAAO,CAAC,IAAI,CACV,2EAA2E,CAC5E,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,sBAAsB,CACpC,aAA2B,EAC3B,QAA6B,EAC7B,aAA+B;IAE/B,0DAA0D;IAC1D,IAAI,QAAQ,GAAG,gCAAgC,CAAC,aAAa,CAAC,CAAC;IAE/D,8DAA8D;IAC9D,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QAC3C,QAAQ,GAAG,6BAA6B,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,4DAA4D;IAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,6BAA6B,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,qDAAqD;IACrD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,aAAa,CAAC,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACpD,CAAC;AACH,CAAC"}
|
|
@@ -9,10 +9,11 @@ interface KnownAgentProps {
|
|
|
9
9
|
mfConfig: ModuleFederationPlugin[] | ModuleFederationPlugin | undefined;
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
-
export declare function getBuildStats<ZephyrAgentProps extends KnownAgentProps>({ stats, stats_json, pluginOptions, EDGE_URL, DOMAIN, PLATFORM, TYPE, }: ZephyrAgentProps & {
|
|
12
|
+
export declare function getBuildStats<ZephyrAgentProps extends KnownAgentProps>({ stats, stats_json, pluginOptions, EDGE_URL, DOMAIN, PLATFORM, TYPE, DELIMITER: delimiter, }: ZephyrAgentProps & {
|
|
13
13
|
EDGE_URL: string;
|
|
14
14
|
DOMAIN?: string;
|
|
15
15
|
PLATFORM?: string;
|
|
16
16
|
TYPE?: string;
|
|
17
|
+
DELIMITER?: string;
|
|
17
18
|
}): Promise<ZephyrBuildStats>;
|
|
18
19
|
export {};
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getBuildStats = getBuildStats;
|
|
4
4
|
const FederationDashboardPlugin_1 = require("./utils/federation-dashboard-plugin/FederationDashboardPlugin");
|
|
5
5
|
const zephyr_agent_1 = require("zephyr-agent");
|
|
6
|
-
async function getBuildStats({ stats, stats_json, pluginOptions, EDGE_URL, DOMAIN, PLATFORM, TYPE, }) {
|
|
6
|
+
async function getBuildStats({ stats, stats_json, pluginOptions, EDGE_URL, DOMAIN, PLATFORM, TYPE, DELIMITER: delimiter = undefined, }) {
|
|
7
7
|
(0, zephyr_agent_1.ze_log)('get build stats started. create federation dashboard plugin');
|
|
8
8
|
const app = pluginOptions.zephyr_engine.applicationProperties;
|
|
9
9
|
const { git } = pluginOptions.zephyr_engine.gitProperties;
|
|
@@ -35,7 +35,7 @@ async function getBuildStats({ stats, stats_json, pluginOptions, EDGE_URL, DOMAI
|
|
|
35
35
|
const data_overrides = {
|
|
36
36
|
id: application_uid,
|
|
37
37
|
name: name,
|
|
38
|
-
edge: { url: EDGE_URL },
|
|
38
|
+
edge: { url: EDGE_URL, delimiter },
|
|
39
39
|
domain: DOMAIN,
|
|
40
40
|
platform: PLATFORM,
|
|
41
41
|
type: TYPE,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-build-stats.js","sourceRoot":"","sources":["../../src/federation-dashboard-legacy/get-build-stats.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"get-build-stats.js","sourceRoot":"","sources":["../../src/federation-dashboard-legacy/get-build-stats.ts"],"names":[],"mappings":";;AAeA,sCAyEC;AAvFD,6GAA0G;AAC1G,+CAA2E;AAapE,KAAK,UAAU,aAAa,CAA2C,EAC5E,KAAK,EACL,UAAU,EACV,aAAa,EACb,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,SAAS,EAAE,SAAS,GAAG,SAAS,GAOjC;IACC,IAAA,qBAAM,EAAC,6DAA6D,CAAC,CAAC;IACtE,MAAM,GAAG,GAAG,aAAa,CAAC,aAAa,CAAC,qBAAqB,CAAC;IAC9D,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,aAAa,CAAC,aAAa,CAAC;IAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC;IACjD,MAAM,eAAe,GAAG,IAAI,qDAAyB,CAAC;QACpD,GAAG;QACH,GAAG;QACH,OAAO,EAAE;YACP,IAAI;SACL;KACF,CAAC,CAAC;IAEH,IAAA,qBAAM,EAAC,qCAAqC,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,eAAe,CAAC,mBAAmB,CAAC;QACzD,KAAK;QACL,UAAU;QACV,aAAa;KACd,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,0BAAW,CAAC,uBAAQ,CAAC,8BAA8B,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC;IAC7D,MAAM,eAAe,GAAG,aAAa,CAAC,aAAa,CAAC,eAAe,CAAC;IACpE,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,QAAQ,CAAC;IAE3D,mDAAmD;IACnD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;QACpD,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;IAE3B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC;IAEjF,MAAM,cAAc,GAAG;QACrB,EAAE,EAAE,eAAe;QACnB,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE;QAClC,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC;QACxC,OAAO;QACP,GAAG;QACH,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACnC,OAAO,EAAE,EAAE,IAAI,EAAE;KAClB,CAAC;IAEF,oBAAoB;IAEpB,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE;QAC5D,OAAO,EAAE,IAAI,EAAE,+BAA+B;QAC9C,IAAI,EAAE,EAAE,EAAE,wDAAwD;KACnE,CAAqB,CAAC;IACvB,IAAA,qBAAM,EAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IACrC,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-setup-ze-deploy.js","sourceRoot":"","sources":["../../src/hooks/ze-setup-ze-deploy.ts"],"names":[],"mappings":";;AAiCA,
|
|
1
|
+
{"version":3,"file":"ze-setup-ze-deploy.js","sourceRoot":"","sources":["../../src/hooks/ze-setup-ze-deploy.ts"],"names":[],"mappings":";;AAiCA,sCAkCC;AAnED,qDAA6D;AAC7D,kFAA4E;AAgC5E,SAAgB,aAAa,CAG3B,aAAgB,EAAE,QAAmB;IACrC,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAErC,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,0CAAkB,EAAE;gBACnC,KAAK;gBACL,UAAU;gBACV,MAAM;gBACN,aAAa;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAC;gBACvC,MAAM,IAAA,wBAAgB,GAAE,CAAC;YAC3B,CAAC;YAED,iDAAiD;YACjD,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -7,3 +7,4 @@ export { getBuildStats } from './federation-dashboard-legacy/get-build-stats';
|
|
|
7
7
|
export { setupZeDeploy } from './hooks/ze-setup-ze-deploy';
|
|
8
8
|
export { logBuildSteps } from './hooks/ze-setup-build-steps-logging';
|
|
9
9
|
export { xpack_zephyr_agent } from './xpack-extract/ze-xpack-upload-agent';
|
|
10
|
+
export { detectAndStoreBaseHref } from './basehref/basehref-integration';
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.xpack_zephyr_agent = exports.logBuildSteps = exports.setupZeDeploy = exports.getBuildStats = exports.buildWebpackAssetMap = exports.xpack_delegate_module_template = exports.mutWebpackFederatedRemotesConfig = exports.makeCopyOfModuleFederationOptions = exports.extractFederatedDependencyPairs = exports.isModuleFederationPlugin = exports.emitDeploymentDone = exports.onDeploymentDone = void 0;
|
|
3
|
+
exports.detectAndStoreBaseHref = exports.xpack_zephyr_agent = exports.logBuildSteps = exports.setupZeDeploy = exports.getBuildStats = exports.buildWebpackAssetMap = exports.xpack_delegate_module_template = exports.mutWebpackFederatedRemotesConfig = exports.makeCopyOfModuleFederationOptions = exports.extractFederatedDependencyPairs = exports.isModuleFederationPlugin = exports.emitDeploymentDone = exports.onDeploymentDone = void 0;
|
|
4
4
|
var lifecycle_events_1 = require("./lifecycle-events");
|
|
5
5
|
Object.defineProperty(exports, "onDeploymentDone", { enumerable: true, get: function () { return lifecycle_events_1.onDeploymentDone; } });
|
|
6
6
|
Object.defineProperty(exports, "emitDeploymentDone", { enumerable: true, get: function () { return lifecycle_events_1.emitDeploymentDone; } });
|
|
@@ -21,4 +21,6 @@ var ze_setup_build_steps_logging_1 = require("./hooks/ze-setup-build-steps-loggi
|
|
|
21
21
|
Object.defineProperty(exports, "logBuildSteps", { enumerable: true, get: function () { return ze_setup_build_steps_logging_1.logBuildSteps; } });
|
|
22
22
|
var ze_xpack_upload_agent_1 = require("./xpack-extract/ze-xpack-upload-agent");
|
|
23
23
|
Object.defineProperty(exports, "xpack_zephyr_agent", { enumerable: true, get: function () { return ze_xpack_upload_agent_1.xpack_zephyr_agent; } });
|
|
24
|
+
var basehref_integration_1 = require("./basehref/basehref-integration");
|
|
25
|
+
Object.defineProperty(exports, "detectAndStoreBaseHref", { enumerable: true, get: function () { return basehref_integration_1.detectAndStoreBaseHref; } });
|
|
24
26
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uDAA0E;AAAjE,oHAAA,gBAAgB,OAAA;AAAE,sHAAA,kBAAkB,OAAA;AAE7C,2FAAuF;AAA9E,uIAAA,wBAAwB,OAAA;AACjC,iDAKyB;AAJvB,gIAAA,+BAA+B,OAAA;AAC/B,kIAAA,iCAAiC,OAAA;AACjC,iIAAA,gCAAgC,OAAA;AAChC,+HAAA,8BAA8B,OAAA;AAEhC,qFAAgF;AAAvE,gIAAA,oBAAoB,OAAA;AAS7B,iFAA8E;AAArE,gHAAA,aAAa,OAAA;AAEtB,iEAA2D;AAAlD,mHAAA,aAAa,OAAA;AACtB,qFAAqE;AAA5D,6HAAA,aAAa,OAAA;AAEtB,+EAA2E;AAAlE,2HAAA,kBAAkB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uDAA0E;AAAjE,oHAAA,gBAAgB,OAAA;AAAE,sHAAA,kBAAkB,OAAA;AAE7C,2FAAuF;AAA9E,uIAAA,wBAAwB,OAAA;AACjC,iDAKyB;AAJvB,gIAAA,+BAA+B,OAAA;AAC/B,kIAAA,iCAAiC,OAAA;AACjC,iIAAA,gCAAgC,OAAA;AAChC,+HAAA,8BAA8B,OAAA;AAEhC,qFAAgF;AAAvE,gIAAA,oBAAoB,OAAA;AAS7B,iFAA8E;AAArE,gHAAA,aAAa,OAAA;AAEtB,iEAA2D;AAAlD,mHAAA,aAAa,OAAA;AACtB,qFAAqE;AAA5D,6HAAA,aAAa,OAAA;AAEtB,+EAA2E;AAAlE,2HAAA,kBAAkB,OAAA;AAE3B,wEAAyE;AAAhE,8HAAA,sBAAsB,OAAA"}
|
package/dist/package.json
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type ZeResolvedDependency } from 'zephyr-agent';
|
|
2
|
-
export declare function createMfRuntimeCode(deps: ZeResolvedDependency, delegate_module_template: () => unknown): string;
|
|
1
|
+
import { ZephyrEngine, type ZeResolvedDependency } from 'zephyr-agent';
|
|
2
|
+
export declare function createMfRuntimeCode(zephyr_engine: ZephyrEngine, deps: ZeResolvedDependency, delegate_module_template: () => unknown | undefined): string;
|
|
3
3
|
export declare function xpack_delegate_module_template(): unknown;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createMfRuntimeCode = createMfRuntimeCode;
|
|
4
4
|
exports.xpack_delegate_module_template = xpack_delegate_module_template;
|
|
5
|
-
function createMfRuntimeCode(deps, delegate_module_template) {
|
|
5
|
+
function createMfRuntimeCode(zephyr_engine, deps, delegate_module_template) {
|
|
6
6
|
// prepare delegate function string template
|
|
7
7
|
const fnReplace = delegate_module_template.toString();
|
|
8
8
|
const strStart = new RegExp(/^function[\W\S]+return new Promise/);
|
|
@@ -10,6 +10,10 @@ function createMfRuntimeCode(deps, delegate_module_template) {
|
|
|
10
10
|
const strEnd = new RegExp(/;[^)}]+}$/);
|
|
11
11
|
const promiseNewPromise = fnReplace.replace(strStart, strNewStart).replace(strEnd, '');
|
|
12
12
|
const { application_uid, remote_entry_url, default_url, name, library_type } = deps;
|
|
13
|
+
// If the builder is `repack` only return the remote url without any changes
|
|
14
|
+
if (zephyr_engine.builder === 'repack') {
|
|
15
|
+
return remote_entry_url;
|
|
16
|
+
}
|
|
13
17
|
return promiseNewPromise
|
|
14
18
|
.replace('__APPLICATION_UID__', application_uid)
|
|
15
19
|
.replace('__REMOTE_ENTRY_URL__', remote_entry_url)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-mf-runtime-code.js","sourceRoot":"","sources":["../../src/xpack-extract/create-mf-runtime-code.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"create-mf-runtime-code.js","sourceRoot":"","sources":["../../src/xpack-extract/create-mf-runtime-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type ZeResolvedDependency } from 'zephyr-agent';
|
|
2
2
|
import { XPackConfiguration } from '../xpack.types';
|
|
3
3
|
import { ZephyrEngine } from 'zephyr-agent';
|
|
4
|
-
export declare function mutWebpackFederatedRemotesConfig<Compiler>(zephyr_engine: ZephyrEngine, config: XPackConfiguration<Compiler>, resolvedDependencyPairs: ZeResolvedDependency[] | null, delegate_module_template?: () => unknown): void;
|
|
4
|
+
export declare function mutWebpackFederatedRemotesConfig<Compiler>(zephyr_engine: ZephyrEngine, config: XPackConfiguration<Compiler>, resolvedDependencyPairs: ZeResolvedDependency[] | null, delegate_module_template?: () => unknown | undefined): void;
|
|
@@ -40,7 +40,7 @@ function mutWebpackFederatedRemotesConfig(zephyr_engine, config, resolvedDepende
|
|
|
40
40
|
// No index signature with a parameter of type string was found on type RemotesObject | (string | RemotesObject)[]
|
|
41
41
|
if (remotes[remote_name]) {
|
|
42
42
|
// @ts-expect-error - read above
|
|
43
|
-
remotes[remote_name] = (0, index_1.createMfRuntimeCode)(resolved_dep, delegate_module_template);
|
|
43
|
+
remotes[remote_name] = (0, index_1.createMfRuntimeCode)(zephyr_engine, resolved_dep, delegate_module_template);
|
|
44
44
|
(0, zephyr_agent_1.ze_log)(`Setting runtime code for remote: ${remotes}`);
|
|
45
45
|
}
|
|
46
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mut-webpack-federated-remotes-config.js","sourceRoot":"","sources":["../../src/xpack-extract/mut-webpack-federated-remotes-config.ts"],"names":[],"mappings":";;AAOA,
|
|
1
|
+
{"version":3,"file":"mut-webpack-federated-remotes-config.js","sourceRoot":"","sources":["../../src/xpack-extract/mut-webpack-federated-remotes-config.ts"],"names":[],"mappings":";;AAOA,4EAmEC;AAzED,mCAA8E;AAC9E,+CAAsC;AAGtC,uFAAiF;AAEjF,SAAgB,gCAAgC,CAC9C,aAA2B,EAC3B,MAAoC,EACpC,uBAAsD,EACtD,2BAAsD,sCAA8B;IAEpF,IAAI,CAAC,uBAAuB,EAAE,MAAM,EAAE,CAAC;QACrC,IAAA,qBAAM,EAAC,iDAAiD,CAAC,CAAC;QAC1D,OAAO;IACT,CAAC;IAED,IAAA,8DAA4B,EAAC,MAAM,EAAE,CAAC,aAAa,EAAE,EAAE;QACrD,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAA,qBAAM,EACJ,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EACxE,aAAa,CACd,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,EAAE,IAAI,IAAI,KAAK,CAAC;QAE1D,IAAA,qBAAM,EAAC,iBAAiB,YAAY,EAAE,CAAC,CAAC;QAExC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,MAAM,CAAC;YAC7C,MAAM,YAAY,GAAG,uBAAuB,CAAC,IAAI,CAC/C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,OAAO,KAAK,cAAc,CACpE,CAAC;YAEF,IAAA,qBAAM,EAAC,gBAAgB,WAAW,qBAAqB,cAAc,EAAE,CAAC,CAAC;YAEzE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,IAAA,qBAAM,EACJ,kDAAkD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EACnF,aAAa,CACd,CAAC;gBACF,OAAO;YACT,CAAC;YAED,0FAA0F;YAC1F,MAAM,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAC1C,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC;gBAC3B,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAElB,IAAA,qBAAM,EAAC,UAAU,KAAK,EAAE,CAAC,CAAC;YAC1B,IAAI,KAAK,EAAE,CAAC;gBACV,YAAY,CAAC,gBAAgB,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjF,IAAA,qBAAM,EAAC,uCAAuC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;YACjF,CAAC;YAED,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC;YACzC,YAAY,CAAC,IAAI,GAAG,WAAW,CAAC;YAChC,yKAAyK;YACzK,kHAAkH;YAClH,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzB,gCAAgC;gBAChC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAA,2BAAmB,EACxC,aAAa,EACb,YAAY,EACZ,wBAAwB,CACzB,CAAC;gBACF,IAAA,qBAAM,EAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;YACxD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -14,7 +14,7 @@ async function xpack_zephyr_agent({ stats, stats_json, assets, pluginOptions, })
|
|
|
14
14
|
wait_for_index_html,
|
|
15
15
|
});
|
|
16
16
|
// webpack dash data
|
|
17
|
-
const { EDGE_URL, PLATFORM } = await zephyr_engine.application_configuration;
|
|
17
|
+
const { EDGE_URL, PLATFORM, DELIMITER } = await zephyr_engine.application_configuration;
|
|
18
18
|
const dashData = await (0, get_build_stats_1.getBuildStats)({
|
|
19
19
|
stats,
|
|
20
20
|
stats_json,
|
|
@@ -22,6 +22,7 @@ async function xpack_zephyr_agent({ stats, stats_json, assets, pluginOptions, })
|
|
|
22
22
|
pluginOptions,
|
|
23
23
|
EDGE_URL,
|
|
24
24
|
PLATFORM,
|
|
25
|
+
DELIMITER,
|
|
25
26
|
});
|
|
26
27
|
await zephyr_engine.upload_assets({
|
|
27
28
|
assetsMap,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-xpack-upload-agent.js","sourceRoot":"","sources":["../../src/xpack-extract/ze-xpack-upload-agent.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"ze-xpack-upload-agent.js","sourceRoot":"","sources":["../../src/xpack-extract/ze-xpack-upload-agent.ts"],"names":[],"mappings":";;AAyBA,gDA6CC;AAtED,+CAAwE;AAOxE,wFAAiF;AACjF,qDAA+D;AAC/D,oFAA+E;AAgBxE,KAAK,UAAU,kBAAkB,CAAqC,EAC3E,KAAK,EACL,UAAU,EACV,MAAM,EACN,aAAa,GACO;IACpB,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;IAE7D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAA,+CAAoB,EAAC,MAAM,EAAE;YACnD,mBAAmB;SACpB,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GACrC,MAAM,aAAa,CAAC,yBAAyB,CAAC;QAEhD,MAAM,QAAQ,GAAG,MAAM,IAAA,+BAAa,EAAC;YACnC,KAAK;YACL,UAAU;YACV,MAAM;YACN,aAAa;YACb,QAAQ;YACR,QAAQ;YACR,SAAS;SACV,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,0BAAkB,GAAE,CAAC;QACrB,gBAAgB;QAChB,IAAA,qBAAM,EAAC,sCAAsC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC"}
|
package/dist/xpack.types.d.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
export interface XPackConfiguration<Compiler> {
|
|
2
2
|
context?: string;
|
|
3
3
|
plugins?: (undefined | null | false | '' | 0 | ((this: Compiler, compiler: Compiler) => void) | WebpackPluginInstance<Compiler>)[];
|
|
4
|
+
output?: {
|
|
5
|
+
publicPath?: string;
|
|
6
|
+
} | any;
|
|
4
7
|
}
|
|
5
8
|
interface WebpackPluginInstance<Compiler> {
|
|
6
9
|
[index: string]: any;
|
|
@@ -59,6 +62,7 @@ export interface XCompiler {
|
|
|
59
62
|
uniqueName: string;
|
|
60
63
|
};
|
|
61
64
|
plugins: ModuleFederationPlugin[];
|
|
65
|
+
name: string | undefined;
|
|
62
66
|
};
|
|
63
67
|
plugins: ModuleFederationPlugin[];
|
|
64
68
|
hooks: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-xpack-internal",
|
|
3
|
-
"version": "0.0.0-canary-
|
|
3
|
+
"version": "0.0.0-canary-20250414122517",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
"@module-federation/automatic-vendor-federation": "^1.2.1",
|
|
10
10
|
"is-ci": "^4.1.0",
|
|
11
11
|
"tslib": "^2.8.1",
|
|
12
|
-
"zephyr-
|
|
13
|
-
"zephyr-
|
|
12
|
+
"zephyr-agent": "0.0.0-canary-20250414122517",
|
|
13
|
+
"zephyr-edge-contract": "0.0.0-canary-20250414122517"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"@typescript-eslint/eslint-plugin": "^8.27.0",
|