@nx/angular 16.0.0-beta.8 → 16.0.0-rc.1
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 +10 -10
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/utils/mf/utils.d.ts +4 -2
- package/src/utils/mf/utils.js +30 -9
- package/src/utils/mf/utils.js.map +1 -1
- package/src/utils/mf/with-module-federation-ssr.d.ts +1 -1
- package/src/utils/mf/with-module-federation-ssr.js +1 -14
- package/src/utils/mf/with-module-federation-ssr.js.map +1 -1
- package/src/utils/mf/with-module-federation.d.ts +1 -1
- package/src/utils/mf/with-module-federation.js +1 -14
- package/src/utils/mf/with-module-federation.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/angular",
|
|
3
|
-
"version": "16.0.0-
|
|
3
|
+
"version": "16.0.0-rc.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -72,14 +72,14 @@
|
|
|
72
72
|
"migrations": "./migrations.json"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
|
-
"@nrwl/angular": "16.0.0-
|
|
76
|
-
"@nx/cypress": "16.0.0-
|
|
77
|
-
"@nx/devkit": "16.0.0-
|
|
78
|
-
"@nx/jest": "16.0.0-
|
|
79
|
-
"@nx/js": "16.0.0-
|
|
80
|
-
"@nx/linter": "16.0.0-
|
|
81
|
-
"@nx/webpack": "16.0.0-
|
|
82
|
-
"@nx/workspace": "16.0.0-
|
|
75
|
+
"@nrwl/angular": "16.0.0-rc.1",
|
|
76
|
+
"@nx/cypress": "16.0.0-rc.1",
|
|
77
|
+
"@nx/devkit": "16.0.0-rc.1",
|
|
78
|
+
"@nx/jest": "16.0.0-rc.1",
|
|
79
|
+
"@nx/js": "16.0.0-rc.1",
|
|
80
|
+
"@nx/linter": "16.0.0-rc.1",
|
|
81
|
+
"@nx/webpack": "16.0.0-rc.1",
|
|
82
|
+
"@nx/workspace": "16.0.0-rc.1",
|
|
83
83
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
84
84
|
"chalk": "^4.1.0",
|
|
85
85
|
"chokidar": "^3.5.1",
|
|
@@ -119,5 +119,5 @@
|
|
|
119
119
|
"fesm2015": "fesm2015/nx-angular.mjs",
|
|
120
120
|
"typings": "index.d.ts",
|
|
121
121
|
"sideEffects": false,
|
|
122
|
-
"gitHead": "
|
|
122
|
+
"gitHead": "7660cf6ec0a37d5cf100519f978e921ee6a13d0f"
|
|
123
123
|
}
|
|
@@ -17,7 +17,7 @@ const module_info_1 = require("../utils/storybook-ast/module-info");
|
|
|
17
17
|
function cypressComponentConfiguration(tree, options) {
|
|
18
18
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
19
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
20
|
-
const installTask = yield (0, cypress_1.
|
|
20
|
+
const installTask = yield (0, cypress_1.cypressComponentConfiguration)(tree, {
|
|
21
21
|
project: options.project,
|
|
22
22
|
skipFormat: true,
|
|
23
23
|
});
|
package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"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"}
|
package/src/utils/mf/utils.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { ModuleFederationConfig, SharedLibraryConfig } from '@nx/devkit';
|
|
1
|
+
import { ModuleFederationConfig, SharedLibraryConfig } from '@nx/devkit/src/utils/module-federation';
|
|
2
2
|
export declare function applyDefaultEagerPackages(sharedConfig: Record<string, SharedLibraryConfig>): void;
|
|
3
3
|
export declare const DEFAULT_NPM_PACKAGES_TO_AVOID: string[];
|
|
4
4
|
export declare const DEFAULT_ANGULAR_PACKAGES_TO_SHARE: string[];
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function getFunctionDeterminateRemoteUrl(isServer?: boolean): (remote: string) => string;
|
|
6
|
+
export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, options?: {
|
|
6
7
|
isServer: boolean;
|
|
8
|
+
determineRemoteUrl?: (remote: string) => string;
|
|
7
9
|
}): Promise<{
|
|
8
10
|
sharedLibraries: import("@nx/devkit").SharedWorkspaceLibraryConfig;
|
|
9
11
|
sharedDependencies: {
|
package/src/utils/mf/utils.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getModuleFederationConfig = exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = exports.DEFAULT_NPM_PACKAGES_TO_AVOID = exports.applyDefaultEagerPackages = void 0;
|
|
3
|
+
exports.getModuleFederationConfig = exports.getFunctionDeterminateRemoteUrl = exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = exports.DEFAULT_NPM_PACKAGES_TO_AVOID = exports.applyDefaultEagerPackages = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const module_federation_1 = require("@nx/devkit/src/utils/module-federation");
|
|
5
6
|
const devkit_1 = require("@nx/devkit");
|
|
7
|
+
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
6
8
|
function applyDefaultEagerPackages(sharedConfig) {
|
|
7
9
|
const DEFAULT_PACKAGES_TO_LOAD_EAGERLY = [
|
|
8
10
|
'@angular/localize',
|
|
@@ -25,7 +27,24 @@ exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = [
|
|
|
25
27
|
'@angular/animations',
|
|
26
28
|
'@angular/common',
|
|
27
29
|
];
|
|
28
|
-
function
|
|
30
|
+
function getFunctionDeterminateRemoteUrl(isServer = false) {
|
|
31
|
+
const target = 'serve';
|
|
32
|
+
const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.mjs';
|
|
33
|
+
return function (remote) {
|
|
34
|
+
var _a, _b, _c, _d, _e;
|
|
35
|
+
const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
|
|
36
|
+
const serveTarget = (_a = remoteConfiguration === null || remoteConfiguration === void 0 ? void 0 : remoteConfiguration.targets) === null || _a === void 0 ? void 0 : _a[target];
|
|
37
|
+
if (!serveTarget) {
|
|
38
|
+
throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "serve" target.\n
|
|
39
|
+
You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
|
|
40
|
+
}
|
|
41
|
+
const host = (_c = (_b = serveTarget.options) === null || _b === void 0 ? void 0 : _b.host) !== null && _c !== void 0 ? _c : 'http://localhost';
|
|
42
|
+
const port = (_e = (_d = serveTarget.options) === null || _d === void 0 ? void 0 : _d.port) !== null && _e !== void 0 ? _e : 4201;
|
|
43
|
+
return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/${remoteEntry}`;
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
|
|
47
|
+
function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
|
|
29
48
|
var _a;
|
|
30
49
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
31
50
|
let projectGraph;
|
|
@@ -38,13 +57,13 @@ function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isS
|
|
|
38
57
|
if (!((_a = projectGraph.nodes[mfConfig.name]) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
39
58
|
throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
|
|
40
59
|
}
|
|
41
|
-
const dependencies = (0,
|
|
60
|
+
const dependencies = (0, module_federation_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
|
|
42
61
|
if (mfConfig.shared) {
|
|
43
62
|
dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.importKey, {}) !== false);
|
|
44
63
|
dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}) !== false);
|
|
45
64
|
}
|
|
46
|
-
const sharedLibraries = (0,
|
|
47
|
-
const npmPackages = (0,
|
|
65
|
+
const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
66
|
+
const npmPackages = (0, module_federation_1.sharePackages)(Array.from(new Set([
|
|
48
67
|
...exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
|
|
49
68
|
...dependencies.npmPackages.filter((pkg) => !exports.DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)),
|
|
50
69
|
])));
|
|
@@ -55,12 +74,14 @@ function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isS
|
|
|
55
74
|
});
|
|
56
75
|
const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
|
|
57
76
|
applyDefaultEagerPackages(sharedDependencies);
|
|
58
|
-
(0,
|
|
59
|
-
(0,
|
|
60
|
-
const
|
|
77
|
+
(0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
|
|
78
|
+
(0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
|
|
79
|
+
const determineRemoteUrlFn = options.determineRemoteUrl ||
|
|
80
|
+
getFunctionDeterminateRemoteUrl(options.isServer);
|
|
81
|
+
const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
|
|
61
82
|
const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
|
|
62
83
|
? {}
|
|
63
|
-
: mapRemotesFunction(mfConfig.remotes, 'mjs',
|
|
84
|
+
: mapRemotesFunction(mfConfig.remotes, 'mjs', determineRemoteUrlFn);
|
|
64
85
|
return { sharedLibraries, sharedDependencies, mappedRemotes };
|
|
65
86
|
});
|
|
66
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { ModuleFederationConfig } from '@nx/devkit';
|
|
1
|
+
import { ModuleFederationConfig } from '@nx/devkit/src/utils/module-federation';
|
|
2
2
|
export declare function withModuleFederationForSSR(options: ModuleFederationConfig): Promise<(config: any) => any>;
|
|
@@ -2,23 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.withModuleFederationForSSR = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
6
5
|
const utils_1 = require("./utils");
|
|
7
|
-
function determineRemoteUrl(remote) {
|
|
8
|
-
const remoteProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
|
|
9
|
-
let publicHost = '';
|
|
10
|
-
try {
|
|
11
|
-
publicHost = remoteProjectConfiguration.targets.serve.options.publicHost;
|
|
12
|
-
}
|
|
13
|
-
catch (error) {
|
|
14
|
-
throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "publicHost" in the project's "serve" target.\n
|
|
15
|
-
You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
|
|
16
|
-
}
|
|
17
|
-
return `${publicHost.endsWith('/') ? publicHost.slice(0, -1) : publicHost}/server/remoteEntry.js`;
|
|
18
|
-
}
|
|
19
6
|
function withModuleFederationForSSR(options) {
|
|
20
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options,
|
|
8
|
+
const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, {
|
|
22
9
|
isServer: true,
|
|
23
10
|
});
|
|
24
11
|
return (config) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/with-module-federation-ssr.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"with-module-federation-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/with-module-federation-ssr.ts"],"names":[],"mappings":";;;;AACA,mCAAoD;AAEpD,SAAsB,0BAA0B,CAC9C,OAA+B;;QAE/B,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEL,OAAO,CAAC,MAAM,EAAE,EAAE;;YAAC,OAAA,iCACd,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,KACjB,MAAM,EAAE,KAAK,EACb,MAAM,kCACD,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,KACxB,UAAU,EAAE,OAAO,CAAC,IAAI,KAE1B,YAAY,kCACP,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,EAAE,CAAC,KAC9B,YAAY,EAAE,KAAK,KAErB,OAAO,kCACF,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC,KACzB,KAAK,kCACA,CAAC,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,mCAAI,EAAE,CAAC,GAC7B,eAAe,CAAC,UAAU,EAAE,MAGnC,OAAO,EAAE;oBACP,GAAG,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC;oBACzB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,CAChE;wBACE,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,QAAQ,EAAE,gBAAgB;wBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,OAAO,EAAE,aAAa;wBACtB,MAAM,oBACD,kBAAkB,CACtB;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,iBAAiB;yBACxB;wBACD,QAAQ,EAAE,IAAI;qBACf,EACD,EAAE,CACH;oBACD,eAAe,CAAC,oBAAoB,EAAE;iBACvC,IACD,CAAA;SAAA,CAAC;IACL,CAAC;CAAA;AA/CD,gEA+CC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { ModuleFederationConfig } from '@nx/devkit';
|
|
1
|
+
import { ModuleFederationConfig } from '@nx/devkit/src/utils/module-federation';
|
|
2
2
|
export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any) => any>;
|
|
@@ -3,23 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.withModuleFederation = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
|
-
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
7
6
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
8
|
-
function determineRemoteUrl(remote) {
|
|
9
|
-
const remoteProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
|
|
10
|
-
let publicHost = '';
|
|
11
|
-
try {
|
|
12
|
-
publicHost = remoteProjectConfiguration.targets.serve.options.publicHost;
|
|
13
|
-
}
|
|
14
|
-
catch (error) {
|
|
15
|
-
throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "publicHost" in the project's "serve" target.\n
|
|
16
|
-
You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
|
|
17
|
-
}
|
|
18
|
-
return `${publicHost.endsWith('/') ? publicHost.slice(0, -1) : publicHost}/remoteEntry.mjs`;
|
|
19
|
-
}
|
|
20
7
|
function withModuleFederation(options) {
|
|
21
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options
|
|
9
|
+
const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options);
|
|
23
10
|
return (config) => {
|
|
24
11
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
25
12
|
return (Object.assign(Object.assign({}, (config !== null && config !== void 0 ? config : {})), { output: Object.assign(Object.assign({}, ((_a = config.output) !== null && _a !== void 0 ? _a : {})), { uniqueName: options.name, publicPath: 'auto' }), optimization: Object.assign(Object.assign({}, ((_b = config.optimization) !== null && _b !== void 0 ? _b : {})), { runtimeChunk: false }), resolve: Object.assign(Object.assign({}, ((_c = config.resolve) !== null && _c !== void 0 ? _c : {})), { alias: Object.assign(Object.assign({}, ((_e = (_d = config.resolve) === null || _d === void 0 ? void 0 : _d.alias) !== null && _e !== void 0 ? _e : {})), sharedLibraries.getAliases()) }), experiments: Object.assign(Object.assign({}, ((_f = config.experiments) !== null && _f !== void 0 ? _f : {})), { outputModule: true }), plugins: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,mCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,mCAAoD;AACpD,uFAAwF;AAExF,SAAsB,oBAAoB,CAAC,OAA+B;;QACxE,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,CAAC,CAAC;QAE3C,OAAO,CAAC,MAAM,EAAE,EAAE;;YAAC,OAAA,iCACd,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,KACjB,MAAM,kCACD,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,KACxB,UAAU,EAAE,OAAO,CAAC,IAAI,EACxB,UAAU,EAAE,MAAM,KAEpB,YAAY,kCACP,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,EAAE,CAAC,KAC9B,YAAY,EAAE,KAAK,KAErB,OAAO,kCACF,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC,KACzB,KAAK,kCACA,CAAC,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,mCAAI,EAAE,CAAC,GAC7B,eAAe,CAAC,UAAU,EAAE,MAGnC,WAAW,kCACN,CAAC,MAAA,MAAM,CAAC,WAAW,mCAAI,EAAE,CAAC,KAC7B,YAAY,EAAE,IAAI,KAEpB,OAAO,EAAE;oBACP,GAAG,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC;oBACzB,IAAI,sBAAsB,CAAC;wBACzB,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,QAAQ,EAAE,iBAAiB;wBAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,OAAO,EAAE,aAAa;wBACtB,MAAM,oBACD,kBAAkB,CACtB;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,QAAQ;yBACf;qBACF,CAAC;oBACF,eAAe,CAAC,oBAAoB,EAAE;iBACvC,IACD,CAAA;SAAA,CAAC;IACL,CAAC;CAAA;AA3CD,oDA2CC"}
|