@nf-beta/angular 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nf-beta/angular",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "generators": "./collection.json",
   "builders": "./builders.json",
   "schematics": "./collection.json",
@@ -10,12 +10,13 @@
     "url": "http://www.angulararchitects.io"
   },
   "dependencies": {
-    "@nf-beta/core": "^0.0.5",
+    "@nf-beta/core": "^0.0.8",
     "@angular-devkit/architect": "^0.2100.4",
     "@angular-devkit/build-angular": "^21.0.4",
     "@angular-devkit/core": "^21.0.4",
     "@angular-devkit/schematics": "^21.0.4",
-    "@angular/build": "^21.0.4"
+    "@angular/build": "^21.0.4",
+    "@chialab/esbuild-plugin-commonjs": "^0.19.0"
   },
   "repository": {
     "type": "git",
@@ -24,6 +25,19 @@
   "ng-update": {
     "migrations": "./migration-collection.json"
   },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "types": "./src/index.d.ts",
+      "import": "./src/index.js",
+      "default": "./src/index.js"
+    },
+    "./config": {
+      "types": "./src/config.d.ts",
+      "import": "./src/config.js",
+      "default": "./src/config.js"
+    }
+  },
   "homepage": "https://github.com/native-federation/angular",
   "type": "module",
   "files": [

package/src/builders/build/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/builder.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAGnB,MAAM,2BAA2B,CAAC;AAgCnC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAsCnD,wBAAuB,UAAU,CAC/B,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CA8X9B;wBA6C2C,GAAG;AAA/C,wBAAgD"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/builder.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAGnB,MAAM,2BAA2B,CAAC;AA6BnC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAsCnD,wBAAuB,UAAU,CAC/B,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CA8X9B;wBA6C2C,GAAG;AAA/C,wBAAgD"}

package/src/builders/build/builder.js

@@ -5,7 +5,8 @@ import { buildApplication } from '@angular/build';
 import { buildApplicationInternal, serveWithVite } from '@angular/build/private';
 import { createBuilder, targetFromTargetString, } from '@angular-devkit/architect';
 import { normalizeOptions } from '@angular-devkit/build-angular/src/builders/dev-server/options.js';
-import { buildForFederation, getExternals, loadFederationConfig, logger, setBuildAdapter, setLogLevel, RebuildQueue, AbortedError, } from '@nf-beta/core/build';
+import { buildForFederation, getExternals, loadFederationConfig, setBuildAdapter, } from '@nf-beta/core';
+import { logger, setLogLevel, RebuildQueue, AbortedError } from '@nf-beta/core/internal';
 import { createAngularBuildAdapter, setMemResultHandler, } from '../../utils/angular-esbuild-adapter.js';
 import { existsSync, mkdirSync, rmSync } from 'fs';
 import { fstart } from '../../tools/fstart-as-data-url.js';

package/src/builders/build/federation-build-notifier.js

@@ -1,5 +1,5 @@
-import { BuildNotificationType } from '@nf-beta/runtime';
-import { logger } from '@nf-beta/core/build';
+import { BuildNotificationType } from '@nf-beta/core';
+import { logger } from '@nf-beta/core/internal';
 /**
  * Manages Server-Sent Events for federation hot reload in local development
  * Only active when running in development mode with dev server

package/src/config.d.ts

@@ -1,3 +1,4 @@
-export { findRootTsConfigJson, withNativeFederation, share, shareAll, DEFAULT_SKIP_LIST, } from '@nf-beta/core/build';
+export * from '@nf-beta/core/config';
+export { DEFAULT_SKIP_LIST } from '@nf-beta/core';
 export { shareAngularLocales } from './utils/angular-locales.js';
 //# sourceMappingURL=config.d.ts.map

package/src/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,KAAK,EACL,QAAQ,EACR,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC"}

package/src/config.js

@@ -1,2 +1,3 @@
-export { findRootTsConfigJson, withNativeFederation, share, shareAll, DEFAULT_SKIP_LIST, } from '@nf-beta/core/build';
+export * from '@nf-beta/core/config';
+export { DEFAULT_SKIP_LIST } from '@nf-beta/core';
 export { shareAngularLocales } from './utils/angular-locales.js';

package/src/index.d.ts

@@ -1,2 +1,2 @@
-export * from '@nf-beta/runtime';
+export * from '@nf-beta/core';
 //# sourceMappingURL=index.d.ts.map

package/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC"}

package/src/index.js

@@ -1 +1 @@
-export * from '@nf-beta/runtime';
+export * from '@nf-beta/core';

package/src/plugin/dev-externals-mixin.js

@@ -1,4 +1,4 @@
-import { federationBuilder } from '@nf-beta/core/build';
+import { federationBuilder } from '@nf-beta/core';
 import { filterExternals } from './externals-skip-list.js';
 // see: https://github.com/vitejs/vite/issues/6393#issuecomment-1006819717
 export const devExternalsMixin = {

package/src/plugin/index.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin } from 'vite';
-import { type BuildHelperParams } from '@nf-beta/core/build';
+import { type BuildHelperParams } from '@nf-beta/core';
 export declare const federation: (params: BuildHelperParams) => Plugin;
 //# sourceMappingURL=index.d.ts.map

package/src/plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugin/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAoD,MAAM,MAAM,CAAC;AAIrF,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,qBAAqB,CAAC;AAKhF,eAAO,MAAM,UAAU,GAAI,QAAQ,iBAAiB,KAAG,MAoCtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugin/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAoD,MAAM,MAAM,CAAC;AAIrF,OAAO,EAAE,KAAK,iBAAiB,EAA0C,MAAM,eAAe,CAAC;AAI/F,eAAO,MAAM,UAAU,GAAI,QAAQ,iBAAiB,KAAG,MAoCtD,CAAC"}

package/src/plugin/index.js

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { lookup } from 'mrmime';
 import { devExternalsMixin } from './dev-externals-mixin.js';
 import { filterExternals } from './externals-skip-list.js';
-import { federationBuilder } from '@nf-beta/core/build';
+import { federationBuilder } from '@nf-beta/core';
 export const federation = (params) => {
     return {
         ...devExternalsMixin,

package/src/utils/angular-esbuild-adapter.d.ts

@@ -1,4 +1,4 @@
-import { type BuildAdapter } from '@nf-beta/core/build';
+import { type BuildAdapter } from '@nf-beta/core';
 import * as esbuild from 'esbuild';
 import type { BuilderContext } from '@angular-devkit/architect';
 import type { ApplicationBuilderOptions } from '@angular/build';

package/src/utils/angular-esbuild-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-esbuild-adapter.d.ts","sourceRoot":"","sources":["../../../src/utils/angular-esbuild-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EAMlB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAWnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAShE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAQhE,OAAO,EAAE,KAAK,aAAa,EAAe,MAAM,qBAAqB,CAAC;AAMtE,MAAM,MAAM,gBAAgB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAKzF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAEnE;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,yBAAyB,EACzC,OAAO,EAAE,cAAc,EACvB,gBAAgB,GAAE,aAAiC,GAClD,YAAY,CAwFd;AAgSD,wBAAgB,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAErE"}
+{"version":3,"file":"angular-esbuild-adapter.d.ts","sourceRoot":"","sources":["../../../src/utils/angular-esbuild-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAWnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAShE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAQhE,OAAO,EAAE,KAAK,aAAa,EAAe,MAAM,qBAAqB,CAAC;AAMtE,MAAM,MAAM,gBAAgB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAKzF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAEnE;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,yBAAyB,EACzC,OAAO,EAAE,cAAc,EACvB,gBAAgB,GAAE,aAAiC,GAClD,YAAY,CAwFd;AAgSD,wBAAgB,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAErE"}

package/src/utils/angular-esbuild-adapter.js

@@ -1,4 +1,4 @@
-import { AbortedError, logger, } from '@nf-beta/core/build';
+import { logger, AbortedError } from '@nf-beta/core/internal';
 import * as esbuild from 'esbuild';
 import { transformSupportedBrowsersToTargets, getSupportedBrowsers, generateSearchDirectories, findTailwindConfiguration, loadPostcssConfiguration, } from '@angular/build/private';
 import { createCompilerPluginOptions } from './create-compiler-options.js';

package/src/utils/angular-locales.d.ts

@@ -1,19 +1,6 @@
-import { type SharedConfig } from '@nf-beta/core/build';
-export declare function shareAngularLocales(keys: string[], config?: SharedConfig): (string | {
-    [x: string]: SharedConfig & {
-        includeSecondaries?: boolean | {
-            skip: string | string[];
-            resolveGlob?: boolean;
-            keepAll?: boolean;
-        };
-    };
-})[] | {
-    [x: string]: SharedConfig & {
-        includeSecondaries?: boolean | {
-            skip: string | string[];
-            resolveGlob?: boolean;
-            keepAll?: boolean;
-        };
-    };
-};
+import { type ExternalConfig } from '@nf-beta/core/config';
+export declare function shareAngularLocales(keys: string[], opts?: {
+    config?: ExternalConfig;
+    legacy?: boolean;
+}): import("@nf-beta/core/config").ShareExternalsOptions;
 //# sourceMappingURL=angular-locales.d.ts.map

package/src/utils/angular-locales.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-locales.d.ts","sourceRoot":"","sources":["../../../src/utils/angular-locales.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE/D,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,YAIP;;;;;;;;;;;;;;;;EAeF"}
+{"version":3,"file":"angular-locales.d.ts","sourceRoot":"","sources":["../../../src/utils/angular-locales.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAElE,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,cAAc,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,wDAuBzD"}

package/src/utils/angular-locales.js

@@ -1,16 +1,21 @@
-import { share } from '@nf-beta/core/build';
-export function shareAngularLocales(keys, config = {
-    singleton: true,
-    strictVersion: true,
-    requiredVersion: 'auto',
-}) {
+import { share } from '@nf-beta/core/config';
+export function shareAngularLocales(keys, opts = {}) {
+    if (!opts.config) {
+        opts.config = {
+            singleton: true,
+            strictVersion: true,
+            requiredVersion: 'auto',
+        };
+    }
+    const ext = opts.legacy ? '.mjs' : '.js';
     const locales = keys.reduce((acc, key) => {
         acc[`@angular/common/locales/${key}`] = {
-            ...config,
-        };
-        acc[`@angular/common/locales/${key}`].packageInfo = {
-            ...(config.packageInfo ?? { esm: true, version: '0.0.0' }),
-            entryPoint: config.packageInfo?.entryPoint || `node_modules/@angular/common/locales/${key}.mjs`,
+            ...opts.config,
+            packageInfo: {
+                esm: true,
+                entryPoint: `node_modules/@angular/common/locales/${key}${ext}`,
+                ...opts.config.packageInfo,
+            },
         };
         return acc;
     }, {});

package/src/utils/i18n.d.ts

@@ -1,5 +1,5 @@
 import type { BuilderContext } from '@angular-devkit/architect';
-import type { FederationInfo } from '@nf-beta/runtime';
+import type { FederationInfo } from '@nf-beta/core';
 export type WorkspaceConfig = {
     i18n?: I18nConfig;
 };

package/src/utils/i18n.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../src/utils/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY,EAAE,MAAM,GAAG,kBAAkB,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,YAAY,CAAC,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAO5F;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,OAAO,GAAG,MAAM,EAAE,EAC5B,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,cAAc,iBAgDjC"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../src/utils/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY,EAAE,MAAM,GAAG,kBAAkB,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,YAAY,CAAC,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAO5F;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,OAAO,GAAG,MAAM,EAAE,EAC5B,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,cAAc,iBAgDjC"}

package/src/utils/i18n.js

@@ -1,4 +1,4 @@
-import { logger } from '@nf-beta/core/build';
+import { logger } from '@nf-beta/core/internal';
 import { execSync } from 'child_process';
 import path from 'path';
 import fs from 'fs';

package/src/utils/shared-mappings-plugin.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin } from 'esbuild';
-import type { MappedPath } from '@nf-beta/core/build';
+import type { MappedPath } from '@nf-beta/core/internal';
 export declare function createSharedMappingsPlugin(mappedPaths: MappedPath[]): Plugin;
 //# sourceMappingURL=shared-mappings-plugin.d.ts.map

package/src/utils/shared-mappings-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared-mappings-plugin.d.ts","sourceRoot":"","sources":["../../../src/utils/shared-mappings-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,SAAS,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CA8B5E"}
+{"version":3,"file":"shared-mappings-plugin.d.ts","sourceRoot":"","sources":["../../../src/utils/shared-mappings-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,SAAS,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CA8B5E"}

package/src/utils/updateIndexHtml.d.ts

@@ -1,4 +1,4 @@
-import type { FederationOptions } from '@nf-beta/core/build';
+import type { FederationOptions } from '@nf-beta/core';
 import type { NfBuilderSchema } from '../builders/build/schema.js';
 export declare function updateIndexHtml(fedOptions: FederationOptions, nfOptions: NfBuilderSchema): void;
 export declare function updateScriptTags(indexContent: string, nfOptions: NfBuilderSchema): string;

package/src/utils/updateIndexHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateIndexHtml.d.ts","sourceRoot":"","sources":["../../../src/utils/updateIndexHtml.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,wBAAgB,eAAe,CAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,QAuBxF;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,UAqBhF"}
+{"version":3,"file":"updateIndexHtml.d.ts","sourceRoot":"","sources":["../../../src/utils/updateIndexHtml.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,wBAAgB,eAAe,CAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,QAuBxF;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,UAqBhF"}