zephyr-agent 0.0.50 → 0.0.51
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/index.d.ts +1 -0
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/auth/login.js +2 -2
- package/dist/lib/auth/login.js.map +1 -1
- package/dist/lib/build-context/find-nearest-package-json.js +1 -1
- package/dist/lib/build-context/find-nearest-package-json.js.map +1 -1
- package/dist/lib/build-context/ze-util-get-git-info.js +2 -2
- package/dist/lib/build-context/ze-util-get-git-info.js.map +1 -1
- package/dist/lib/build-context/ze-util-parse-ze-dependencies.d.ts +1 -0
- package/dist/lib/build-context/ze-util-parse-ze-dependencies.js +11 -6
- package/dist/lib/build-context/ze-util-parse-ze-dependencies.js.map +1 -1
- package/dist/lib/build-context/ze-util-read-package-json.js +3 -3
- package/dist/lib/build-context/ze-util-read-package-json.js.map +1 -1
- package/dist/lib/edge-actions/ze-enable-snapshot-on-edge.js +3 -3
- package/dist/lib/edge-actions/ze-enable-snapshot-on-edge.js.map +1 -1
- package/dist/lib/edge-actions/ze-enable-snapshot-on-pages.js +5 -5
- package/dist/lib/edge-actions/ze-enable-snapshot-on-pages.js.map +1 -1
- package/dist/lib/edge-actions/ze-upload-assets.js +3 -3
- package/dist/lib/edge-actions/ze-upload-assets.js.map +1 -1
- package/dist/lib/edge-actions/ze-upload-build-stats.js +4 -4
- package/dist/lib/edge-actions/ze-upload-build-stats.js.map +1 -1
- package/dist/lib/edge-requests/get-application-configuration.js +4 -4
- package/dist/lib/edge-requests/get-application-configuration.js.map +1 -1
- package/dist/lib/edge-requests/get-build-id.js +4 -4
- package/dist/lib/edge-requests/get-build-id.js.map +1 -1
- package/dist/lib/errors/codes.d.ts +4 -4
- package/dist/lib/errors/codes.js +54 -15
- package/dist/lib/errors/codes.js.map +1 -1
- package/dist/lib/hacks/resolve-index-html.js +2 -2
- package/dist/lib/hacks/resolve-index-html.js.map +1 -1
- package/dist/lib/http/http-request.js +3 -3
- package/dist/lib/http/http-request.js.map +1 -1
- package/dist/lib/http/upload-envs.d.ts +1 -1
- package/dist/lib/http/upload-envs.js +2 -2
- package/dist/lib/http/upload-envs.js.map +1 -1
- package/dist/lib/http/upload-snapshot.js +1 -1
- package/dist/lib/http/upload-snapshot.js.map +1 -1
- package/dist/lib/logging/debug.d.ts +30 -1
- package/dist/lib/logging/debug.js +33 -1
- package/dist/lib/logging/debug.js.map +1 -1
- package/dist/lib/logging/ze-log-event.js +0 -6
- package/dist/lib/logging/ze-log-event.js.map +1 -1
- package/dist/lib/node-persist/session-lock.js +3 -3
- package/dist/lib/node-persist/session-lock.js.map +1 -1
- package/dist/lib/transformers/ze-basehref-handler.d.ts +23 -0
- package/dist/lib/transformers/ze-basehref-handler.js +105 -0
- package/dist/lib/transformers/ze-basehref-handler.js.map +1 -0
- package/dist/lib/transformers/ze-build-assets-map.js +2 -2
- package/dist/lib/transformers/ze-build-assets-map.js.map +1 -1
- package/dist/lib/transformers/ze-build-snapshot.js +4 -2
- package/dist/lib/transformers/ze-build-snapshot.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/zephyr-engine/index.d.ts +1 -0
- package/dist/zephyr-engine/index.js +47 -22
- package/dist/zephyr-engine/index.js.map +1 -1
- package/dist/zephyr-engine/resolve_remote_dependency.js +6 -5
- package/dist/zephyr-engine/resolve_remote_dependency.js.map +1 -1
- package/package.json +2 -2
package/dist/lib/errors/codes.js
CHANGED
|
@@ -165,19 +165,19 @@ Please make sure you are logged in with the correct Zephyr account.
|
|
|
165
165
|
*/
|
|
166
166
|
ERR_INVALID_MF_CONFIG: {
|
|
167
167
|
id: '023',
|
|
168
|
-
message: `Library name {{library_name}} must be a valid identifier when using "var" as library type in Module Federation configuration. Either use a valid identifier (e. g. {base_identifier}) or use a different library type (e. g. type: 'global', which assign a property on the global scope instead of declaring a variable). To see a list of valid identifiers, please refer to:
|
|
169
|
-
- Mozilla's documentation on identifiers: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#identifiers
|
|
170
|
-
-
|
|
168
|
+
message: `Library name {{library_name}} must be a valid identifier when using "var" as library type in Module Federation configuration. Either use a valid identifier (e. g. {base_identifier}) or use a different library type (e. g. type: 'global', which assign a property on the global scope instead of declaring a variable). To see a list of valid identifiers, please refer to:
|
|
169
|
+
- Mozilla's documentation on identifiers: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#identifiers
|
|
170
|
+
- The list of Module Federation's available library type: https://github.com/module-federation/core/blob/ae5ee1eedad4565774ea82e30b3d0df7c9921c58/webpack/declarations/WebpackOptions.d.ts#L112
|
|
171
171
|
|
|
172
172
|
You can change the library name to CamelCase to avoid this error.`,
|
|
173
173
|
kind: 'build',
|
|
174
174
|
},
|
|
175
175
|
ERR_INVALID_APP_ID: {
|
|
176
176
|
id: '024',
|
|
177
|
-
message: `Invalid application_uid: {{application_uid}}. Your application_uid is a combination of:
|
|
177
|
+
message: `Invalid application_uid: {{application_uid}}. Your application_uid is a combination of:
|
|
178
178
|
- git organization name
|
|
179
179
|
- git user name
|
|
180
|
-
- name in package.json (They should be the same in your Module Federation configuration if there is any).
|
|
180
|
+
- name in package.json (They should be the same in your Module Federation configuration if there is any).
|
|
181
181
|
Please make sure you have set them correctly in your package.json and git repository. The application_uid will be used to assign subdomain for your application. Read more about the standard of what characters are allowed in domain names in IETF: https://datatracker.ietf.org/doc/html/rfc1035#:~:text=The%20labels%20must%20follow%20the%20rules%20for%20ARPANET%20host%20names.%20%20They%20must%0Astart%20with%20a%20letter%2C%20end%20with%20a%20letter%20or%20digit%2C%20and%20have%20as%20interior%0Acharacters%20only%20letters%2C%20digits%2C%20and%20hyphen.%20%20There%20are%20also%20some%0Arestrictions%20on%20the%20length.%20%20Labels%20must%20be%2063%20characters%20or%20less.`,
|
|
182
182
|
kind: 'build',
|
|
183
183
|
},
|
|
@@ -370,12 +370,33 @@ Please check your network connection and try again.
|
|
|
370
370
|
ERR_RESOLVE_REMOTES: {
|
|
371
371
|
id: '001',
|
|
372
372
|
message: `
|
|
373
|
-
|
|
373
|
+
Failed to resolve remote dependency: {{ appUid }} version {{ version }}
|
|
374
374
|
|
|
375
|
-
|
|
376
|
-
- {{ appName }}
|
|
377
|
-
- {{
|
|
378
|
-
-
|
|
375
|
+
This could be due to one of the following reasons:
|
|
376
|
+
- The remote application '{{ appName }}' has not been built with Zephyr yet
|
|
377
|
+
- The specified version '{{ version }}' does not exist
|
|
378
|
+
- You don't have access to this application
|
|
379
|
+
- The application exists but no environment has been created
|
|
380
|
+
|
|
381
|
+
Steps to resolve:
|
|
382
|
+
1. Ensure the remote application is built with Zephyr first
|
|
383
|
+
2. For newly created applications, create an environment:
|
|
384
|
+
- Go to https://app.zephyr-cloud.io
|
|
385
|
+
- Navigate to your application
|
|
386
|
+
- Create a new environment (e.g., "development" or "production")
|
|
387
|
+
3. Check that the version exists by visiting the dashboard
|
|
388
|
+
4. Verify you have access to {{ orgName }}/{{ projectName }}/{{ appName }}
|
|
389
|
+
5. If you need any version, use "*" as the version in zephyr:dependencies
|
|
390
|
+
|
|
391
|
+
Expected behavior:
|
|
392
|
+
- Remote applications must be built and deployed before they can be consumed
|
|
393
|
+
- Applications must have at least one environment created
|
|
394
|
+
- Version must match an existing build (use "*" for latest)
|
|
395
|
+
- When using "*", at least one version must exist in the application
|
|
396
|
+
- You must have read access to the remote application
|
|
397
|
+
|
|
398
|
+
Application UID format: [app_name].[project_name].[org_name]
|
|
399
|
+
Example: "my-remote.my-project.my-org"
|
|
379
400
|
|
|
380
401
|
`,
|
|
381
402
|
kind: 'config',
|
|
@@ -383,15 +404,33 @@ Note: you can read application uid as follows:
|
|
|
383
404
|
ERR_CANNOT_RESOLVE_APP_NAME_WITH_VERSION: {
|
|
384
405
|
id: '003',
|
|
385
406
|
message: `
|
|
386
|
-
|
|
387
|
-
|
|
407
|
+
Failed to resolve remote application with version {{ version }}
|
|
408
|
+
|
|
409
|
+
This could be due to one of the following reasons:
|
|
410
|
+
- Network error while trying to resolve the dependency
|
|
411
|
+
- Zephyr API is temporarily unavailable
|
|
412
|
+
- Application naming mismatch in configuration
|
|
388
413
|
|
|
389
|
-
|
|
414
|
+
Steps to resolve:
|
|
415
|
+
1. Check your network connection
|
|
416
|
+
2. If using "*" version, ensure at least one version exists
|
|
417
|
+
3. Ensure the application has an environment created in the dashboard
|
|
418
|
+
|
|
419
|
+
Expected behavior:
|
|
420
|
+
- Remote application must have at least one deployed version
|
|
421
|
+
- Application must have at least one environment
|
|
422
|
+
|
|
423
|
+
Application naming is based on:
|
|
424
|
+
- git organization/username
|
|
390
425
|
- git repository name
|
|
391
426
|
- name in package.json
|
|
392
|
-
- name in micro-frontend configuration.
|
|
393
427
|
|
|
394
|
-
|
|
428
|
+
For debugging, check:
|
|
429
|
+
- Your ~/.zephyr folder for cached tokens
|
|
430
|
+
- Network proxy settings if behind corporate firewall
|
|
431
|
+
- API status at https://status.zephyr-cloud.io
|
|
432
|
+
|
|
433
|
+
Documentation: https://docs.zephyr-cloud.io/how-to/mf-guide
|
|
395
434
|
`,
|
|
396
435
|
kind: 'config',
|
|
397
436
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codes.js","sourceRoot":"","sources":["../../../src/lib/errors/codes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"codes.js","sourceRoot":"","sources":["../../../src/lib/errors/codes.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,12 @@ const logging_1 = require("../logging");
|
|
|
7
7
|
const _index_html_emitted = new node_events_1.EventEmitter();
|
|
8
8
|
const _event_name = 'index-html-resolved';
|
|
9
9
|
function resolveIndexHtml(content) {
|
|
10
|
-
|
|
10
|
+
logging_1.ze_log.misc('Index HTML resolved');
|
|
11
11
|
_index_html_emitted.emit(_event_name, content);
|
|
12
12
|
}
|
|
13
13
|
async function onIndexHtmlResolved() {
|
|
14
14
|
return new Promise((resolve, reject) => {
|
|
15
|
-
|
|
15
|
+
logging_1.ze_log.misc('Waiting for index HTML to be resolved');
|
|
16
16
|
// wait for 1 minute (just in case)
|
|
17
17
|
setTimeout(reject, 60000);
|
|
18
18
|
_index_html_emitted.once(_event_name, resolve);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-index-html.js","sourceRoot":"","sources":["../../../src/lib/hacks/resolve-index-html.ts"],"names":[],"mappings":";;AAOA,4CAGC;AAED,kDAOC;AAnBD,6CAA2C;AAC3C,wCAAoC;AAEpC,MAAM,mBAAmB,GAAG,IAAI,0BAAY,EAAE,CAAC;AAE/C,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAE1C,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,
|
|
1
|
+
{"version":3,"file":"resolve-index-html.js","sourceRoot":"","sources":["../../../src/lib/hacks/resolve-index-html.ts"],"names":[],"mappings":";;AAOA,4CAGC;AAED,kDAOC;AAnBD,6CAA2C;AAC3C,wCAAoC;AAEpC,MAAM,mBAAmB,GAAG,IAAI,0BAAY,EAAE,CAAC;AAE/C,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAE1C,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,gBAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACnC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AAEM,KAAK,UAAU,mBAAmB;IACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,gBAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACrD,mCAAmC;QACnC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1B,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -4,10 +4,10 @@ exports.parseUrl = parseUrl;
|
|
|
4
4
|
exports.makeHttpRequest = makeHttpRequest;
|
|
5
5
|
exports.makeRequest = makeRequest;
|
|
6
6
|
exports.unwrapResponse = unwrapResponse;
|
|
7
|
+
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
7
8
|
const errors_1 = require("../errors");
|
|
8
|
-
const token_1 = require("../node-persist/token");
|
|
9
9
|
const debug_1 = require("../logging/debug");
|
|
10
|
-
const
|
|
10
|
+
const token_1 = require("../node-persist/token");
|
|
11
11
|
const fetch_with_retries_1 = require("./fetch-with-retries");
|
|
12
12
|
function applyApiHost(url) {
|
|
13
13
|
// Add a query param hint in preview environments
|
|
@@ -82,7 +82,7 @@ async function makeHttpRequest(url, options = {}, data) {
|
|
|
82
82
|
});
|
|
83
83
|
}
|
|
84
84
|
if (!url.pathname.includes('application/logs')) {
|
|
85
|
-
|
|
85
|
+
debug_1.ze_log.http(message);
|
|
86
86
|
}
|
|
87
87
|
// Only parses data if reply content is json
|
|
88
88
|
const resData = (_c = (0, zephyr_edge_contract_1.safe_json_parse)(resText)) !== null && _c !== void 0 ? _c : resText;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-request.js","sourceRoot":"","sources":["../../../src/lib/http/http-request.ts"],"names":[],"mappings":";;AAuCA,4BAcC;AAuBD,0CAkEC;AAGD,kCAOC;AAGD,wCAQC;AAnKD,sCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"http-request.js","sourceRoot":"","sources":["../../../src/lib/http/http-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { LogEvent } from '../logging/ze-log-event';
|
|
2
1
|
import type { ZeUploadBuildStats } from 'zephyr-edge-contract';
|
|
2
|
+
import type { LogEvent } from '../logging/ze-log-event';
|
|
3
3
|
export declare function uploadEnvs({ body, application_uid, logEvent, }: {
|
|
4
4
|
body: ZeUploadBuildStats;
|
|
5
5
|
application_uid: string;
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.uploadEnvs = uploadEnvs;
|
|
4
4
|
const get_application_configuration_1 = require("../edge-requests/get-application-configuration");
|
|
5
|
+
const errors_1 = require("../errors");
|
|
5
6
|
const logging_1 = require("../logging");
|
|
6
7
|
const http_request_1 = require("./http-request");
|
|
7
|
-
const errors_1 = require("../errors");
|
|
8
8
|
async function uploadEnvs({ body, application_uid, logEvent, }) {
|
|
9
|
-
|
|
9
|
+
logging_1.ze_log.upload(`Uploading envs to Zephyr, for ${application_uid}`);
|
|
10
10
|
const { EDGE_URL, jwt } = await (0, get_application_configuration_1.getApplicationConfiguration)({
|
|
11
11
|
application_uid,
|
|
12
12
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-envs.js","sourceRoot":"","sources":["../../../src/lib/http/upload-envs.ts"],"names":[],"mappings":";;AAOA,gCA4CC;
|
|
1
|
+
{"version":3,"file":"upload-envs.js","sourceRoot":"","sources":["../../../src/lib/http/upload-envs.ts"],"names":[],"mappings":";;AAOA,gCA4CC;AAlDD,kGAA6F;AAC7F,sCAAkD;AAClD,wCAAoC;AAEpC,iDAA6C;AAEtC,KAAK,UAAU,UAAU,CAAC,EAC/B,IAAI,EACJ,eAAe,EACf,QAAQ,GAKT;IACC,gBAAM,CAAC,MAAM,CAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;IAElE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAElC,MAAM,OAAO,GAAgB;QAC3B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;YACpD,cAAc,EAAE,iCAAiC;YACjD,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,MAAM,CAAC,CAAC;IAExC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,0BAAW,EACzC,GAAG,EACH,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CACrB,CAAC;IAEF,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACjB,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,oBAAoB;YAC5B,OAAO,EAAE,sCAAsC;SAChD,CAAC,CAAC;QAEH,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACpF,CAAC;AACH,CAAC"}
|
|
@@ -28,7 +28,7 @@ async function uploadSnapshot({ body, application_uid, }) {
|
|
|
28
28
|
cause,
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
|
-
|
|
31
|
+
logging_1.ze_log.snapshot('Done: snapshot uploaded...', body);
|
|
32
32
|
return resp;
|
|
33
33
|
}
|
|
34
34
|
//# sourceMappingURL=upload-snapshot.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/http/upload-snapshot.ts"],"names":[],"mappings":";;AAMA,wCAsCC;AA3CD,kGAA6F;AAC7F,iDAA6C;AAC7C,sCAAkD;AAClD,wCAAoC;AAE7B,KAAK,UAAU,cAAc,CAAC,EACnC,IAAI,EACJ,eAAe,GAIhB;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAElC,MAAM,OAAO,GAAgB;QAC3B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;YACpD,cAAc,EAAE,iCAAiC;YACjD,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,UAAU,CAAC,CAAC;IAC5C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAE/C,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,0BAAW,EAAoB,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAEnF,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,iBAAiB,EAAE;YAChD,IAAI,EAAE,UAAU;YAChB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"upload-snapshot.js","sourceRoot":"","sources":["../../../src/lib/http/upload-snapshot.ts"],"names":[],"mappings":";;AAMA,wCAsCC;AA3CD,kGAA6F;AAC7F,iDAA6C;AAC7C,sCAAkD;AAClD,wCAAoC;AAE7B,KAAK,UAAU,cAAc,CAAC,EACnC,IAAI,EACJ,eAAe,GAIhB;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,2DAA2B,EAAC;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAElC,MAAM,OAAO,GAAgB;QAC3B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;YACpD,cAAc,EAAE,iCAAiC;YACjD,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,UAAU,CAAC,CAAC;IAC5C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAE/C,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,0BAAW,EAAoB,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAEnF,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,iBAAiB,EAAE;YAChD,IAAI,EAAE,UAAU;YAChB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,gBAAM,CAAC,QAAQ,CAAC,4BAA4B,EAAE,IAAI,CAAC,CAAC;IAEpD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -3,4 +3,33 @@ export declare const brightBlueBgName: string;
|
|
|
3
3
|
export declare const brightYellowBgName: string;
|
|
4
4
|
export declare const brightGreenBgName: string;
|
|
5
5
|
export declare const brightRedBgName: string;
|
|
6
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Debug contexts:
|
|
8
|
+
*
|
|
9
|
+
* - Ze_log.app: Application config information
|
|
10
|
+
* - Ze_log.auth: Authentication and token management
|
|
11
|
+
* - Ze_log.config: Authentication and token management
|
|
12
|
+
* - Ze_log.git: Git configuration and provider
|
|
13
|
+
* - Ze_log.http: http requests
|
|
14
|
+
* - Ze_log.init: Initialization and setup operations
|
|
15
|
+
* - Ze_log.mf: Module Federation config
|
|
16
|
+
* - Ze_log.misc: Miscellaneous
|
|
17
|
+
* - Ze_log.package: Package.json parsing
|
|
18
|
+
* - Ze_log.remotes: Remote dependency resolution
|
|
19
|
+
* - Ze_log.snapshot: Snapshot publish
|
|
20
|
+
* - Ze_log.upload: Asset and build stats upload
|
|
21
|
+
*/
|
|
22
|
+
export declare const ze_log: {
|
|
23
|
+
app: import("debug").Debugger;
|
|
24
|
+
auth: import("debug").Debugger;
|
|
25
|
+
config: import("debug").Debugger;
|
|
26
|
+
git: import("debug").Debugger;
|
|
27
|
+
http: import("debug").Debugger;
|
|
28
|
+
init: import("debug").Debugger;
|
|
29
|
+
mf: import("debug").Debugger;
|
|
30
|
+
misc: import("debug").Debugger;
|
|
31
|
+
package: import("debug").Debugger;
|
|
32
|
+
remotes: import("debug").Debugger;
|
|
33
|
+
snapshot: import("debug").Debugger;
|
|
34
|
+
upload: import("debug").Debugger;
|
|
35
|
+
};
|
|
@@ -11,7 +11,39 @@ exports.brightBlueBgName = (0, picocolor_1.bold)((0, picocolor_1.bgCyanBright)((
|
|
|
11
11
|
exports.brightYellowBgName = (0, picocolor_1.bold)((0, picocolor_1.bgYellowBright)((0, picocolor_1.black)(name)));
|
|
12
12
|
exports.brightGreenBgName = (0, picocolor_1.bold)((0, picocolor_1.bgGreenBright)((0, picocolor_1.black)(name)));
|
|
13
13
|
exports.brightRedBgName = (0, picocolor_1.bold)((0, picocolor_1.bgRedBright)((0, picocolor_1.black)(name)));
|
|
14
|
-
|
|
14
|
+
const createLogger = () => {
|
|
15
|
+
return {
|
|
16
|
+
app: (0, debug_1.debug)('zephyr:app'),
|
|
17
|
+
auth: (0, debug_1.debug)('zephyr:auth'),
|
|
18
|
+
config: (0, debug_1.debug)('zephyr:config'),
|
|
19
|
+
git: (0, debug_1.debug)('zephyr:git'),
|
|
20
|
+
http: (0, debug_1.debug)('zephyr:http'),
|
|
21
|
+
init: (0, debug_1.debug)('zephyr:init'),
|
|
22
|
+
mf: (0, debug_1.debug)('zephyr:mf'),
|
|
23
|
+
misc: (0, debug_1.debug)('zephyr:misc'),
|
|
24
|
+
package: (0, debug_1.debug)('zephyr:package'),
|
|
25
|
+
remotes: (0, debug_1.debug)('zephyr:remotes'),
|
|
26
|
+
snapshot: (0, debug_1.debug)('zephyr:snapshot'),
|
|
27
|
+
upload: (0, debug_1.debug)('zephyr:upload'),
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
/**
|
|
31
|
+
* Debug contexts:
|
|
32
|
+
*
|
|
33
|
+
* - Ze_log.app: Application config information
|
|
34
|
+
* - Ze_log.auth: Authentication and token management
|
|
35
|
+
* - Ze_log.config: Authentication and token management
|
|
36
|
+
* - Ze_log.git: Git configuration and provider
|
|
37
|
+
* - Ze_log.http: http requests
|
|
38
|
+
* - Ze_log.init: Initialization and setup operations
|
|
39
|
+
* - Ze_log.mf: Module Federation config
|
|
40
|
+
* - Ze_log.misc: Miscellaneous
|
|
41
|
+
* - Ze_log.package: Package.json parsing
|
|
42
|
+
* - Ze_log.remotes: Remote dependency resolution
|
|
43
|
+
* - Ze_log.snapshot: Snapshot publish
|
|
44
|
+
* - Ze_log.upload: Asset and build stats upload
|
|
45
|
+
*/
|
|
46
|
+
exports.ze_log = createLogger();
|
|
15
47
|
// If debug mode is not enabled just print whatever console output is
|
|
16
48
|
// If debug mode is enabled print the error from our end
|
|
17
49
|
//# sourceMappingURL=debug.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lib/logging/debug.ts"],"names":[],"mappings":";;;AAAA,uHAAuH;AACvH,iCAA8B;AAC9B,2CAQqB;AAErB,uDAAuD;AACvD,MAAM,IAAI,GAAG,UAAU,CAAC;AAEX,QAAA,UAAU,GAAG,IAAA,eAAG,EAAC,IAAI,CAAC,CAAC;AAEvB,QAAA,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAA,wBAAY,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG,IAAA,gBAAI,EAAC,IAAA,0BAAc,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvD,QAAA,iBAAiB,GAAG,IAAA,gBAAI,EAAC,IAAA,yBAAa,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErD,QAAA,eAAe,GAAG,IAAA,gBAAI,EAAC,IAAA,uBAAW,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lib/logging/debug.ts"],"names":[],"mappings":";;;AAAA,uHAAuH;AACvH,iCAA8B;AAC9B,2CAQqB;AAErB,uDAAuD;AACvD,MAAM,IAAI,GAAG,UAAU,CAAC;AAEX,QAAA,UAAU,GAAG,IAAA,eAAG,EAAC,IAAI,CAAC,CAAC;AAEvB,QAAA,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAA,wBAAY,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG,IAAA,gBAAI,EAAC,IAAA,0BAAc,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEvD,QAAA,iBAAiB,GAAG,IAAA,gBAAI,EAAC,IAAA,yBAAa,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErD,QAAA,eAAe,GAAG,IAAA,gBAAI,EAAC,IAAA,uBAAW,EAAC,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAE9D,MAAM,YAAY,GAAG,GAAG,EAAE;IACxB,OAAO;QACL,GAAG,EAAE,IAAA,aAAK,EAAC,YAAY,CAAC;QACxB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,MAAM,EAAE,IAAA,aAAK,EAAC,eAAe,CAAC;QAC9B,GAAG,EAAE,IAAA,aAAK,EAAC,YAAY,CAAC;QACxB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,EAAE,EAAE,IAAA,aAAK,EAAC,WAAW,CAAC;QACtB,IAAI,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;QAC1B,OAAO,EAAE,IAAA,aAAK,EAAC,gBAAgB,CAAC;QAChC,OAAO,EAAE,IAAA,aAAK,EAAC,gBAAgB,CAAC;QAChC,QAAQ,EAAE,IAAA,aAAK,EAAC,iBAAiB,CAAC;QAClC,MAAM,EAAE,IAAA,aAAK,EAAC,eAAe,CAAC;KAC/B,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACU,QAAA,MAAM,GAAG,YAAY,EAAE,CAAC;AACrC,qEAAqE;AACrE,wDAAwD"}
|
|
@@ -9,13 +9,7 @@ const errors_1 = require("../errors");
|
|
|
9
9
|
const http_request_1 = require("../http/http-request");
|
|
10
10
|
const token_1 = require("../node-persist/token");
|
|
11
11
|
const debug_1 = require("./debug");
|
|
12
|
-
const debug_enabled_1 = require("./debug-enabled");
|
|
13
|
-
const index_1 = require("./index");
|
|
14
12
|
const logFn = (level, msg) => {
|
|
15
|
-
if (debug_enabled_1.is_debug_enabled) {
|
|
16
|
-
(0, index_1.ze_log)(msg);
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
13
|
const formatted = formatLogMsg(msg, level);
|
|
20
14
|
switch (level) {
|
|
21
15
|
case 'warn':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/logging/ze-log-event.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ze-log-event.js","sourceRoot":"","sources":["../../../src/lib/logging/ze-log-event.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ function getSessionKey() {
|
|
|
30
30
|
// Another process has the lock = concurrent login is in progress,
|
|
31
31
|
// use that session key instead
|
|
32
32
|
if (!unlock) {
|
|
33
|
-
|
|
33
|
+
logging_1.ze_log.misc('Lock is already held by another process, using the same session key');
|
|
34
34
|
session = fs.readFileSync(storage_keys_1.ZE_SESSION_LOCK);
|
|
35
35
|
// A second write here helps solve any concurrency between reading and writing
|
|
36
36
|
// the session key to the lockfile. This is a rare case, but it can happen
|
|
@@ -39,7 +39,7 @@ function getSessionKey() {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
|
-
|
|
42
|
+
logging_1.ze_log.misc('Lock acquired, writing session key to lockfile');
|
|
43
43
|
// read and write as array buffer
|
|
44
44
|
fs.writeFileSync(storage_keys_1.ZE_SESSION_LOCK, session, { flush: true });
|
|
45
45
|
}
|
|
@@ -56,7 +56,7 @@ function getSessionKey() {
|
|
|
56
56
|
// because `node-persist#forgiveParseErrors` wasn't set to true yet.
|
|
57
57
|
setTimeout(fs.unlink, UNLOCK_INTERVAL, storage_keys_1.ZE_SESSION_LOCK, () => {
|
|
58
58
|
// no need to care about errors here, if the file is not there, it's fine
|
|
59
|
-
|
|
59
|
+
logging_1.ze_log.misc('Lock released and lockfile removed');
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,sCA6CC;AA+BD,sCAQC;;AAzGD,6CAA0C;AAC1C,oDAA8B;AAC9B,mDAAmD;AACnD,qDAAsD;AACtD,mDAAwE;AACxE,wCAAoC;AACpC,iDAAiD;AAEjD,sEAAsE;AACtE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,wFAAwF;AACxF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ;AAE1C;;;;;;GAMG;AACH,SAAgB,aAAa;IAC3B,iFAAiF;IACjF,uFAAuF;IACvF,2BAA2B;IAC3B,IAAI,OAAO,GAAG,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAE9B,kEAAkE;IAClE,+BAA+B;IAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,
|
|
1
|
+
{"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,sCA6CC;AA+BD,sCAQC;;AAzGD,6CAA0C;AAC1C,oDAA8B;AAC9B,mDAAmD;AACnD,qDAAsD;AACtD,mDAAwE;AACxE,wCAAoC;AACpC,iDAAiD;AAEjD,sEAAsE;AACtE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,wFAAwF;AACxF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ;AAE1C;;;;;;GAMG;AACH,SAAgB,aAAa;IAC3B,iFAAiF;IACjF,uFAAuF;IACvF,2BAA2B;IAC3B,IAAI,OAAO,GAAG,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAE9B,kEAAkE;IAClE,+BAA+B;IAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,gBAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAE3C,8EAA8E;QAC9E,0EAA0E;QAC1E,IAAI,OAAO,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;YACtC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,gBAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC9D,iCAAiC;QACjC,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,MAAM;QACf,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QAEtC,wEAAwE;QACxE,CAAC,MAAM,CAAC,OAAO,CAAC;YACd,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBAET,wEAAwE;gBACxE,EAAE;gBACF,gFAAgF;gBAChF,oEAAoE;gBACpE,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,8BAAe,EAAE,GAAG,EAAE;oBAC3D,yEAAyE;oBACzE,gBAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;gBACpD,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAOD,8FAA8F;AAC9F,SAAS,YAAY,CAAC,iBAAiB,GAAG,IAAI;IAC5C,IAAI,CAAC;QACH,kGAAkG;QAClG,OAAO,IAAA,0BAAQ,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wCAAwC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,iBAAiB,EAAE,CAAC;YACjD,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;YAC9C,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,MAAoB;;;QACtD,6DAA6D;QAC7D,KAAsB,eAAA,KAAA,sBAAA,IAAA,sBAAW,EAAC,eAAe,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA,IAAA,sDAAE,CAAC;YAA7D,cAA0D;YAA1D,WAA0D;YAArE,MAAM,CAAC,KAAA,CAAA;YAChB,wCAAwC;YACxC,IAAI,CAAC,IAAA,2BAAS,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,EAAE,CAAC;gBAC/E,OAAO;YACT,CAAC;QACH,CAAC;;;;;;;;;AACH,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/** Utility functions for handling baseHref paths in Zephyr */
|
|
2
|
+
import type { ZeBuildAssetsMap } from 'zephyr-edge-contract';
|
|
3
|
+
/**
|
|
4
|
+
* Normalizes a base path string to ensure consistent format across all plugins
|
|
5
|
+
*
|
|
6
|
+
* @param baseHref - The base path string to normalize
|
|
7
|
+
* @returns A normalized base path string, or empty string for root/empty paths
|
|
8
|
+
*
|
|
9
|
+
* Normalization rules:
|
|
10
|
+
*
|
|
11
|
+
* - Removes leading and trailing slashes
|
|
12
|
+
* - Handles special cases like '/', './', '', '.'
|
|
13
|
+
* - Returns empty string for root or empty paths
|
|
14
|
+
*/
|
|
15
|
+
export declare function normalizeBasePath(baseHref: string | null | undefined): string;
|
|
16
|
+
/**
|
|
17
|
+
* Transforms asset paths by applying the baseHref prefix
|
|
18
|
+
*
|
|
19
|
+
* @param assetsMap - The original assets map
|
|
20
|
+
* @param baseHref - The baseHref to apply to asset paths
|
|
21
|
+
* @returns A new assets map with updated paths
|
|
22
|
+
*/
|
|
23
|
+
export declare function applyBaseHrefToAssets(assetsMap: ZeBuildAssetsMap, baseHref: string | null | undefined): ZeBuildAssetsMap;
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeBasePath = normalizeBasePath;
|
|
4
|
+
exports.applyBaseHrefToAssets = applyBaseHrefToAssets;
|
|
5
|
+
/**
|
|
6
|
+
* Normalizes a base path string to ensure consistent format across all plugins
|
|
7
|
+
*
|
|
8
|
+
* @param baseHref - The base path string to normalize
|
|
9
|
+
* @returns A normalized base path string, or empty string for root/empty paths
|
|
10
|
+
*
|
|
11
|
+
* Normalization rules:
|
|
12
|
+
*
|
|
13
|
+
* - Removes leading and trailing slashes
|
|
14
|
+
* - Handles special cases like '/', './', '', '.'
|
|
15
|
+
* - Returns empty string for root or empty paths
|
|
16
|
+
*/
|
|
17
|
+
function normalizeBasePath(baseHref) {
|
|
18
|
+
// Return empty string for falsy values
|
|
19
|
+
if (!baseHref) {
|
|
20
|
+
return '';
|
|
21
|
+
}
|
|
22
|
+
// Handle special cases that represent root path
|
|
23
|
+
if (baseHref === '/' || baseHref === './' || baseHref === '.') {
|
|
24
|
+
return '';
|
|
25
|
+
}
|
|
26
|
+
// Remove leading and trailing slashes and whitespace
|
|
27
|
+
let normalized = baseHref.trim();
|
|
28
|
+
// Remove leading ./ if present
|
|
29
|
+
if (normalized.startsWith('./')) {
|
|
30
|
+
normalized = normalized.substring(2);
|
|
31
|
+
}
|
|
32
|
+
// Remove leading / if present
|
|
33
|
+
if (normalized.startsWith('/')) {
|
|
34
|
+
normalized = normalized.substring(1);
|
|
35
|
+
}
|
|
36
|
+
// Remove trailing / if present
|
|
37
|
+
if (normalized.endsWith('/')) {
|
|
38
|
+
normalized = normalized.substring(0, normalized.length - 1);
|
|
39
|
+
}
|
|
40
|
+
return normalized.trim();
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Determines if a path is absolute (starts with / or includes ://)
|
|
44
|
+
*
|
|
45
|
+
* @param path - The path to check
|
|
46
|
+
* @returns True if the path is absolute, false otherwise
|
|
47
|
+
*/
|
|
48
|
+
function isAbsolutePath(path) {
|
|
49
|
+
return path.startsWith('/') || path.includes('://');
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Checks if a path is an index.html file
|
|
53
|
+
*
|
|
54
|
+
* @param path - The path to check
|
|
55
|
+
* @returns True if the path is an index.html file, false otherwise
|
|
56
|
+
*/
|
|
57
|
+
function isIndexHtml(path) {
|
|
58
|
+
return path.endsWith('index.html');
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Applies a baseHref prefix to a path
|
|
62
|
+
*
|
|
63
|
+
* @param path - The original asset path
|
|
64
|
+
* @param normalizedBaseHref - The normalized baseHref string
|
|
65
|
+
* @returns The path with baseHref applied
|
|
66
|
+
*/
|
|
67
|
+
function applyBaseHrefToPath(path, normalizedBaseHref) {
|
|
68
|
+
// Don't modify absolute paths or index.html
|
|
69
|
+
if (isAbsolutePath(path) || isIndexHtml(path)) {
|
|
70
|
+
return path;
|
|
71
|
+
}
|
|
72
|
+
// Return original path if baseHref is empty
|
|
73
|
+
if (!normalizedBaseHref) {
|
|
74
|
+
return path;
|
|
75
|
+
}
|
|
76
|
+
// Join the baseHref and path with a slash
|
|
77
|
+
return `${normalizedBaseHref}/${path}`;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Transforms asset paths by applying the baseHref prefix
|
|
81
|
+
*
|
|
82
|
+
* @param assetsMap - The original assets map
|
|
83
|
+
* @param baseHref - The baseHref to apply to asset paths
|
|
84
|
+
* @returns A new assets map with updated paths
|
|
85
|
+
*/
|
|
86
|
+
function applyBaseHrefToAssets(assetsMap, baseHref) {
|
|
87
|
+
// If no baseHref provided or empty after normalization, return original map
|
|
88
|
+
const normalizedBaseHref = normalizeBasePath(baseHref);
|
|
89
|
+
if (!normalizedBaseHref) {
|
|
90
|
+
return assetsMap;
|
|
91
|
+
}
|
|
92
|
+
// Create a new assets map with modified paths
|
|
93
|
+
const result = {};
|
|
94
|
+
// Process each asset
|
|
95
|
+
Object.values(assetsMap).forEach((asset) => {
|
|
96
|
+
// Create a copy of the asset
|
|
97
|
+
const newAsset = Object.assign({}, asset);
|
|
98
|
+
// Apply baseHref to the asset path
|
|
99
|
+
newAsset.path = applyBaseHrefToPath(asset.path, normalizedBaseHref);
|
|
100
|
+
// Add to result map, updating the key
|
|
101
|
+
result[newAsset.path] = newAsset;
|
|
102
|
+
});
|
|
103
|
+
return result;
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=ze-basehref-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ze-basehref-handler.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-basehref-handler.ts"],"names":[],"mappings":";;AAeA,8CA8BC;AAmDD,sDA0BC;AAvHD;;;;;;;;;;;GAWG;AACH,SAAgB,iBAAiB,CAAC,QAAmC;IACnE,uCAAuC;IACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,gDAAgD;IAChD,IAAI,QAAQ,KAAK,GAAG,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,qDAAqD;IACrD,IAAI,UAAU,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEjC,+BAA+B;IAC/B,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,8BAA8B;IAC9B,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,+BAA+B;IAC/B,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,IAAY;IAClC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,SAAS,WAAW,CAAC,IAAY;IAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;GAMG;AACH,SAAS,mBAAmB,CAAC,IAAY,EAAE,kBAA0B;IACnE,4CAA4C;IAC5C,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4CAA4C;IAC5C,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0CAA0C;IAC1C,OAAO,GAAG,kBAAkB,IAAI,IAAI,EAAE,CAAC;AACzC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,SAA2B,EAC3B,QAAmC;IAEnC,4EAA4E;IAC5E,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACvD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,8CAA8C;IAC9C,MAAM,MAAM,GAAqB,EAAE,CAAC;IAEpC,qBAAqB;IACrB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACzC,6BAA6B;QAC7B,MAAM,QAAQ,qBAAsB,KAAK,CAAE,CAAC;QAE5C,mCAAmC;QACnC,QAAQ,CAAC,IAAI,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEpE,sCAAsC;QACtC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildAssetsMap = buildAssetsMap;
|
|
4
|
-
const ze_build_assets_1 = require("./ze-build-assets");
|
|
5
4
|
const logging_1 = require("../logging");
|
|
5
|
+
const ze_build_assets_1 = require("./ze-build-assets");
|
|
6
6
|
function buildAssetsMap(assets, extractBuffer, getAssetType) {
|
|
7
7
|
return Object.keys(assets).reduce((memo, filepath) => {
|
|
8
8
|
const asset = assets[filepath];
|
|
9
9
|
const buffer = extractBuffer(asset);
|
|
10
10
|
if (!buffer && buffer !== '') {
|
|
11
|
-
|
|
11
|
+
logging_1.ze_log.upload(`unknown asset type: ${getAssetType(asset)}`);
|
|
12
12
|
return memo;
|
|
13
13
|
}
|
|
14
14
|
const assetMap = (0, ze_build_assets_1.zeBuildAssets)({ filepath, content: buffer });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-build-assets-map.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-build-assets-map.ts"],"names":[],"mappings":";;AAeA,wCAmBC;AAhCD,
|
|
1
|
+
{"version":3,"file":"ze-build-assets-map.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-build-assets-map.ts"],"names":[],"mappings":";;AAeA,wCAmBC;AAhCD,wCAAoC;AACpC,uDAAkD;AAYlD,SAAgB,cAAc,CAC5B,MAAyB,EACzB,aAA+B,EAC/B,YAA6B;IAE7B,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QACnD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAC7B,gBAAM,CAAC,MAAM,CAAC,uBAAuB,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,+BAAa,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAE/B,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAsB,CAAC,CAAC;AAC7B,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createSnapshot = createSnapshot;
|
|
4
4
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
5
|
+
const ze_basehref_handler_1 = require("./ze-basehref-handler");
|
|
5
6
|
const errors_1 = require("../errors");
|
|
6
7
|
async function createSnapshot(zephyr_engine, { mfConfig, assets }) {
|
|
7
8
|
const buildId = await zephyr_engine.build_id;
|
|
@@ -24,6 +25,7 @@ async function createSnapshot(zephyr_engine, { mfConfig, assets }) {
|
|
|
24
25
|
const version_postfix = zephyr_engine.env.isCI
|
|
25
26
|
? `${options.git_branch}.${options.buildId}`
|
|
26
27
|
: `${options.username}.${options.buildId}`;
|
|
28
|
+
const basedAssets = (0, ze_basehref_handler_1.applyBaseHrefToAssets)(assets, zephyr_engine.buildProperties.baseHref);
|
|
27
29
|
return {
|
|
28
30
|
// ZeApplicationProperties
|
|
29
31
|
application_uid: (0, zephyr_edge_contract_1.createApplicationUid)(options.applicationProperties),
|
|
@@ -47,8 +49,8 @@ async function createSnapshot(zephyr_engine, { mfConfig, assets }) {
|
|
|
47
49
|
},
|
|
48
50
|
createdAt: Date.now(),
|
|
49
51
|
mfConfig: options.mfConfig,
|
|
50
|
-
assets: Object.keys(
|
|
51
|
-
const asset =
|
|
52
|
+
assets: Object.keys(basedAssets).reduce((memo, hash) => {
|
|
53
|
+
const asset = basedAssets[hash];
|
|
52
54
|
const { path, extname, size } = asset;
|
|
53
55
|
memo[asset.path] = { path, extname, hash: asset.hash, size };
|
|
54
56
|
return memo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-build-snapshot.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-build-snapshot.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ze-build-snapshot.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-build-snapshot.ts"],"names":[],"mappings":";;AAiBA,wCAmEC;AApFD,+DAO8B;AAC9B,+DAA8D;AAE9D,sCAAkD;AAO3C,KAAK,UAAU,cAAc,CAClC,aAA2B,EAC3B,EAAE,QAAQ,EAAE,MAAM,EAAuB;IAEzC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC;IAE7C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,aAAa,CAAC,QAAQ,CAAC;QAC7B,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,sBAAsB,EAAE;YACrD,OAAO,EAAE,+CAA+C;SACzD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM;QAClD,OAAO;QACP,QAAQ,EAAE,CAAC,MAAM,aAAa,CAAC,yBAAyB,CAAC,CAAC,QAAQ;QAClE,KAAK,EAAE,CAAC,MAAM,aAAa,CAAC,yBAAyB,CAAC,CAAC,KAAK;QAC5D,qBAAqB,EAAE,aAAa,CAAC,qBAAqB;QAC1D,QAAQ,EAAE,CAAC,MAAM,aAAa,CAAC,yBAAyB,CAAC,CAAC,QAAQ;QAClE,aAAa,EAAE,aAAa,CAAC,aAAa;QAC1C,QAAQ,EAAE,QAAQ;KACnB,CAAC;IACF,MAAM,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI;QAC5C,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE;QAC5C,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAE7C,MAAM,WAAW,GAAG,IAAA,2CAAqB,EACvC,MAAM,EACN,aAAa,CAAC,eAAe,CAAC,QAAQ,CACvC,CAAC;IAEF,OAAO;QACL,0BAA0B;QAC1B,eAAe,EAAE,IAAA,2CAAoB,EAAC,OAAO,CAAC,qBAAqB,CAAC;QACpE,OAAO,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,OAAO,IAAI,eAAe,EAAE;QACtE,uEAAuE;QACvE,WAAW,EAAE,IAAA,2CAAoB,EAC/B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,qBAAqB,EAAE;YAC/C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CACH;QACD,MAAM,EAAE,OAAO,CAAC,QAAQ;QACxB,GAAG,EAAE;YACH,KAAK,EAAE,OAAO,CAAC,OAAO;YACtB,QAAQ,EAAE,OAAO,CAAC,qBAAqB,CAAC,IAAI;YAC5C,IAAI,EAAE,OAAO,CAAC,qBAAqB,CAAC,OAAO;YAC3C,GAAG,EAAE,OAAO,CAAC,qBAAqB,CAAC,GAAG;SACvC;QACD,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG;QAC9B,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,QAAQ;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB;QACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CACrC,CAAC,IAAI,EAAE,IAAY,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YAChC,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"}
|