zephyr-xpack-internal 0.0.0-canary-20250215130754 → 0.0.0-canary-20250228155632

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zephyr-xpack-internal",
3
- "version": "0.0.34",
3
+ "version": "0.0.35",
4
4
  "license": "Apache-2.0",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.extractFederatedDependencyPairs = extractFederatedDependencyPairs;
4
4
  const zephyr_agent_1 = require("zephyr-agent");
5
5
  const iterate_federated_remote_config_1 = require("./iterate-federated-remote-config");
6
+ const zephyr_edge_contract_1 = require("zephyr-edge-contract");
6
7
  function extractFederatedDependencyPairs(config) {
7
8
  const depsPairs = [];
8
9
  const { zephyrDependencies } = (0, zephyr_agent_1.readPackageJson)(config.context ?? process.cwd());
@@ -16,7 +17,7 @@ function extractFederatedDependencyPairs(config) {
16
17
  return;
17
18
  Object.entries(remotesConfig.remotes).map(([remote_name, remote_version]) => {
18
19
  depsPairs.push({
19
- name: remote_name,
20
+ name: (0, zephyr_edge_contract_1.derive_remote_name)(remote_version, remote_name),
20
21
  version: remote_version,
21
22
  });
22
23
  });
@@ -1 +1 @@
1
- {"version":3,"file":"extract-federated-dependency-pairs.js","sourceRoot":"","sources":["../../src/xpack-extract/extract-federated-dependency-pairs.ts"],"names":[],"mappings":";;AASA,0EAyBC;AAlCD,+CAIsB;AAGtB,uFAAiF;AAEjF,SAAgB,+BAA+B,CAC7C,MAA+B;IAE/B,MAAM,SAAS,GAAuB,EAAE,CAAC;IAEzC,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,8BAAe,EAAC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChF,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACzD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAsB,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAA,8DAA4B,EAAC,MAAM,EAAE,CAAC,aAAsC,EAAE,EAAE;QAC9E,IAAI,CAAC,aAAa,EAAE,OAAO;YAAE,OAAO;QACpC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE;YAC1E,SAAS,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,cAAc;aACJ,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS;SACb,IAAI,EAAE;SACN,MAAM,CAAC,CAAC,GAAG,EAA2B,EAAE,CAAC,IAAA,wCAAyB,EAAC,GAAG,CAAC,CAAC,CAAC;AAC9E,CAAC"}
1
+ {"version":3,"file":"extract-federated-dependency-pairs.js","sourceRoot":"","sources":["../../src/xpack-extract/extract-federated-dependency-pairs.ts"],"names":[],"mappings":";;AAUA,0EAyBC;AAnCD,+CAIsB;AAGtB,uFAAiF;AACjF,+DAA0D;AAE1D,SAAgB,+BAA+B,CAC7C,MAA+B;IAE/B,MAAM,SAAS,GAAuB,EAAE,CAAC;IAEzC,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,8BAAe,EAAC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChF,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACzD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAsB,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAA,8DAA4B,EAAC,MAAM,EAAE,CAAC,aAAsC,EAAE,EAAE;QAC9E,IAAI,CAAC,aAAa,EAAE,OAAO;YAAE,OAAO;QACpC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE;YAC1E,SAAS,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,IAAA,yCAAkB,EAAC,cAAc,EAAE,WAAW,CAAC;gBACrD,OAAO,EAAE,cAAc;aACJ,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS;SACb,IAAI,EAAE;SACN,MAAM,CAAC,CAAC,GAAG,EAA2B,EAAE,CAAC,IAAA,wCAAyB,EAAC,GAAG,CAAC,CAAC,CAAC;AAC9E,CAAC"}
@@ -4,36 +4,37 @@ exports.mutWebpackFederatedRemotesConfig = mutWebpackFederatedRemotesConfig;
4
4
  const index_1 = require("./index");
5
5
  const zephyr_agent_1 = require("zephyr-agent");
6
6
  const iterate_federated_remote_config_1 = require("./iterate-federated-remote-config");
7
+ const zephyr_edge_contract_1 = require("zephyr-edge-contract");
7
8
  function mutWebpackFederatedRemotesConfig(zephyr_engine, config, resolvedDependencyPairs, delegate_module_template = index_1.xpack_delegate_module_template) {
8
9
  if (!resolvedDependencyPairs?.length) {
9
- (0, zephyr_agent_1.ze_log)(`No resolved dependency pairs found, skipping...`);
10
+ zephyr_agent_1.ze_log.remotes(`No resolved dependency pairs found, skipping...`);
10
11
  return;
11
12
  }
12
13
  (0, iterate_federated_remote_config_1.iterateFederatedRemoteConfig)(config, (remotesConfig) => {
13
14
  const remotes = remotesConfig?.remotes;
14
15
  if (!remotes) {
15
- (0, zephyr_agent_1.ze_log)(`No remotes found for plugin: ${JSON.stringify(remotesConfig, null, 2)}`, 'skipping...');
16
+ zephyr_agent_1.ze_log.remotes(`No remotes found for plugin: ${JSON.stringify(remotesConfig, null, 2)}`, 'skipping...');
16
17
  return;
17
18
  }
18
19
  const library_type = remotesConfig.library?.type ?? 'var';
19
- (0, zephyr_agent_1.ze_log)(`Library type: ${library_type}`);
20
+ zephyr_agent_1.ze_log.remotes(`Library type: ${library_type}`);
20
21
  Object.entries(remotes).map((remote) => {
21
22
  const [remote_name, remote_version] = remote;
22
- const resolved_dep = resolvedDependencyPairs.find((dep) => dep.name === remote_name && dep.version === remote_version);
23
- (0, zephyr_agent_1.ze_log)(`remote_name: ${remote_name}, remote_version: ${remote_version}`);
23
+ // todo: this is a version with named export logic, we should take this into account later
24
+ const v_app = (0, zephyr_edge_contract_1.derive_remote_name)(remote_version, remote_name);
25
+ const resolved_dep = resolvedDependencyPairs.find((dep) => {
26
+ const matchName = dep.name === v_app || dep.application_uid === v_app;
27
+ const matchVersion = dep.version === remote_version;
28
+ return matchName && matchVersion;
29
+ });
30
+ zephyr_agent_1.ze_log.remotes(`remote_name: ${remote_name}, remote_version: ${remote_version}`);
24
31
  if (!resolved_dep) {
25
- (0, zephyr_agent_1.ze_log)(`Resolved dependency pair not found for remote: ${JSON.stringify(remote, null, 2)}`, 'skipping...');
32
+ zephyr_agent_1.ze_log.remotes(`Resolved dependency pair not found for remote: ${JSON.stringify(remote, null, 2)}`, 'skipping...');
26
33
  return;
27
34
  }
28
- // todo: this is a version with named export logic, we should take this into account later
29
- const [v_app] = remote_version.includes('@')
30
- ? remote_version.split('@')
31
- : [remote_name];
32
- (0, zephyr_agent_1.ze_log)(`v_app: ${v_app}`);
33
- if (v_app) {
34
- resolved_dep.remote_entry_url = [v_app, resolved_dep.remote_entry_url].join('@');
35
- (0, zephyr_agent_1.ze_log)(`Adding version to remote entry url: ${resolved_dep.remote_entry_url}`);
36
- }
35
+ const remote_url = resolved_dep.remote_entry_url;
36
+ resolved_dep.remote_entry_url = [remote_name, remote_url].join('@');
37
+ zephyr_agent_1.ze_log.remotes(`Adding version to remote entry url: ${remote_url}`);
37
38
  resolved_dep.library_type = library_type;
38
39
  resolved_dep.name = remote_name;
39
40
  // @ts-expect-error - TS7053: Element implicitly has an any type because expression of type string can't be used to index type RemotesObject | (string | RemotesObject)[]
@@ -41,7 +42,7 @@ function mutWebpackFederatedRemotesConfig(zephyr_engine, config, resolvedDepende
41
42
  if (remotes[remote_name]) {
42
43
  // @ts-expect-error - read above
43
44
  remotes[remote_name] = (0, index_1.createMfRuntimeCode)(resolved_dep, delegate_module_template);
44
- (0, zephyr_agent_1.ze_log)(`Setting runtime code for remote: ${remotes}`);
45
+ zephyr_agent_1.ze_log.remotes(`Setting runtime code for remote: ${remotes}`);
45
46
  }
46
47
  });
47
48
  });
@@ -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,4EAkEC;AAxED,mCAA8E;AAC9E,+CAAsC;AAGtC,uFAAiF;AAEjF,SAAgB,gCAAgC,CAC9C,aAA2B,EAC3B,MAAoC,EACpC,uBAAsD,EACtD,2BAA0C,sCAA8B;IAExE,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,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"}
1
+ {"version":3,"file":"mut-webpack-federated-remotes-config.js","sourceRoot":"","sources":["../../src/xpack-extract/mut-webpack-federated-remotes-config.ts"],"names":[],"mappings":";;AAQA,4EAgEC;AAvED,mCAA8E;AAC9E,+CAAsC;AAGtC,uFAAiF;AACjF,+DAA0D;AAE1D,SAAgB,gCAAgC,CAC9C,aAA2B,EAC3B,MAAoC,EACpC,uBAAsD,EACtD,2BAA0C,sCAA8B;IAExE,IAAI,CAAC,uBAAuB,EAAE,MAAM,EAAE,CAAC;QACrC,qBAAM,CAAC,OAAO,CAAC,iDAAiD,CAAC,CAAC;QAClE,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,qBAAM,CAAC,OAAO,CACZ,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,qBAAM,CAAC,OAAO,CAAC,iBAAiB,YAAY,EAAE,CAAC,CAAC;QAEhD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,MAAM,CAAC;YAE7C,0FAA0F;YAC1F,MAAM,KAAK,GAAG,IAAA,yCAAkB,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YAE9D,MAAM,YAAY,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gBACxD,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,GAAG,CAAC,eAAe,KAAK,KAAK,CAAC;gBACtE,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,KAAK,cAAc,CAAC;gBACpD,OAAO,SAAS,IAAI,YAAY,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,qBAAM,CAAC,OAAO,CAAC,gBAAgB,WAAW,qBAAqB,cAAc,EAAE,CAAC,CAAC;YAEjF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,qBAAM,CAAC,OAAO,CACZ,kDAAkD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EACnF,aAAa,CACd,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,UAAU,GAAG,YAAY,CAAC,gBAAgB,CAAC;YACjD,YAAY,CAAC,gBAAgB,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpE,qBAAM,CAAC,OAAO,CAAC,uCAAuC,UAAU,EAAE,CAAC,CAAC;YAEpE,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,YAAY,EACZ,wBAAwB,CACzB,CAAC;gBACF,qBAAM,CAAC,OAAO,CAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;YAChE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zephyr-xpack-internal",
3
- "version": "0.0.0-canary-20250215130754",
3
+ "version": "0.0.0-canary-20250228155632",
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": "^3.0.1",
11
11
  "tslib": "^2.3.0",
12
- "zephyr-agent": "0.0.0-canary-20250215130754",
13
- "zephyr-edge-contract": "0.0.0-canary-20250215130754"
12
+ "zephyr-agent": "0.0.0-canary-20250228155632",
13
+ "zephyr-edge-contract": "0.0.0-canary-20250228155632"
14
14
  },
15
15
  "devDependencies": {
16
16
  "@types/is-ci": "^3.0.4",