zephyr-webpack-plugin 0.0.1 → 0.0.2
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/package.json +2 -2
- package/src/delegate-module/zephyr-delegate.d.ts +5 -5
- package/src/delegate-module/zephyr-delegate.js +32 -32
- package/src/delegate-module/zephyr-delegate.js.map +1 -1
- package/src/federation-dashboard-legacy/utils/federation-dashboard-plugin/FederationDashboardPlugin.js +2 -2
- package/src/federation-dashboard-legacy/utils/federation-dashboard-plugin/FederationDashboardPlugin.js.map +1 -1
- package/src/lib/actions/ze-enable-snapshot-on-edge.js +14 -14
- package/src/lib/actions/ze-enable-snapshot-on-edge.js.map +1 -1
- package/src/lib/actions/ze-upload-assets.js +7 -5
- package/src/lib/actions/ze-upload-assets.js.map +1 -1
- package/src/lib/actions/ze-upload-build-stats.js +2 -4
- package/src/lib/actions/ze-upload-build-stats.js.map +1 -1
- package/src/lib/actions/ze-upload-snapshot.js +5 -5
- package/src/lib/actions/ze-upload-snapshot.js.map +1 -1
- package/src/lib/dependency-resolution/replace-remotes-with-delegates.d.ts +7 -0
- package/src/lib/dependency-resolution/replace-remotes-with-delegates.js +17 -0
- package/src/lib/dependency-resolution/replace-remotes-with-delegates.js.map +1 -0
- package/src/lib/errors/configuration-error.d.ts +3 -0
- package/src/lib/errors/configuration-error.js +12 -0
- package/src/lib/errors/configuration-error.js.map +1 -0
- package/src/lib/utils/safe-json-parse.d.ts +1 -0
- package/src/lib/utils/safe-json-parse.js +13 -0
- package/src/lib/utils/safe-json-parse.js.map +1 -0
- package/src/lib/utils/ze-util-get-git-info.d.ts +1 -1
- package/src/lib/utils/ze-util-get-git-info.js +5 -2
- package/src/lib/utils/ze-util-get-git-info.js.map +1 -1
- package/src/lib/utils/ze-util-read-package-json.js +42 -0
- package/src/lib/utils/ze-util-read-package-json.js.map +1 -0
- package/src/lib/with-zephyr.d.ts +1 -2
- package/src/lib/with-zephyr.js +43 -58
- package/src/lib/with-zephyr.js.map +1 -1
- package/src/lib/ze-setup-build-id.js +25 -1
- package/src/lib/ze-setup-build-id.js.map +1 -1
- package/src/lib/ze-setup-build-steps-logging.js +5 -5
- package/src/lib/ze-setup-build-steps-logging.js.map +1 -1
- package/src/lib/ze-setup-ze-deploy.js +2 -0
- package/src/lib/ze-setup-ze-deploy.js.map +1 -1
- package/src/lib/ze-webpack-plugin.d.ts +2 -28
- package/src/lib/ze-webpack-plugin.js +15 -46
- package/src/lib/ze-webpack-plugin.js.map +1 -1
- package/src/types/ze-webpack-plugin-options.d.ts +2 -0
- package/README.md +0 -26
- package/src/lib/utils/ze-util-find-app-name.js +0 -35
- package/src/lib/utils/ze-util-find-app-name.js.map +0 -1
- /package/src/lib/utils/{ze-util-find-app-name.d.ts → ze-util-read-package-json.d.ts} +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-webpack-plugin",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.2",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"is-ci": "2.0.0",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"@babel/generator": "7.23.6",
|
|
13
13
|
"@module-federation/automatic-vendor-federation": "1.2.1",
|
|
14
14
|
"nx": "18.2.0",
|
|
15
|
-
"zephyr-edge-contract": "0.0.
|
|
15
|
+
"zephyr-edge-contract": "0.0.2"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@types/is-ci": "3.0.4",
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { DelegateConfig } from '../lib/dependency-resolution/replace-remotes-with-delegates';
|
|
2
|
+
export interface DependencyResolutionError {
|
|
3
|
+
error: boolean;
|
|
4
|
+
application_uid: string;
|
|
5
5
|
}
|
|
6
|
-
export declare function replace_remote_in_mf_config(mfPlugin: any, config: DelegateConfig): Promise<
|
|
6
|
+
export declare function replace_remote_in_mf_config(mfPlugin: any, config: DelegateConfig): Promise<(DependencyResolutionError | void)[] | void>;
|
|
7
7
|
interface ResolvedDependency {
|
|
8
8
|
default_url: string;
|
|
9
9
|
application_uid: string;
|
|
@@ -4,11 +4,35 @@ exports.replace_remote_with_delegate = exports.replace_remote_in_mf_config = voi
|
|
|
4
4
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
5
5
|
// todo: in order to become federation impl agnostic, we should parse and provide
|
|
6
6
|
// already processed federation config instead of mfConfig
|
|
7
|
+
async function resolve_remote_dependency({ name, version, }) {
|
|
8
|
+
const resolveDependency = new URL(zephyr_edge_contract_1.v2_api_paths.resolve_dependency_path, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT);
|
|
9
|
+
resolveDependency.searchParams.append('name', name);
|
|
10
|
+
resolveDependency.searchParams.append('version', version);
|
|
11
|
+
try {
|
|
12
|
+
const token = await (0, zephyr_edge_contract_1.getToken)();
|
|
13
|
+
const res = await fetch(resolveDependency, {
|
|
14
|
+
method: 'GET',
|
|
15
|
+
headers: {
|
|
16
|
+
'Content-Type': 'application/json',
|
|
17
|
+
Authorization: 'Bearer ' + token,
|
|
18
|
+
Accept: 'application/json',
|
|
19
|
+
},
|
|
20
|
+
});
|
|
21
|
+
if (!res.ok) {
|
|
22
|
+
throw new Error(res.statusText);
|
|
23
|
+
}
|
|
24
|
+
const response = (await res.json());
|
|
25
|
+
return response?.value;
|
|
26
|
+
}
|
|
27
|
+
catch (err) {
|
|
28
|
+
console.error(`[zephyr] Could not resolve '${name}' with version '${version}'`);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
7
31
|
async function replace_remote_in_mf_config(
|
|
8
32
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
9
33
|
mfPlugin, config) {
|
|
10
34
|
if (!mfPlugin._options?.remotes)
|
|
11
|
-
return
|
|
35
|
+
return;
|
|
12
36
|
// replace remotes with delegate function
|
|
13
37
|
const depsResolutionTask = Object.keys(mfPlugin._options?.remotes).map(async (key) => {
|
|
14
38
|
const [app_name, project_name, org_name] = key.split('.');
|
|
@@ -23,35 +47,6 @@ mfPlugin, config) {
|
|
|
23
47
|
name: application_uid,
|
|
24
48
|
version: mfPlugin._options?.remotes[key],
|
|
25
49
|
});
|
|
26
|
-
async function resolve_remote_dependency({ name, version, }) {
|
|
27
|
-
const dashboardURL = new URL(zephyr_edge_contract_1.v2_api_paths.dashboard_path, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT);
|
|
28
|
-
dashboardURL.searchParams.append('name', name);
|
|
29
|
-
dashboardURL.searchParams.append('version', version);
|
|
30
|
-
try {
|
|
31
|
-
const token = await (0, zephyr_edge_contract_1.getToken)();
|
|
32
|
-
const res = await fetch(dashboardURL, {
|
|
33
|
-
method: 'GET',
|
|
34
|
-
headers: {
|
|
35
|
-
'Content-Type': 'application/json',
|
|
36
|
-
Authorization: 'Bearer ' + token,
|
|
37
|
-
Accept: 'application/json',
|
|
38
|
-
},
|
|
39
|
-
});
|
|
40
|
-
if (!res.ok) {
|
|
41
|
-
throw new Error(res.statusText);
|
|
42
|
-
}
|
|
43
|
-
const response = (await res.json());
|
|
44
|
-
return response.value;
|
|
45
|
-
}
|
|
46
|
-
catch (err) {
|
|
47
|
-
console.warn(`[zephyr] Could not resolve '${name}' with version '${version}'`);
|
|
48
|
-
}
|
|
49
|
-
return {
|
|
50
|
-
default_url: version,
|
|
51
|
-
remote_entry_url: version,
|
|
52
|
-
application_uid: name,
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
50
|
if (resolvedDependency) {
|
|
56
51
|
const _version = mfPlugin._options.remotes[key];
|
|
57
52
|
if (_version?.indexOf('@') !== -1) {
|
|
@@ -64,9 +59,14 @@ mfPlugin, config) {
|
|
|
64
59
|
mfPlugin._options.remotes[key] =
|
|
65
60
|
replace_remote_with_delegate(resolvedDependency);
|
|
66
61
|
}
|
|
62
|
+
else {
|
|
63
|
+
return {
|
|
64
|
+
error: true,
|
|
65
|
+
application_uid,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
67
68
|
});
|
|
68
|
-
|
|
69
|
-
return config;
|
|
69
|
+
return Promise.all(depsResolutionTask);
|
|
70
70
|
}
|
|
71
71
|
exports.replace_remote_in_mf_config = replace_remote_in_mf_config;
|
|
72
72
|
function replace_remote_with_delegate(deps) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zephyr-delegate.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/delegate-module/zephyr-delegate.ts"],"names":[],"mappings":";;;AAAA,+DAK8B;
|
|
1
|
+
{"version":3,"file":"zephyr-delegate.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/delegate-module/zephyr-delegate.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,10 @@ const types_1 = require("@babel/types");
|
|
|
8
8
|
const traverse_1 = require("@babel/traverse");
|
|
9
9
|
const generator_1 = require("@babel/generator");
|
|
10
10
|
const convert_to_graph_1 = require("../convert-to-graph/convert-to-graph");
|
|
11
|
+
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
11
12
|
const find_package_json_1 = require("./find-package-json");
|
|
12
13
|
const compute_version_strategy_1 = require("./compute-version-strategy");
|
|
13
14
|
const add_runtime_requirement_to_promise_external_1 = require("./add-runtime-requirement-to-promise-external");
|
|
14
|
-
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
15
15
|
// convert this require to imports
|
|
16
16
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
17
17
|
const AutomaticVendorFederation = require('@module-federation/automatic-vendor-federation');
|
|
@@ -34,7 +34,7 @@ class FederationDashboardPlugin {
|
|
|
34
34
|
// todo: use buildid version (user_build_count)
|
|
35
35
|
compiler.options.output.uniqueName = `v${Date.now()}`;
|
|
36
36
|
new add_runtime_requirement_to_promise_external_1.AddRuntimeRequirementToPromiseExternal().apply(compiler);
|
|
37
|
-
const FederationPlugin = compiler.options.plugins.find((plugin) => plugin?.constructor.name
|
|
37
|
+
const FederationPlugin = compiler.options.plugins.find((plugin) => plugin?.constructor.name.indexOf('ModuleFederationPlugin') !== -1);
|
|
38
38
|
// todo: valorkin fixes
|
|
39
39
|
this._options.standalone = typeof FederationPlugin === 'undefined';
|
|
40
40
|
if (FederationPlugin) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationDashboardPlugin.js","sourceRoot":"","sources":["../../../../../../../packages/zephyr-webpack-plugin/src/federation-dashboard-legacy/utils/federation-dashboard-plugin/FederationDashboardPlugin.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,yCAAgC;AAEhC,0CAAsC;AACtC,wCAAsC;AACtC,8CAAuC;AACvC,gDAAwC;AAaxC,2EAI8C;
|
|
1
|
+
{"version":3,"file":"FederationDashboardPlugin.js","sourceRoot":"","sources":["../../../../../../../packages/zephyr-webpack-plugin/src/federation-dashboard-legacy/utils/federation-dashboard-plugin/FederationDashboardPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,12 @@ const ze_log_event_1 = require("../utils/ze-log-event");
|
|
|
5
5
|
const upload_envs_1 = require("../upload/upload-envs");
|
|
6
6
|
async function zeEnableSnapshotOnEdge(pluginOptions, snapshot, envs_jwt) {
|
|
7
7
|
const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
|
|
8
|
-
const deployStart = Date.now();
|
|
9
|
-
logEvent({
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
});
|
|
8
|
+
// const deployStart = Date.now();
|
|
9
|
+
// logEvent({
|
|
10
|
+
// level: 'info',
|
|
11
|
+
// action: 'deploy:edge:started',
|
|
12
|
+
// message: `started deploying local build to edge`
|
|
13
|
+
// });
|
|
14
14
|
envs_jwt.urls.forEach((url) => {
|
|
15
15
|
logEvent({
|
|
16
16
|
level: 'trace',
|
|
@@ -22,14 +22,14 @@ async function zeEnableSnapshotOnEdge(pluginOptions, snapshot, envs_jwt) {
|
|
|
22
22
|
body: envs_jwt,
|
|
23
23
|
application_uid: pluginOptions.application_uid,
|
|
24
24
|
});
|
|
25
|
-
if (latest) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
|
|
25
|
+
// if (latest) {
|
|
26
|
+
// logEvent({
|
|
27
|
+
// level: 'info',
|
|
28
|
+
// action: 'deploy:edge:done',
|
|
29
|
+
// message: `local build deployed to edge in ${Date.now() - deployStart}ms`,
|
|
30
|
+
// });
|
|
31
|
+
// } else {
|
|
32
|
+
if (!latest) {
|
|
33
33
|
logEvent({
|
|
34
34
|
level: 'error',
|
|
35
35
|
action: 'deploy:edge:failed',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-enable-snapshot-on-edge.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-enable-snapshot-on-edge.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAG/C,uDAAmD;AAE5C,KAAK,UAAU,sBAAsB,CAC1C,aAAqC,EACrC,QAAkB,EAClB,QAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,
|
|
1
|
+
{"version":3,"file":"ze-enable-snapshot-on-edge.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-enable-snapshot-on-edge.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAG/C,uDAAmD;AAE5C,KAAK,UAAU,sBAAsB,CAC1C,aAAqC,EACrC,QAAkB,EAClB,QAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,kCAAkC;IAElC,aAAa;IACb,mBAAmB;IACnB,mCAAmC;IACnC,qDAAqD;IACrD,MAAM;IAEN,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5B,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,gBAAgB,GAAG,EAAE;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAU,EAAC;QAC9B,IAAI,EAAE,QAAQ;QACd,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAC;IAEH,gBAAgB;IAChB,eAAe;IACf,qBAAqB;IACrB,kCAAkC;IAClC,gFAAgF;IAChF,QAAQ;IACR,WAAW;IACX,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,oBAAoB;YAC5B,OAAO,EAAE,sCAAsC;SAChD,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAzCD,wDAyCC"}
|
|
@@ -35,11 +35,13 @@ async function zeUploadAssets(pluginOptions, { missingAssets, assetsMap, count }
|
|
|
35
35
|
const fileUploaded = Date.now() - start;
|
|
36
36
|
totalTime += fileUploaded;
|
|
37
37
|
totalSize += assetSize;
|
|
38
|
-
logEvent({
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
38
|
+
// logEvent({
|
|
39
|
+
// level: 'info',
|
|
40
|
+
// action: 'snapshot:assets:upload:file:done',
|
|
41
|
+
// message: `file ${
|
|
42
|
+
// asset.path
|
|
43
|
+
// } uploaded in ${fileUploaded}ms (${assetSize.toFixed(2)}kb)`,
|
|
44
|
+
// });
|
|
43
45
|
})
|
|
44
46
|
.catch((err) => {
|
|
45
47
|
logEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-assets.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAC/C,uDAAmD;AAI5C,KAAK,UAAU,cAAc,CAClC,aAAqC,EACrC,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAyB;IAE1D,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IAEvC,IACE,CAAC,aAAa,EAAE,MAAM;QACtB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAC9C,CAAC;QACD,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,8BAA8B;YACtC,OAAO,EAAE,yBAAyB;SACnC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC;QACP,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,gCAAgC;QACxC,OAAO,EAAE,8CAA8C,aAAa,EAAE,MAAM,EAAE,MAAM,WAAW,KAAK,GAAG;KACxG,CAAC,CAAC;IAEH,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAEnD,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACzD,OAAO,MAAM,IAAA,wBAAU,EAAC;YACtB,EAAE,EAAE,KAAK,CAAC,IAAI;YACd,KAAK,EAAE,eAAe;YACtB,eAAe,EAAE,aAAa,CAAC,eAAe;SAC/C,CAAC;aACC,IAAI,CAAC,GAAG,EAAE;YACT,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACxC,SAAS,IAAI,YAAY,CAAC;YAC1B,SAAS,IAAI,SAAS,CAAC;YAEvB,
|
|
1
|
+
{"version":3,"file":"ze-upload-assets.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-assets.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,9 @@ exports.zeUploadBuildStats = void 0;
|
|
|
4
4
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
5
5
|
async function zeUploadBuildStats(dashData) {
|
|
6
6
|
const dashboardURL = new URL(zephyr_edge_contract_1.v2_api_paths.dashboard_path, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT);
|
|
7
|
-
const client = fetch;
|
|
8
7
|
try {
|
|
9
8
|
const token = await (0, zephyr_edge_contract_1.getToken)();
|
|
10
|
-
const res = await
|
|
9
|
+
const res = await fetch(dashboardURL, {
|
|
11
10
|
method: 'POST',
|
|
12
11
|
body: JSON.stringify(dashData),
|
|
13
12
|
headers: {
|
|
@@ -22,8 +21,7 @@ async function zeUploadBuildStats(dashData) {
|
|
|
22
21
|
return await res.json();
|
|
23
22
|
}
|
|
24
23
|
catch (err) {
|
|
25
|
-
console.
|
|
26
|
-
console.error(err);
|
|
24
|
+
console.error(`[zephyr]: Error uploading build stats, deployment is not completed`);
|
|
27
25
|
}
|
|
28
26
|
return;
|
|
29
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;AAAA,+DAI8B;AAEvB,KAAK,UAAU,kBAAkB,CACtC,QAAiB;IAEjB,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,mCAAY,CAAC,cAAc,EAC3B,0CAAmB,CACpB,CAAC;IACF,
|
|
1
|
+
{"version":3,"file":"ze-upload-build-stats.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-build-stats.ts"],"names":[],"mappings":";;;AAAA,+DAI8B;AAEvB,KAAK,UAAU,kBAAkB,CACtC,QAAiB;IAEjB,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,mCAAY,CAAC,cAAc,EAC3B,0CAAmB,CACpB,CAAC;IACF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;YACpC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC9B,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,GAAG,KAAK;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CACX,oEAAoE,CACrE,CAAC;IACJ,CAAC;IACD,OAAO;AACT,CAAC;AA9BD,gDA8BC"}
|
|
@@ -7,11 +7,11 @@ async function zeUploadSnapshot(pluginOptions, snapshot) {
|
|
|
7
7
|
const { buildEnv } = pluginOptions;
|
|
8
8
|
const logEvent = (0, ze_log_event_1.logger)(pluginOptions);
|
|
9
9
|
const snapUploadMs = Date.now();
|
|
10
|
-
logEvent({
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
});
|
|
10
|
+
// logEvent({
|
|
11
|
+
// level: 'info',
|
|
12
|
+
// action: 'snapshot:upload:started',
|
|
13
|
+
// message: `started uploading of ${buildEnv} snapshot to zephyr`,
|
|
14
|
+
// });
|
|
15
15
|
let error;
|
|
16
16
|
const edgeTodo = await (0, upload_snapshot_1.uploadSnapshot)({
|
|
17
17
|
body: snapshot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAG/C,+DAA2D;AAEpD,KAAK,UAAU,gBAAgB,CACpC,aAAqC,EACrC,QAAkB;IAElB,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEhC,
|
|
1
|
+
{"version":3,"file":"ze-upload-snapshot.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/actions/ze-upload-snapshot.ts"],"names":[],"mappings":";;;AAAA,wDAA+C;AAG/C,+DAA2D;AAEpD,KAAK,UAAU,gBAAgB,CACpC,aAAqC,EACrC,QAAkB;IAElB,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEhC,aAAa;IACb,mBAAmB;IACnB,uCAAuC;IACvC,oEAAoE;IACpE,MAAM;IAEN,IAAI,KAAK,CAAC;IACV,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAc,EAAC;QACpC,IAAI,EAAE,QAAQ;QACd,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;IAEjC,IAAI,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC;QACvB,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,wBAAwB;YAChC,OAAO,EAAE,uBAAuB,QAAQ,qBAAqB;SAC9D,CAAC,CAAC;QACH,OAAO;IACT,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,sBAAsB;YAC9B,OAAO,EAAE,YAAY,QAAQ,gBAC3B,IAAI,CAAC,GAAG,EAAE,GAAG,YACf,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAtCD,4CAsCC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { DependencyResolutionError } from '../../delegate-module/zephyr-delegate';
|
|
2
|
+
export interface DelegateConfig {
|
|
3
|
+
org: string;
|
|
4
|
+
project: string;
|
|
5
|
+
application?: undefined;
|
|
6
|
+
}
|
|
7
|
+
export declare function replaceRemotesWithDelegates(_config: unknown, { org, project }: DelegateConfig): Promise<((DependencyResolutionError | void)[] | void)[]>;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.replaceRemotesWithDelegates = void 0;
|
|
4
|
+
const zephyr_delegate_1 = require("../../delegate-module/zephyr-delegate");
|
|
5
|
+
async function replaceRemotesWithDelegates(_config, { org, project }) {
|
|
6
|
+
// this is WebpackOptionsNormalized type but this type is not exported
|
|
7
|
+
const config = _config;
|
|
8
|
+
const depsResolutionTasks = config.plugins
|
|
9
|
+
?.filter((plugin) => plugin?.constructor.name.indexOf('ModuleFederationPlugin') !== -1)
|
|
10
|
+
?.map(async (mfConfig) => {
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12
|
+
return await (0, zephyr_delegate_1.replace_remote_in_mf_config)(mfConfig, { org, project });
|
|
13
|
+
});
|
|
14
|
+
return Promise.all(depsResolutionTasks ?? []);
|
|
15
|
+
}
|
|
16
|
+
exports.replaceRemotesWithDelegates = replaceRemotesWithDelegates;
|
|
17
|
+
//# sourceMappingURL=replace-remotes-with-delegates.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replace-remotes-with-delegates.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/dependency-resolution/replace-remotes-with-delegates.ts"],"names":[],"mappings":";;;AAAA,2EAG+C;AASxC,KAAK,UAAU,2BAA2B,CAC/C,OAAgB,EAChB,EAAE,GAAG,EAAE,OAAO,EAAkB;IAEhC,sEAAsE;IACtE,MAAM,MAAM,GAAG,OAAwB,CAAC;IACxC,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO;QACxC,EAAE,MAAM,CACN,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CACpE;QACD,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACvB,8DAA8D;QAC9D,OAAO,MAAM,IAAA,6CAA2B,EAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC;AAjBD,kEAiBC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ConfigurationError = void 0;
|
|
4
|
+
class ConfigurationError extends Error {
|
|
5
|
+
constructor(message) {
|
|
6
|
+
super(`[zephyr]: ${message}`);
|
|
7
|
+
this.name = 'ConfigurationError';
|
|
8
|
+
this.stack = void 0;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.ConfigurationError = ConfigurationError;
|
|
12
|
+
//# sourceMappingURL=configuration-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration-error.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/errors/configuration-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAe;QACzB,KAAK,CAAC,aAAa,OAAO,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;IACtB,CAAC;CACF;AAND,gDAMC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function safe_json_parse<T = Record<string, unknown>>(str: string): T | undefined;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.safe_json_parse = void 0;
|
|
4
|
+
function safe_json_parse(str) {
|
|
5
|
+
try {
|
|
6
|
+
return JSON.parse(str);
|
|
7
|
+
}
|
|
8
|
+
catch {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.safe_json_parse = safe_json_parse;
|
|
13
|
+
//# sourceMappingURL=safe-json-parse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"safe-json-parse.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/safe-json-parse.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAC7B,GAAW;IAEX,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;AACH,CAAC;AARD,0CAQC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getGitInfo = void 0;
|
|
4
4
|
const node_child_process_1 = require("node:child_process");
|
|
5
|
+
const configuration_error_1 = require("../errors/configuration-error");
|
|
5
6
|
function getGitInfo() {
|
|
6
7
|
try {
|
|
7
8
|
const username = (0, node_child_process_1.execSync)('git config user.name').toString().trim();
|
|
@@ -45,8 +46,10 @@ function getGitInfo() {
|
|
|
45
46
|
};
|
|
46
47
|
}
|
|
47
48
|
catch (error) {
|
|
48
|
-
|
|
49
|
-
|
|
49
|
+
throw new configuration_error_1.ConfigurationError(`git is not configured properly \n
|
|
50
|
+
- please set git user.name and user.email \n
|
|
51
|
+
- please set valid 'git remote origin' \n
|
|
52
|
+
`);
|
|
50
53
|
}
|
|
51
54
|
}
|
|
52
55
|
exports.getGitInfo = getGitInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-util-get-git-info.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/ze-util-get-git-info.ts"],"names":[],"mappings":";;;AAAA,2DAA8C;
|
|
1
|
+
{"version":3,"file":"ze-util-get-git-info.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/ze-util-get-git-info.ts"],"names":[],"mappings":";;;AAAA,2DAA8C;AAC9C,uEAAmE;AAenE,SAAgB,UAAU;IACxB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAA,6BAAQ,EAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACpE,MAAM,KAAK,GAAG,IAAA,6BAAQ,EAAC,uBAAuB,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,YAAY,GAAG,IAAA,6BAAQ,EAAC,oCAAoC,CAAC;aAChE,QAAQ,EAAE;aACV,IAAI,EAAE,CAAC;QACV,MAAM,MAAM,GAAG,IAAA,6BAAQ,EAAC,iCAAiC,CAAC;aACvD,QAAQ,EAAE;aACV,IAAI,EAAE,CAAC;QACV,MAAM,UAAU,GAAG,IAAA,6BAAQ,EAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAEpE,sEAAsE;QACtE,MAAM,QAAQ,GAAG,YAAY;YAC3B,oDAAoD;aACnD,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,6BAA6B;aAC5B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACrB,kDAAkD;aACjD,KAAK,CAAC,GAAG,CAAC;YACX,wCAAwC;aACvC,GAAG,EAAE;YACN,4BAA4B;YAC5B,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAEf,MAAM,YAAY,GAChB,QAAQ,IAAI,QAAQ,EAAE,MAAM,GAAG,CAAC;YAC9B,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/B,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,cAAc,GAClB,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAC7B,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/B,CAAC,CAAC,SAAS,CAAC;QAEhB,OAAO;YACL,GAAG,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,KAAK;gBACL,MAAM;gBACN,MAAM,EAAE,UAAU;aACnB;YACD,GAAG,EAAE;gBACH,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE;gBAChC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE;aACvC;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,wCAAkB,CAAC;;;KAG5B,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AApDD,gCAoDC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPackageJson = void 0;
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
|
+
const configuration_error_1 = require("../errors/configuration-error");
|
|
7
|
+
const safe_json_parse_1 = require("./safe-json-parse");
|
|
8
|
+
function getPackageJson(context) {
|
|
9
|
+
const res = findClosestPackageJson(context || process.cwd());
|
|
10
|
+
if (!res) {
|
|
11
|
+
throw new configuration_error_1.ConfigurationError(`package.json not found with context: '${context}'`);
|
|
12
|
+
}
|
|
13
|
+
const { json, path } = res;
|
|
14
|
+
const parsed_package_json = (0, safe_json_parse_1.safe_json_parse)(json);
|
|
15
|
+
if (!parsed_package_json) {
|
|
16
|
+
throw new configuration_error_1.ConfigurationError(`package.json ${path} \n is not valid json`);
|
|
17
|
+
}
|
|
18
|
+
if (!parsed_package_json.name || !parsed_package_json.version) {
|
|
19
|
+
throw new configuration_error_1.ConfigurationError(`package json ('${path}') \n
|
|
20
|
+
should have a 'name' and a 'version' properties`);
|
|
21
|
+
}
|
|
22
|
+
return parsed_package_json;
|
|
23
|
+
}
|
|
24
|
+
exports.getPackageJson = getPackageJson;
|
|
25
|
+
function findClosestPackageJson(startPath) {
|
|
26
|
+
let dir = startPath;
|
|
27
|
+
do {
|
|
28
|
+
const packageJsonPath = (0, node_path_1.join)(dir, 'package.json');
|
|
29
|
+
if ((0, node_fs_1.existsSync)(packageJsonPath)) {
|
|
30
|
+
return {
|
|
31
|
+
path: packageJsonPath,
|
|
32
|
+
json: (0, node_fs_1.readFileSync)(packageJsonPath, 'utf8'),
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
const parentDir = (0, node_path_1.resolve)(dir, '..');
|
|
36
|
+
if (parentDir === dir) {
|
|
37
|
+
throw new configuration_error_1.ConfigurationError(`No package.json found, in ${startPath}`);
|
|
38
|
+
}
|
|
39
|
+
dir = parentDir;
|
|
40
|
+
} while (startPath !== dir);
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=ze-util-read-package-json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ze-util-read-package-json.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/ze-util-read-package-json.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AACnD,yCAA0C;AAC1C,uEAAmE;AACnE,uDAAoD;AAQpD,SAAgB,cAAc,CAC5B,OAA2B;IAE3B,MAAM,GAAG,GAAG,sBAAsB,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,wCAAkB,CAC1B,yCAAyC,OAAO,GAAG,CACpD,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IAC3B,MAAM,mBAAmB,GAAG,IAAA,iCAAe,EAAc,IAAI,CAAC,CAAC;IAC/D,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,wCAAkB,CAAC,gBAAgB,IAAI,uBAAuB,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QAC9D,MAAM,IAAI,wCAAkB,CAAC,kBAAkB,IAAI;oDACH,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAtBD,wCAsBC;AAED,SAAS,sBAAsB,CAC7B,SAAiB;IAEjB,IAAI,GAAG,GAAG,SAAS,CAAC;IACpB,GAAG,CAAC;QACF,MAAM,eAAe,GAAG,IAAA,gBAAI,EAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAClD,IAAI,IAAA,oBAAU,EAAC,eAAe,CAAC,EAAE,CAAC;YAChC,OAAO;gBACL,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,IAAA,sBAAY,EAAC,eAAe,EAAE,MAAM,CAAC;aAC5C,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,mBAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;YACtB,MAAM,IAAI,wCAAkB,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,GAAG,GAAG,SAAS,CAAC;IAClB,CAAC,QAAQ,SAAS,KAAK,GAAG,EAAE;AAC9B,CAAC"}
|
package/src/lib/with-zephyr.d.ts
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
import { Configuration } from 'webpack';
|
|
2
|
-
|
|
3
|
-
export declare function withZephyr(_zephyrOptions?: ZephyrPluginOptions | ZephyrPluginOptions[]): (config: Configuration) => Promise<Configuration | undefined>;
|
|
2
|
+
export declare function withZephyr(): (config: Configuration) => Promise<Configuration>;
|
package/src/lib/with-zephyr.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.withZephyr = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
5
|
+
const ze_util_read_package_json_1 = require("./utils/ze-util-read-package-json");
|
|
6
6
|
const ze_util_get_git_info_1 = require("./utils/ze-util-get-git-info");
|
|
7
|
-
const zephyr_delegate_1 = require("../delegate-module/zephyr-delegate");
|
|
8
7
|
const ze_webpack_plugin_1 = require("./ze-webpack-plugin");
|
|
9
|
-
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
10
|
-
const { ModuleFederationPlugin } = webpack_1.container;
|
|
11
8
|
function getCopyOfMFOptions(config) {
|
|
12
9
|
return config.plugins
|
|
13
|
-
?.filter((plugin) => plugin?.constructor.name
|
|
10
|
+
?.filter((plugin) => plugin?.constructor.name.indexOf('ModuleFederationPlugin') !== -1)
|
|
14
11
|
.map((mf) => {
|
|
15
12
|
const _mf = mf;
|
|
16
13
|
if (!_mf?._options)
|
|
@@ -19,66 +16,27 @@ function getCopyOfMFOptions(config) {
|
|
|
19
16
|
})
|
|
20
17
|
.filter(Boolean);
|
|
21
18
|
}
|
|
22
|
-
function withZephyr(
|
|
19
|
+
function withZephyr() {
|
|
20
|
+
// _zephyrOptions?: ZephyrPluginOptions | ZephyrPluginOptions[],
|
|
23
21
|
return async function configure(config) {
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
const packageJson = (0, ze_util_read_package_json_1.getPackageJson)(config.context);
|
|
23
|
+
if (!packageJson)
|
|
24
|
+
return config;
|
|
26
25
|
const gitInfo = (0, ze_util_get_git_info_1.getGitInfo)();
|
|
27
|
-
// todo: exit zephyr sequence if no git origin or no package json
|
|
28
26
|
if (!gitInfo?.app.org || !gitInfo?.app.project || !packageJson?.name)
|
|
29
|
-
return;
|
|
30
|
-
const { org, project } = gitInfo.app;
|
|
31
|
-
const application_uid = (0, zephyr_edge_contract_1.createFullAppName)({
|
|
32
|
-
org,
|
|
33
|
-
project,
|
|
34
|
-
name: packageJson?.name,
|
|
35
|
-
});
|
|
36
|
-
// if mfs -> add MF plugins
|
|
37
|
-
// if mfs -> add FederationDashboardPlugin
|
|
38
|
-
const zephyrOptions = Array.isArray(_zephyrOptions)
|
|
39
|
-
? _zephyrOptions
|
|
40
|
-
: [_zephyrOptions];
|
|
41
|
-
// todo: resolve edge url for current application from zephyr API
|
|
42
|
-
const delegate_config = {
|
|
43
|
-
org,
|
|
44
|
-
project,
|
|
45
|
-
application: undefined,
|
|
46
|
-
};
|
|
27
|
+
return config;
|
|
47
28
|
const mfConfigs = getCopyOfMFOptions(config);
|
|
48
|
-
const depsResolutionTasks = config.plugins
|
|
49
|
-
?.filter((plugin) => plugin?.constructor.name.indexOf('ModuleFederationPlugin') === -1)
|
|
50
|
-
?.map(async (mfConfig) => {
|
|
51
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
52
|
-
return await (0, zephyr_delegate_1.replace_remote_in_mf_config)(mfConfig, delegate_config);
|
|
53
|
-
});
|
|
54
|
-
if (depsResolutionTasks) {
|
|
55
|
-
await Promise.all(depsResolutionTasks);
|
|
56
|
-
}
|
|
57
|
-
// todo: make sample wich use direct mf config via ze options
|
|
58
|
-
zephyrOptions.forEach((zephyrOption) => {
|
|
59
|
-
if (!zephyrOption)
|
|
60
|
-
return;
|
|
61
|
-
config.plugins?.push(new ModuleFederationPlugin({
|
|
62
|
-
name: application_uid,
|
|
63
|
-
filename: 'remoteEntry.js',
|
|
64
|
-
shared: packageJson?.dependencies,
|
|
65
|
-
exposes: zephyrOption?.exposes,
|
|
66
|
-
// todo: rework this part
|
|
67
|
-
// remotes: zephyrOption.remotes?.map((application) =>
|
|
68
|
-
// replace_remote_with_delegate(
|
|
69
|
-
// application,
|
|
70
|
-
// Object.assign({}, delegate_config, { application })
|
|
71
|
-
// )
|
|
72
|
-
// )
|
|
73
|
-
}));
|
|
74
|
-
});
|
|
75
29
|
config.plugins?.push(new ze_webpack_plugin_1.ZeWebpackPlugin({
|
|
76
|
-
application_uid,
|
|
30
|
+
application_uid: (0, zephyr_edge_contract_1.createFullAppName)({
|
|
31
|
+
org: gitInfo.app.org,
|
|
32
|
+
project: gitInfo.app.project,
|
|
33
|
+
name: packageJson?.name,
|
|
34
|
+
}),
|
|
77
35
|
app: {
|
|
78
36
|
name: packageJson.name,
|
|
79
37
|
version: packageJson.version,
|
|
80
|
-
org,
|
|
81
|
-
project,
|
|
38
|
+
org: gitInfo.app.org,
|
|
39
|
+
project: gitInfo.app.project,
|
|
82
40
|
},
|
|
83
41
|
git: gitInfo?.git,
|
|
84
42
|
mfConfig: Array.isArray(mfConfigs) ? mfConfigs[0] : void 0,
|
|
@@ -87,4 +45,31 @@ function withZephyr(_zephyrOptions) {
|
|
|
87
45
|
};
|
|
88
46
|
}
|
|
89
47
|
exports.withZephyr = withZephyr;
|
|
48
|
+
// todo: make sample wich use direct mf config via ze options
|
|
49
|
+
function todo_implement_direct_zephyr_usage() {
|
|
50
|
+
// if mfs -> add MF plugins
|
|
51
|
+
// if mfs -> add FederationDashboardPlugin
|
|
52
|
+
// const zephyrOptions = Array.isArray(_zephyrOptions)
|
|
53
|
+
// ? _zephyrOptions
|
|
54
|
+
// : [_zephyrOptions];
|
|
55
|
+
/* zephyrOptions.forEach((zephyrOption) => {
|
|
56
|
+
if (!zephyrOption) return;
|
|
57
|
+
|
|
58
|
+
config.plugins?.push(
|
|
59
|
+
new ModuleFederationPlugin({
|
|
60
|
+
name: application_uid,
|
|
61
|
+
filename: 'remoteEntry.js',
|
|
62
|
+
shared: packageJson?.dependencies,
|
|
63
|
+
exposes: zephyrOption?.exposes,
|
|
64
|
+
// todo: rework this part
|
|
65
|
+
// remotes: zephyrOption.remotes?.map((application) =>
|
|
66
|
+
// replace_remote_with_delegate(
|
|
67
|
+
// application,
|
|
68
|
+
// Object.assign({}, delegate_config, { application })
|
|
69
|
+
// )
|
|
70
|
+
// )
|
|
71
|
+
}),
|
|
72
|
+
);
|
|
73
|
+
});*/
|
|
74
|
+
}
|
|
90
75
|
//# sourceMappingURL=with-zephyr.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/with-zephyr.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/with-zephyr.ts"],"names":[],"mappings":";;;AACA,+DAAyD;AAEzD,iFAAmE;AACnE,uEAA0D;AAC1D,2DAAsD;AAEtD,SAAS,kBAAkB,CAAC,MAAqB;IAC/C,OAAO,MAAM,CAAC,OAAO;QACnB,EAAE,MAAM,CACN,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CACpE;SACA,GAAG,CAAC,CAAC,EAAW,EAAE,EAAE;QACnB,MAAM,GAAG,GAAG,EAA2B,CAAC;QACxC,IAAI,CAAC,GAAG,EAAE,QAAQ;YAAE,OAAO;QAE3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAED,SAAgB,UAAU;IACxB,gEAAgE;IAChE,OAAO,KAAK,UAAU,SAAS,CAC7B,MAAqB;QAErB,MAAM,WAAW,GAAG,IAAA,0CAAc,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW;YAAE,OAAO,MAAM,CAAC;QAEhC,MAAM,OAAO,GAAG,IAAA,iCAAU,GAAE,CAAC;QAE7B,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,IAAI;YAClE,OAAO,MAAM,CAAC;QAEhB,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE7C,MAAM,CAAC,OAAO,EAAE,IAAI,CAClB,IAAI,mCAAe,CAAC;YAClB,eAAe,EAAE,IAAA,wCAAiB,EAAC;gBACjC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;gBACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;gBAC5B,IAAI,EAAE,WAAW,EAAE,IAAI;aACxB,CAAC;YACF,GAAG,EAAE;gBACH,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;gBACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;aAC7B;YACD,GAAG,EAAE,OAAO,EAAE,GAAG;YACjB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SAC3D,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAnCD,gCAmCC;AAED,6DAA6D;AAC7D,SAAS,kCAAkC;IACzC,2BAA2B;IAC3B,0CAA0C;IAC1C,sDAAsD;IACtD,qBAAqB;IACrB,wBAAwB;IACxB;;;;;;;;;;;;;;;;;;aAkBS;AACX,CAAC"}
|
|
@@ -4,6 +4,8 @@ exports.setupZephyrConfig = exports.getBuildId = void 0;
|
|
|
4
4
|
const ze_http_request_1 = require("./utils/ze-http-request");
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
6
|
const ze_log_event_1 = require("./utils/ze-log-event");
|
|
7
|
+
const replace_remotes_with_delegates_1 = require("./dependency-resolution/replace-remotes-with-delegates");
|
|
8
|
+
const configuration_error_1 = require("./errors/configuration-error");
|
|
7
9
|
async function getBuildId(application_uid) {
|
|
8
10
|
const { BUILD_ID_ENDPOINT, user_uuid, jwt } = await (0, zephyr_edge_contract_1.getApplicationConfiguration)({
|
|
9
11
|
application_uid,
|
|
@@ -38,6 +40,29 @@ function setupZephyrConfig(pluginOptions, compiler) {
|
|
|
38
40
|
zeConfig.user = username;
|
|
39
41
|
zeConfig.edge_url = EDGE_URL;
|
|
40
42
|
zeConfig.buildId = void 0;
|
|
43
|
+
const resolvedDeps = await (0, replace_remotes_with_delegates_1.replaceRemotesWithDelegates)(compiler.options, {
|
|
44
|
+
org: pluginOptions.app.org,
|
|
45
|
+
project: pluginOptions.app.project,
|
|
46
|
+
});
|
|
47
|
+
const errors = resolvedDeps
|
|
48
|
+
.flat()
|
|
49
|
+
.filter((res) => res && res.error)
|
|
50
|
+
.map((result) => {
|
|
51
|
+
return result.application_uid;
|
|
52
|
+
});
|
|
53
|
+
if (errors?.length) {
|
|
54
|
+
const [sample_app_name, sample_project_name, sample_org_name] = errors[0].split('.');
|
|
55
|
+
throw new configuration_error_1.ConfigurationError(`Could not resolve remote entry points for urls: \n
|
|
56
|
+
${errors.map((str) => `\t- ${str}`).join('\n')}\n\n
|
|
57
|
+
Please build them with Zephyr first or add as Unmanaged applications.\n
|
|
58
|
+
Note: you can read application uid as follows:
|
|
59
|
+
\t - ${sample_app_name} - project.json 'name' field of remote application
|
|
60
|
+
\t - ${sample_project_name} - git repository name
|
|
61
|
+
\t - ${sample_org_name} - git organization name
|
|
62
|
+
|
|
63
|
+
Or join and ask question in our discord: https://discord.gg/EqFbSSt8Hx
|
|
64
|
+
`);
|
|
65
|
+
}
|
|
41
66
|
const buildId = await getBuildId(application_uid).catch((err) => {
|
|
42
67
|
logEvent({
|
|
43
68
|
level: 'error',
|
|
@@ -45,7 +70,6 @@ function setupZephyrConfig(pluginOptions, compiler) {
|
|
|
45
70
|
message: `error receiving build number for '${email}'`,
|
|
46
71
|
meta: err.message,
|
|
47
72
|
});
|
|
48
|
-
console.error(err);
|
|
49
73
|
});
|
|
50
74
|
if (buildId) {
|
|
51
75
|
zeConfig.buildId = buildId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-setup-build-id.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-build-id.ts"],"names":[],"mappings":";;;AACA,6DAAkD;AAGlD,+DAI8B;AAC9B,uDAA8C;
|
|
1
|
+
{"version":3,"file":"ze-setup-build-id.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-build-id.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,11 +10,11 @@ function logBuildSteps(pluginOptions, compiler) {
|
|
|
10
10
|
if (!zeConfig.buildId)
|
|
11
11
|
return cb();
|
|
12
12
|
buildStartedAt = Date.now();
|
|
13
|
-
logEvent({
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
});
|
|
13
|
+
// logEvent({
|
|
14
|
+
// level: 'info',
|
|
15
|
+
// action: 'build:started',
|
|
16
|
+
// message: `${buildEnv} build started`,
|
|
17
|
+
// });
|
|
18
18
|
cb();
|
|
19
19
|
});
|
|
20
20
|
compiler.hooks.done.tap(pluginName, () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-setup-build-steps-logging.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-build-steps-logging.ts"],"names":[],"mappings":";;;AACA,uDAA8C;AAG9C,SAAgB,aAAa,CAC3B,aAAqC,EACrC,QAAkB;IAElB,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IAEvC,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;IACxB,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;QACrE,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO,EAAE,EAAE,CAAC;QACnC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC5B,
|
|
1
|
+
{"version":3,"file":"ze-setup-build-steps-logging.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-build-steps-logging.ts"],"names":[],"mappings":";;;AACA,uDAA8C;AAG9C,SAAgB,aAAa,CAC3B,aAAqC,EACrC,QAAkB;IAElB,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IAEvC,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;IACxB,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE;QACrE,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO,EAAE,EAAE,CAAC;QACnC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC5B,aAAa;QACb,mBAAmB;QACnB,6BAA6B;QAC7B,0CAA0C;QAC1C,MAAM;QACN,EAAE,EAAE,CAAC;IACP,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE;QACvC,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO;QAC9B,QAAQ,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,GAAG,QAAQ,sBAAsB,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,IAAI;SAC1E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE;QAC5C,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO;QAC9B,QAAQ,CAAC;YACP,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,cAAc;YACtB,OAAO,EAAE,GAAG,QAAQ,oBAAoB,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,IAAI;YACvE,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE;SAChC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC;AArCD,sCAqCC"}
|
|
@@ -53,6 +53,8 @@ function setupZeDeploy(pluginOptions, compiler) {
|
|
|
53
53
|
return await (0, ze_upload_build_stats_1.zeUploadBuildStats)(dashData);
|
|
54
54
|
};
|
|
55
55
|
const envs = (await dashboardPlugin.processWebpackGraph(compilation));
|
|
56
|
+
if (!envs)
|
|
57
|
+
return;
|
|
56
58
|
// end of dashboard plugin hack around
|
|
57
59
|
await (0, ze_enable_snapshot_on_edge_1.zeEnableSnapshotOnEdge)(pluginOptions, snapshot, envs.value);
|
|
58
60
|
logEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-setup-ze-deploy.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-ze-deploy.ts"],"names":[],"mappings":";;;AACA,uDAA8C;AAC9C,qFAA8E;AAC9E,qEAAgE;AAChE,iEAA4D;AAC5D,gFAA0E;AAC1E,4EAAsE;AAGtE,2EAAqE;AACrE,+DAG8B;AAE9B,SAAgB,aAAa,CAC3B,aAAqC,EACrC,QAAkB;IAElB,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IAC/C,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,aAAa,CAAC,CAAC;IAEvC,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,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtB,6BAA6B;gBAC7B,OAAO;YACT,CAAC;YAED,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,kDAA2B,EACrE,EAAE,eAAe,EAAE,aAAa,CAAC,eAAe,EAAE,CACnD,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,IAAA,sCAAgB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,IAAA,kCAAc,EAAC;gBAC9B,OAAO,EAAE,aAAa;gBACtB,MAAM,EAAE,SAAS;gBACjB,QAAQ;gBACR,KAAK;aACN,CAAC,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAgB,EAC1C,aAAa,EACb,QAAQ,CACT,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YACvB,IAAI,OAAO,aAAa,KAAK,WAAW;gBAAE,OAAO;YAEjD,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAc,EAAC,aAAa,EAAE;gBAC9D,aAAa;gBACb,SAAS;gBACT,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM;aAClC,CAAC,CAAC;YACH,IAAI,CAAC,mBAAmB;gBAAE,OAAO;YAEjC,2BAA2B;YAC3B,MAAM,eAAe,GAAI,aAAqB;iBAC3C,SAAsC,CAAC;YAE1C,iDAAiD;YACjD,2BAA2B;YAC3B,eAAe,CAAC,iBAAiB,GAAG,KAAK,EAAE,QAAa,EAAE,EAAE;gBAC1D,QAAQ,CAAC,GAAG,CAAC,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACtD,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC;gBACnD,6DAA6D;gBAC7D,QAAQ,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;gBAClC,OAAO,MAAM,IAAA,0CAAkB,EAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC,CAAC;YAEF,MAAM,IAAI,GAAG,CAAC,MAAM,eAAe,CAAC,mBAAmB,CACrD,WAAW,CACZ,
|
|
1
|
+
{"version":3,"file":"ze-setup-ze-deploy.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-setup-ze-deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,33 +1,7 @@
|
|
|
1
1
|
import type { Compiler } from 'webpack';
|
|
2
|
+
import { ZeWebpackPluginOptions } from '../types/ze-webpack-plugin-options';
|
|
2
3
|
export declare class ZeWebpackPlugin {
|
|
3
|
-
_options:
|
|
4
|
-
pluginName: string;
|
|
5
|
-
isCI: boolean;
|
|
6
|
-
buildEnv: string;
|
|
7
|
-
readonly appName: string;
|
|
8
|
-
readonly username: string;
|
|
9
|
-
zeConfig: {
|
|
10
|
-
user: string;
|
|
11
|
-
buildId: undefined;
|
|
12
|
-
edge_url: string;
|
|
13
|
-
};
|
|
14
|
-
application_uid: string;
|
|
15
|
-
app: {
|
|
16
|
-
org: string;
|
|
17
|
-
project: string;
|
|
18
|
-
name: string;
|
|
19
|
-
version: string;
|
|
20
|
-
};
|
|
21
|
-
git: {
|
|
22
|
-
name: string;
|
|
23
|
-
email: string;
|
|
24
|
-
branch: string;
|
|
25
|
-
commit: string;
|
|
26
|
-
};
|
|
27
|
-
dashboard: {
|
|
28
|
-
apply: (compiler: Compiler) => void;
|
|
29
|
-
};
|
|
30
|
-
};
|
|
4
|
+
_options: ZeWebpackPluginOptions;
|
|
31
5
|
constructor(options?: {});
|
|
32
6
|
apply(compiler: Compiler): void;
|
|
33
7
|
}
|
|
@@ -5,46 +5,15 @@ const isCI = require("is-ci");
|
|
|
5
5
|
const ze_setup_build_id_1 = require("./ze-setup-build-id");
|
|
6
6
|
const ze_setup_build_steps_logging_1 = require("./ze-setup-build-steps-logging");
|
|
7
7
|
const ze_setup_ze_deploy_1 = require("./ze-setup-ze-deploy");
|
|
8
|
-
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
9
8
|
const FederationDashboardPlugin_1 = require("../federation-dashboard-legacy/utils/federation-dashboard-plugin/FederationDashboardPlugin");
|
|
10
9
|
const pluginName = 'ZeWebpackPlugin';
|
|
11
10
|
const default_zewebpack_options = {
|
|
12
11
|
pluginName,
|
|
13
12
|
isCI,
|
|
14
13
|
buildEnv: isCI ? 'ci' : 'local',
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
},
|
|
18
|
-
get username() {
|
|
19
|
-
return this.zeConfig.user;
|
|
20
|
-
},
|
|
21
|
-
zeConfig: {
|
|
22
|
-
user: '',
|
|
23
|
-
buildId: void 0,
|
|
24
|
-
edge_url: '',
|
|
25
|
-
},
|
|
26
|
-
application_uid: '',
|
|
27
|
-
app: {
|
|
28
|
-
// git org
|
|
29
|
-
org: '',
|
|
30
|
-
// git repo
|
|
31
|
-
project: '',
|
|
32
|
-
// package.json name
|
|
33
|
-
name: '',
|
|
34
|
-
// package.json version
|
|
35
|
-
version: '',
|
|
36
|
-
},
|
|
37
|
-
// todo: what if git not configured? - skip for now
|
|
38
|
-
git: {
|
|
39
|
-
name: '',
|
|
40
|
-
email: '',
|
|
41
|
-
branch: '',
|
|
42
|
-
commit: '',
|
|
43
|
-
},
|
|
44
|
-
dashboard: {
|
|
45
|
-
// eslint-disable-next-line
|
|
46
|
-
apply: (compiler) => { },
|
|
47
|
-
},
|
|
14
|
+
zeConfig: {},
|
|
15
|
+
app: {},
|
|
16
|
+
git: {},
|
|
48
17
|
};
|
|
49
18
|
class ZeWebpackPlugin {
|
|
50
19
|
constructor(options = {}) {
|
|
@@ -54,20 +23,20 @@ class ZeWebpackPlugin {
|
|
|
54
23
|
apply(compiler) {
|
|
55
24
|
(0, ze_setup_build_id_1.setupZephyrConfig)(this._options, compiler);
|
|
56
25
|
(0, ze_setup_build_steps_logging_1.logBuildSteps)(this._options, compiler);
|
|
57
|
-
|
|
58
|
-
// - dash plugin should call a cb with data to be uploaded to API
|
|
59
|
-
// -
|
|
60
|
-
this._options.dashboard = new FederationDashboardPlugin_1.FederationDashboardPlugin({
|
|
61
|
-
zeOptions: this._options,
|
|
62
|
-
app: this._options.app,
|
|
63
|
-
git: this._options.git,
|
|
64
|
-
context: {
|
|
65
|
-
isCI,
|
|
66
|
-
},
|
|
67
|
-
});
|
|
68
|
-
this._options.dashboard.apply(compiler);
|
|
26
|
+
setupDashboardPlugin(this._options, compiler);
|
|
69
27
|
(0, ze_setup_ze_deploy_1.setupZeDeploy)(this._options, compiler);
|
|
70
28
|
}
|
|
71
29
|
}
|
|
72
30
|
exports.ZeWebpackPlugin = ZeWebpackPlugin;
|
|
31
|
+
function setupDashboardPlugin(pluginOptions, compiler) {
|
|
32
|
+
pluginOptions.dashboard = new FederationDashboardPlugin_1.FederationDashboardPlugin({
|
|
33
|
+
zeOptions: pluginOptions,
|
|
34
|
+
app: pluginOptions.app,
|
|
35
|
+
git: pluginOptions.git,
|
|
36
|
+
context: {
|
|
37
|
+
isCI,
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
pluginOptions.dashboard.apply(compiler);
|
|
41
|
+
}
|
|
73
42
|
//# sourceMappingURL=ze-webpack-plugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-webpack-plugin.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-webpack-plugin.ts"],"names":[],"mappings":";;;AACA,8BAA8B;AAE9B,2DAAwD;AACxD,iFAA+D;AAC/D,6DAAqD;AACrD
|
|
1
|
+
{"version":3,"file":"ze-webpack-plugin.js","sourceRoot":"","sources":["../../../../../packages/zephyr-webpack-plugin/src/lib/ze-webpack-plugin.ts"],"names":[],"mappings":";;;AACA,8BAA8B;AAE9B,2DAAwD;AACxD,iFAA+D;AAC/D,6DAAqD;AACrD,0IAAuI;AAGvI,MAAM,UAAU,GAAG,iBAAiB,CAAC;AAErC,MAAM,yBAAyB,GAAG;IAChC,UAAU;IACV,IAAI;IACJ,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;IAC/B,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,EAAE;IACP,GAAG,EAAE,EAAE;CACR,CAAC;AAEF,MAAa,eAAe;IAG1B,YAAY,OAAO,GAAG,EAAE;QAFxB,aAAQ,GAAG,yBAAmD,CAAC;QAG7D,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,IAAA,qCAAiB,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAA,4CAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACvC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAA,kCAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;CACF;AAbD,0CAaC;AAED,SAAS,oBAAoB,CAC3B,aAAqC,EACrC,QAAkB;IAElB,aAAa,CAAC,SAAS,GAAG,IAAI,qDAAyB,CAAC;QACtD,SAAS,EAAE,aAAa;QACxB,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,OAAO,EAAE;YACP,IAAI;SACL;KACF,CAAC,CAAC;IACH,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { FederationDashboardPlugin } from '../federation-dashboard-legacy/utils/federation-dashboard-plugin/FederationDashboardPlugin';
|
|
1
2
|
export interface ZeWebpackPluginOptions {
|
|
2
3
|
pluginName: string;
|
|
3
4
|
isCI: boolean;
|
|
@@ -29,4 +30,5 @@ export interface ZeWebpackPluginOptions {
|
|
|
29
30
|
remotes?: Record<string, string>;
|
|
30
31
|
shared?: Record<string, unknown>;
|
|
31
32
|
};
|
|
33
|
+
dashboard?: FederationDashboardPlugin;
|
|
32
34
|
}
|
package/README.md
DELETED
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
# Zephyr: We made application federation easy
|
|
2
|
-
|
|
3
|
-
readme too be released
|
|
4
|
-
|
|
5
|
-
how to use?
|
|
6
|
-
|
|
7
|
-
with Nx, Webpack or Rspack
|
|
8
|
-
|
|
9
|
-
```
|
|
10
|
-
export default composePlugins(
|
|
11
|
-
withNx(),
|
|
12
|
-
withReact(),
|
|
13
|
-
withModuleFederation(mfConfig),
|
|
14
|
-
withZephyr(),
|
|
15
|
-
(config) => {
|
|
16
|
-
return config;
|
|
17
|
-
}
|
|
18
|
-
);
|
|
19
|
-
```
|
|
20
|
-
|
|
21
|
-
or
|
|
22
|
-
|
|
23
|
-
```
|
|
24
|
-
module.exports = withZephyr()(your_webpack_config);
|
|
25
|
-
|
|
26
|
-
```
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPackageJson = void 0;
|
|
4
|
-
const node_fs_1 = require("node:fs");
|
|
5
|
-
const node_path_1 = require("node:path");
|
|
6
|
-
function findClosestPackageJson(startPath) {
|
|
7
|
-
let dir = startPath;
|
|
8
|
-
do {
|
|
9
|
-
const packageJsonPath = (0, node_path_1.join)(dir, 'package.json');
|
|
10
|
-
if ((0, node_fs_1.existsSync)(packageJsonPath)) {
|
|
11
|
-
return (0, node_fs_1.readFileSync)(packageJsonPath, 'utf8');
|
|
12
|
-
}
|
|
13
|
-
const parentDir = (0, node_path_1.resolve)(dir, '..');
|
|
14
|
-
if (parentDir === dir) {
|
|
15
|
-
throw new Error('No package.json found');
|
|
16
|
-
}
|
|
17
|
-
dir = parentDir;
|
|
18
|
-
} while (startPath !== dir);
|
|
19
|
-
}
|
|
20
|
-
function getPackageJson(context) {
|
|
21
|
-
const packageJson = findClosestPackageJson(context || process.cwd());
|
|
22
|
-
if (!packageJson)
|
|
23
|
-
return void 0;
|
|
24
|
-
try {
|
|
25
|
-
return JSON.parse(packageJson);
|
|
26
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
27
|
-
}
|
|
28
|
-
catch (error) {
|
|
29
|
-
// todo: logger
|
|
30
|
-
console.error('Error:', error?.message);
|
|
31
|
-
return void 0;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
exports.getPackageJson = getPackageJson;
|
|
35
|
-
//# sourceMappingURL=ze-util-find-app-name.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ze-util-find-app-name.js","sourceRoot":"","sources":["../../../../../../packages/zephyr-webpack-plugin/src/lib/utils/ze-util-find-app-name.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AACnD,yCAA0C;AAE1C,SAAS,sBAAsB,CAAC,SAAiB;IAC/C,IAAI,GAAG,GAAG,SAAS,CAAC;IACpB,GAAG,CAAC;QACF,MAAM,eAAe,GAAG,IAAA,gBAAI,EAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAClD,IAAI,IAAA,oBAAU,EAAC,eAAe,CAAC,EAAE,CAAC;YAChC,OAAO,IAAA,sBAAY,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,mBAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QACD,GAAG,GAAG,SAAS,CAAC;IAClB,CAAC,QAAQ,SAAS,KAAK,GAAG,EAAE;AAC9B,CAAC;AAQD,SAAgB,cAAc,CAC5B,OAA2B;IAE3B,MAAM,WAAW,GAAG,sBAAsB,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/B,8DAA8D;IAChE,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,eAAe;QACf,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACxC,OAAO,KAAK,CAAC,CAAC;IAChB,CAAC;AACH,CAAC;AAbD,wCAaC"}
|
|
File without changes
|