zephyr-agent 0.0.0-canary.16 → 0.0.0-canary.17
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/lib/env-variables/index.d.ts +3 -2
- package/dist/lib/env-variables/index.js +6 -6
- package/dist/lib/env-variables/index.js.map +1 -1
- package/dist/lib/transformers/ze-create-manifest.js +12 -18
- package/dist/lib/transformers/ze-create-manifest.js.map +1 -1
- package/dist/zephyr-engine/resolve_remote_dependency.d.ts +0 -1
- package/dist/zephyr-engine/resolve_remote_dependency.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export interface RemoteEntry {
|
|
2
2
|
name: string;
|
|
3
|
+
application_uid: string;
|
|
3
4
|
remote_entry_url: string;
|
|
4
5
|
}
|
|
5
6
|
export { VIRTUAL_SPECIFIER, detectEnvReads, rewriteEnvReadsToVirtualModule, buildImportMap, injectImportMap, buildModulePreload, injectBeforeHeadClose, buildEnvJsonAsset, generateManifestContent, calculateManifestHash, collectZEPublicVars, } from './env-var-rewrites';
|
|
6
|
-
export declare function buildEnvImportMap(
|
|
7
|
+
export declare function buildEnvImportMap(appUid: string, remotes: RemoteEntry[]): Record<string, string>;
|
|
7
8
|
export declare function buildEnvModuleSource(applicationUid: string): string;
|
|
8
|
-
export declare function buildEnvImportMapScript(
|
|
9
|
+
export declare function buildEnvImportMapScript(appUid: string, remotes: RemoteEntry[]): string;
|
|
@@ -16,21 +16,21 @@ Object.defineProperty(exports, "buildEnvJsonAsset", { enumerable: true, get: fun
|
|
|
16
16
|
Object.defineProperty(exports, "generateManifestContent", { enumerable: true, get: function () { return env_var_rewrites_1.generateManifestContent; } });
|
|
17
17
|
Object.defineProperty(exports, "calculateManifestHash", { enumerable: true, get: function () { return env_var_rewrites_1.calculateManifestHash; } });
|
|
18
18
|
Object.defineProperty(exports, "collectZEPublicVars", { enumerable: true, get: function () { return env_var_rewrites_1.collectZEPublicVars; } });
|
|
19
|
-
function buildEnvImportMap(
|
|
19
|
+
function buildEnvImportMap(appUid, remotes) {
|
|
20
20
|
const imports = {};
|
|
21
21
|
// Add the main env module mapping - now points to zephyr-manifest.json
|
|
22
|
-
imports[`env:vars:${
|
|
22
|
+
imports[`env:vars:${appUid}`] = '/zephyr-manifest.json';
|
|
23
23
|
// Add environment variable manifest entries for remotes
|
|
24
24
|
// Note: Module Federation remotes are loaded by MF runtime, not through import maps
|
|
25
25
|
remotes.forEach((remote) => {
|
|
26
|
-
if (remote.
|
|
26
|
+
if (remote.application_uid && remote.remote_entry_url) {
|
|
27
27
|
// Environment variables manifest for the remote
|
|
28
28
|
try {
|
|
29
29
|
const urlStr = remote.remote_entry_url.includes('@')
|
|
30
30
|
? remote.remote_entry_url.split('@')[1]
|
|
31
31
|
: remote.remote_entry_url;
|
|
32
32
|
const origin = new URL(urlStr).origin;
|
|
33
|
-
imports[`env:vars:${remote.
|
|
33
|
+
imports[`env:vars:${remote.application_uid}`] = `${origin}/zephyr-manifest.json`;
|
|
34
34
|
}
|
|
35
35
|
catch (_a) {
|
|
36
36
|
// If URL parsing fails, skip the env:vars entry
|
|
@@ -66,9 +66,9 @@ ${exports}
|
|
|
66
66
|
${defaultExport}
|
|
67
67
|
`;
|
|
68
68
|
}
|
|
69
|
-
function buildEnvImportMapScript(
|
|
69
|
+
function buildEnvImportMapScript(appUid, remotes) {
|
|
70
70
|
const importMap = {
|
|
71
|
-
imports: buildEnvImportMap(
|
|
71
|
+
imports: buildEnvImportMap(appUid, remotes),
|
|
72
72
|
};
|
|
73
73
|
return `<script type="importmap">${JSON.stringify(importMap, null, 2)}</script>`;
|
|
74
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/env-variables/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/env-variables/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,20 +9,16 @@ const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
|
9
9
|
const logging_1 = require("../logging");
|
|
10
10
|
const env_variables_1 = require("../env-variables");
|
|
11
11
|
function convertResolvedDependencies(dependencies) {
|
|
12
|
-
return Object.fromEntries(dependencies.map((dep) =>
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
library_type: dep.library_type,
|
|
23
|
-
},
|
|
24
|
-
];
|
|
25
|
-
}));
|
|
12
|
+
return Object.fromEntries(dependencies.map((dep) => [
|
|
13
|
+
dep.name,
|
|
14
|
+
{
|
|
15
|
+
name: dep.name,
|
|
16
|
+
application_uid: dep.application_uid,
|
|
17
|
+
remote_entry_url: dep.remote_entry_url,
|
|
18
|
+
default_url: dep.default_url,
|
|
19
|
+
library_type: dep.library_type,
|
|
20
|
+
},
|
|
21
|
+
]));
|
|
26
22
|
}
|
|
27
23
|
/**
|
|
28
24
|
* Creates a zephyr-manifest.json file with resolved dependencies and environment
|
|
@@ -42,10 +38,8 @@ function createManifestContent(dependencies, includeEnvVars = true) {
|
|
|
42
38
|
// Build the dependencies object
|
|
43
39
|
const dependenciesMap = {};
|
|
44
40
|
dependencies.forEach((dep) => {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
dependenciesMap[key] = {
|
|
48
|
-
name: key,
|
|
41
|
+
dependenciesMap[dep.name] = {
|
|
42
|
+
name: dep.name,
|
|
49
43
|
application_uid: dep.application_uid,
|
|
50
44
|
remote_entry_url: dep.remote_entry_url,
|
|
51
45
|
default_url: dep.default_url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-create-manifest.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-create-manifest.ts"],"names":[],"mappings":";;AAWA,
|
|
1
|
+
{"version":3,"file":"ze-create-manifest.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-create-manifest.ts"],"names":[],"mappings":";;AAWA,kEAeC;AAUD,oDAWC;AAED,sDA0CC;AAED,kDAgBC;AA7GD,6CAAyC;AACzC,+DAK8B;AAE9B,wCAAoC;AACpC,oDAAuD;AAEvD,SAAgB,2BAA2B,CACzC,YAAoC;IAEpC,OAAO,MAAM,CAAC,WAAW,CACvB,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;QACxB,GAAG,CAAC,IAAI;QACR;YACE,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,YAAY,EAAE,GAAG,CAAC,YAAY;SAC/B;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,oBAAoB,CAClC,YAAoC,EACpC,cAAc,GAAG,IAAI;IAKrB,MAAM,OAAO,GAAG,qBAAqB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE3C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC;AAED,SAAgB,qBAAqB,CACnC,YAAoC,EACpC,cAAc,GAAG,IAAI;IAErB,gBAAM,CAAC,QAAQ,CAAC,sCAAsC,EAAE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,KAAI,CAAC,CAAC,CAAC;IAEnF,gCAAgC;IAChC,MAAM,eAAe,GAAqC,EAAE,CAAC;IAE7D,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC3B,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG;YAC1B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,YAAY,EAAE,GAAG,CAAC,YAAY;SAC/B,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,6BAA6B;IAC7B,MAAM,QAAQ,GAAmB;QAC/B,OAAO,EAAE,8CAAuB;QAChC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,YAAY,EAAE,eAAe;QAC7B,MAAM,EAAE,EAAE;KACX,CAAC;IAEF,yCAAyC;IACzC,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,IAAA,mCAAmB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC;YAC1B,gBAAM,CAAC,QAAQ,CACb,0BAA0B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,mBAAmB,CACzE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,gBAAM,CAAC,QAAQ,CAAC,iBAAiB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;IAEtF,8CAA8C;IAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,mBAAmB,CAAC,OAAe;IACjD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE3C,iCAAiC;IACjC,MAAM,IAAI,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC;SAC9B,MAAM,CAAC,OAAO,GAAG,sBAAsB,CAAC;SACxC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEjB,0BAA0B;IAC1B,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,OAAO;QAChB,IAAI;QACJ,IAAI,EAAE,aAAa,CAAC,MAAM;QAC1B,MAAM,EAAE,aAAa;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -6,7 +6,6 @@ export interface ZeResolvedDependency {
|
|
|
6
6
|
remote_entry_url: string;
|
|
7
7
|
library_type: string;
|
|
8
8
|
platform?: string;
|
|
9
|
-
normalized_js_name?: string;
|
|
10
9
|
}
|
|
11
10
|
export declare function resolve_remote_dependency({ application_uid, version, platform, build_context, }: {
|
|
12
11
|
application_uid: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/zephyr-engine/resolve_remote_dependency.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/zephyr-engine/resolve_remote_dependency.ts"],"names":[],"mappings":";;AAiBA,8DAsFC;;AAvGD,0DAA0B;AAC1B,+DAAuE;AACvE,0CAAsD;AACtD,2DAAoD;AACpD,4CAAwC;AACxC,qDAAqD;AAY9C,KAAK,UAAU,yBAAyB,CAAC,EAC9C,eAAe,EACf,OAAO,EACP,QAAQ,EACR,aAAa,GAMd;IACC,MAAM,MAAM,GACV,IAAA,sCAAe,GAAE;QACjB,GAAG,qCAAc,CAAC,OAAO,GAAG;QAC5B,GAAG,kBAAkB,CAAC,eAAe,CAAC,GAAG;QACzC,GAAG,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IACnC,MAAM,iBAAiB,GAAG,IAAA,uBAAQ,EAAC,MAAM,CAAC,CAAC;IAE3C,IAAI,QAAQ,EAAE,CAAC;QACb,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,CAAC;QACH,gBAAM,CAAC,OAAO,CAAC,+BAA+B,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE9E,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE;YACxD,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,KAAK,EAAE;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,CAAC,CAAC;QAEH,8BAA8B;QAC9B,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEnE,wBAAwB;QACxB,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC1C,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;gBAClD,MAAM,EAAE,eAAe;gBACvB,OAAO;gBACP,WAAW;gBACX,OAAO;gBACP,OAAO;gBACP,IAAI,EAAE;oBACJ,GAAG,EAAE,iBAAiB,CAAC,QAAQ,EAAE;oBACjC,KAAK,EAAE,GAAG,CAAC,IAAI;iBAChB;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC;QAE1B,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnB,gBAAM,CAAC,OAAO,CACZ,sBAAsB,EACtB,QAAQ,CAAC,KAAK,EACd,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,OAAO,CACR,CAAC;YACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;YAClD,MAAM,EAAE,eAAe;YACvB,OAAO;YACP,WAAW;YACX,OAAO;YACP,OAAO;YACP,IAAI,EAAE,EAAE,QAAQ,EAAE;SACnB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,oBAAW;YAAE,MAAM,KAAK,CAAC;QAE9C,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,wCAAwC,EAAE;YACvE,OAAO;YACP,KAAK;SACN,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.0-canary.
|
|
3
|
+
"version": "0.0.0-canary.17",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"tslib": "^2.8.1",
|
|
43
43
|
"uuid": "^8.3.2",
|
|
44
44
|
"ws": "^8.18.3",
|
|
45
|
-
"zephyr-edge-contract": "0.0.0-canary.
|
|
45
|
+
"zephyr-edge-contract": "0.0.0-canary.17"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
48
|
"@jest/globals": "^29.7.0",
|