@nrwl/angular 14.0.0-beta.0 → 14.0.0-beta.1

package/executors.json

@@ -24,6 +24,11 @@
       "implementation": "./src/builders/webpack-server/webpack-server.impl",
       "schema": "./src/builders/webpack-server/schema.json",
       "description": "The `webpack-server` executor is very similar to the standard `dev-server` builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration."
+    },
+    "module-federation-dev-server": {
+      "implementation": "./src/builders/module-federation-dev-server/module-federation-dev-server.impl",
+      "schema": "./src/builders/module-federation-dev-server/schema.json",
+      "description": "The module-federation-dev-server executor is reserved exclusively for use with host Module Federation applications. It allows the user to specify which remote applications should be served with the host."
     }
   },
   "builders": {
@@ -51,6 +56,11 @@
       "implementation": "./src/builders/webpack-server/webpack-server.impl",
       "schema": "./src/builders/webpack-server/schema.json",
       "description": "The `webpack-server` executor is very similar to the standard `dev-server` builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration."
+    },
+    "module-federation-dev-server": {
+      "implementation": "./src/builders/module-federation-dev-server/module-federation-dev-server.impl",
+      "schema": "./src/builders/module-federation-dev-server/schema.json",
+      "description": "The module-federation-dev-server executor is reserved exclusively for use with host Module Federation applications. It allows the user to specify which remote applications should be served with the host."
     }
   }
 }

package/generators.d.ts

@@ -13,7 +13,7 @@ export * from './src/generators/stories/stories';
 export * from './src/generators/storybook-configuration/storybook-configuration';
 export * from './src/generators/upgrade-module/upgrade-module';
 export * from './src/generators/setup-mfe/setup-mfe';
-export * from './src/generators/mfe-host/mfe-host';
+export * from './src/generators/host/host';
 export * from './src/generators/scam/scam';
 export * from './src/generators/scam-directive/scam-directive';
 export * from './src/generators/scam-pipe/scam-pipe';
@@ -21,4 +21,4 @@ export * from './src/generators/add-linting/add-linting';
 export * from './src/generators/component-cypress-spec/component-cypress-spec';
 export * from './src/generators/component-story/component-story';
 export * from './src/generators/web-worker/web-worker';
-export * from './src/generators/mfe-remote/mfe-remote';
+export * from './src/generators/remote/remote';

package/generators.js

@@ -16,7 +16,7 @@ tslib_1.__exportStar(require("./src/generators/stories/stories"), exports);
 tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration"), exports);
 tslib_1.__exportStar(require("./src/generators/upgrade-module/upgrade-module"), exports);
 tslib_1.__exportStar(require("./src/generators/setup-mfe/setup-mfe"), exports);
-tslib_1.__exportStar(require("./src/generators/mfe-host/mfe-host"), exports);
+tslib_1.__exportStar(require("./src/generators/host/host"), exports);
 tslib_1.__exportStar(require("./src/generators/scam/scam"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-directive/scam-directive"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-pipe/scam-pipe"), exports);
@@ -24,5 +24,5 @@ tslib_1.__exportStar(require("./src/generators/add-linting/add-linting"), export
 tslib_1.__exportStar(require("./src/generators/component-cypress-spec/component-cypress-spec"), exports);
 tslib_1.__exportStar(require("./src/generators/component-story/component-story"), exports);
 tslib_1.__exportStar(require("./src/generators/web-worker/web-worker"), exports);
-tslib_1.__exportStar(require("./src/generators/mfe-remote/mfe-remote"), exports);
+tslib_1.__exportStar(require("./src/generators/remote/remote"), exports);
 //# sourceMappingURL=generators.js.map

package/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,uEAA6C;AAC7C,uFAA6D;AAC7D,2EAAiD;AACjD,uHAA6F;AAC7F,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,+EAAqD;AACrD,6EAAmD;AACnD,qEAA2C;AAC3C,yFAA+D;AAC/D,+EAAqD;AACrD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,iFAAuD;AACvD,iFAAuD"}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,uEAA6C;AAC7C,uFAA6D;AAC7D,2EAAiD;AACjD,uHAA6F;AAC7F,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,+EAAqD;AACrD,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,+EAAqD;AACrD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,iFAAuD;AACvD,yEAA+C"}

package/generators.json

@@ -71,11 +71,10 @@
       "aliases": ["secondary-entry-point", "entry-point"],
       "description": "Creates a secondary entry point for an Angular publishable library."
     },
-    "mfe-remote": {
-      "factory": "./src/generators/mfe-remote/mfe-remote.compat",
-      "schema": "./src/generators/mfe-remote/schema.json",
-      "aliases": ["remote"],
-      "description": "Generate a Remote Angular Micro-Frontend Application."
+    "remote": {
+      "factory": "./src/generators/remote/remote.compat",
+      "schema": "./src/generators/remote/schema.json",
+      "description": "Generate a Remote Angular Module Federation Application."
     },
     "move": {
       "factory": "./src/generators/move/move#angularMoveSchematic",
@@ -88,11 +87,10 @@
       "schema": "./src/generators/convert-to-with-mf/schema.json",
       "description": "Converts an old micro frontend configuration to use the new `withModuleFederation` helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n _**Note:** This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!_"
     },
-    "mfe-host": {
-      "factory": "./src/generators/mfe-host/mfe-host.compat",
-      "schema": "./src/generators/mfe-host/schema.json",
-      "aliases": ["host"],
-      "description": "Generate a Host Angular Micro Frontend Application."
+    "host": {
+      "factory": "./src/generators/host/host.compat",
+      "schema": "./src/generators/host/schema.json",
+      "description": "Generate a Host Angular Module Federation Application."
     },
     "ng-add": {
       "factory": "./src/generators/ng-add/compat",
@@ -220,11 +218,10 @@
       "aliases": ["secondary-entry-point", "entry-point"],
       "description": "Creates a secondary entry point for an Angular publishable library."
     },
-    "mfe-remote": {
-      "factory": "./src/generators/mfe-remote/mfe-remote",
-      "schema": "./src/generators/mfe-remote/schema.json",
-      "aliases": ["remote"],
-      "description": "Generate a Remote Angular Micro-Frontend Application."
+    "remote": {
+      "factory": "./src/generators/remote/remote",
+      "schema": "./src/generators/remote/schema.json",
+      "description": "Generate a Remote Angular Module Federation Application."
     },
     "move": {
       "factory": "./src/generators/move/move#angularMoveGenerator",
@@ -237,11 +234,10 @@
       "schema": "./src/generators/convert-to-with-mf/schema.json",
       "description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n _**Note:** This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!_"
     },
-    "mfe-host": {
-      "factory": "./src/generators/mfe-host/mfe-host",
-      "schema": "./src/generators/mfe-host/schema.json",
-      "aliases": ["host"],
-      "description": "Generate a Host Angular Micro Frontend Application."
+    "host": {
+      "factory": "./src/generators/host/host",
+      "schema": "./src/generators/host/schema.json",
+      "description": "Generate a Host Angular Module Federation Application."
     },
     "ng-add": {
       "factory": "./src/generators/ng-add/ng-add",

package/migrations.json

@@ -106,6 +106,12 @@
       "version": "13.9.0-beta.4",
       "description": "Set buildLibsFromSource property to false to not break existing usage.",
       "factory": "./src/migrations/update-13-9-0/set-build-libs-from-source"
+    },
+    "rename-module-federation-config": {
+      "cli": "nx",
+      "version": "14.0.0-beta.1",
+      "description": "Rename mfe.config.js to module-federation.config.js for consistent terminology.",
+      "factory": "./src/migrations/update-14-0-0/rename-mf-config"
     }
   },
   "packageJsonUpdates": {

package/ng-package.json

@@ -9,6 +9,7 @@
     "@angular-eslint/",
     "@schematics",
     "@phenomnomnominal/tsquery",
+    "chalk",
     "ignore",
     "jasmine-marbles",
     "rxjs-for-await",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "14.0.0-beta.0",
+  "version": "14.0.0-beta.1",
   "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, Cypress, Karma, and Protractor. \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.",
   "repository": {
     "type": "git",
@@ -65,13 +65,15 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~13.3.0",
-    "@nrwl/cypress": "14.0.0-beta.0",
-    "@nrwl/devkit": "14.0.0-beta.0",
-    "@nrwl/jest": "14.0.0-beta.0",
-    "@nrwl/linter": "14.0.0-beta.0",
-    "@nrwl/storybook": "14.0.0-beta.0",
+    "@nrwl/cypress": "14.0.0-beta.1",
+    "@nrwl/devkit": "14.0.0-beta.1",
+    "@nrwl/jest": "14.0.0-beta.1",
+    "@nrwl/linter": "14.0.0-beta.1",
+    "@nrwl/storybook": "14.0.0-beta.1",
+    "@nrwl/workspace": "14.0.0-beta.1",
     "@schematics/angular": "~13.3.0",
     "@phenomnomnominal/tsquery": "4.1.1",
+    "chalk": "4.1.0",
     "ignore": "^5.0.4",
     "jasmine-marbles": "~0.8.4",
     "rxjs-for-await": "0.0.2",

package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts

@@ -0,0 +1,6 @@
+import type { Schema } from './schema';
+import { BuilderContext } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+export declare function moduleFederationDevServer(schema: Schema, context: BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<JsonObject & Schema>;
+export default _default;

package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.moduleFederationDevServer = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const architect_1 = require("@angular-devkit/architect");
+const path_1 = require("path");
+const webpack_server_impl_1 = require("../webpack-server/webpack-server.impl");
+function moduleFederationDevServer(schema, context) {
+    const workspaces = new devkit_1.Workspaces(context.workspaceRoot);
+    const workspaceConfig = workspaces.readWorkspaceConfiguration();
+    const p = workspaceConfig.projects[context.target.project];
+    const mfConfigPath = (0, path_1.join)(context.workspaceRoot, p.root, 'module-federation.config.js');
+    let mfeConfig;
+    try {
+        mfeConfig = require(mfConfigPath);
+    }
+    catch (_a) {
+        throw new Error(`Could not load ${mfConfigPath}. Was this project generated with "@nrwl/angular:host"?`);
+    }
+    const options = tslib_1.__rest(schema, []);
+    const unparsedRemotes = mfeConfig.remotes.length > 0 ? mfeConfig.remotes : [];
+    const remotes = unparsedRemotes.map((a) => (Array.isArray(a) ? a[0] : a));
+    for (const remote of remotes) {
+        (0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
+            project: remote,
+            target: 'serve',
+            configuration: context.target.configuration,
+            runOptions: {},
+            executor: context.builder.builderName,
+        }, options.verbose);
+    }
+    return (0, webpack_server_impl_1.webpackServer)(options, context);
+}
+exports.moduleFederationDevServer = moduleFederationDevServer;
+exports.default = (0, architect_1.createBuilder)(moduleFederationDevServer);
+//# sourceMappingURL=module-federation-dev-server.impl.js.map

package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;;AACA,yCAA0C;AAC1C,gEAA8D;AAC9D,yDAA0E;AAE1E,+BAA4B;AAC5B,+EAAsE;AAEtE,SAAgB,yBAAyB,CACvC,MAAc,EACd,OAAuB;IAEvB,MAAM,UAAU,GAAG,IAAI,mBAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,UAAU,CAAC,0BAA0B,EAAE,CAAC;IAEhE,MAAM,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE3D,MAAM,YAAY,GAAG,IAAA,WAAI,EACvB,OAAO,CAAC,aAAa,EACrB,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;IAEF,IAAI,SAAgC,CAAC;IACrC,IAAI;QACF,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KACnC;IAAC,WAAM;QACN,MAAM,IAAI,KAAK,CACb,kBAAkB,YAAY,yDAAyD,CACxF,CAAC;KACH;IAED,MAAW,OAAO,kBAAK,MAAM,EAAvB,EAAc,CAAS,CAAC;IAC9B,MAAM,eAAe,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1E,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAA,8BAAc,EACZ,OAAO,CAAC,aAAa,EACrB;YACE,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,OAAO;YACf,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa;YAC3C,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;SACtC,EACD,OAAO,CAAC,OAAO,CAChB,CAAC;KACH;IAED,OAAO,IAAA,mCAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AA3CD,8DA2CC;AAED,kBAAe,IAAA,yBAAa,EAAsB,yBAAyB,CAAC,CAAC"}

package/src/builders/module-federation-dev-server/schema.d.ts

@@ -0,0 +1,20 @@
+export interface Schema {
+  browserTarget: string;
+  port: number;
+  host: string;
+  proxyConfig?: string;
+  ssl: boolean;
+  sslKey?: string;
+  sslCert?: string;
+  headers?: Record<string, string>;
+  open: boolean;
+  verbose?: boolean;
+  liveReload: boolean;
+  publicHost?: string;
+  allowedHosts?: string[];
+  servePath?: string;
+  disableHostCheck?: boolean;
+  hmr?: boolean;
+  watch?: boolean;
+  poll?: number;
+}

package/src/builders/module-federation-dev-server/schema.json

@@ -0,0 +1,108 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Schema for Module Federation Dev Server",
+  "description": "The module-federation-dev-server executor is reserved exclusively for use with host Module Federation applications. It allows the user to specify which remote applications should be served with the host.",
+  "type": "object",
+  "presets": [
+    {
+      "name": "Using a Different Port",
+      "keys": ["browserTarget", "port"]
+    }
+  ],
+  "properties": {
+    "browserTarget": {
+      "type": "string",
+      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "port": {
+      "type": "number",
+      "description": "Port to listen on.",
+      "default": 4200
+    },
+    "host": {
+      "type": "string",
+      "description": "Host to listen on.",
+      "default": "localhost"
+    },
+    "proxyConfig": {
+      "type": "string",
+      "description": "Proxy configuration file. For more information, see https://angular.io/guide/build#proxying-to-a-backend-server."
+    },
+    "ssl": {
+      "type": "boolean",
+      "description": "Serve using HTTPS.",
+      "default": false
+    },
+    "sslKey": {
+      "type": "string",
+      "description": "SSL key to use for serving HTTPS."
+    },
+    "sslCert": {
+      "type": "string",
+      "description": "SSL certificate to use for serving HTTPS."
+    },
+    "headers": {
+      "type": "object",
+      "description": "Custom HTTP headers to be added to all responses.",
+      "propertyNames": {
+        "pattern": "^[-_A-Za-z0-9]+$"
+      },
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "open": {
+      "type": "boolean",
+      "description": "Opens the url in default browser.",
+      "default": false,
+      "alias": "o"
+    },
+    "verbose": {
+      "type": "boolean",
+      "description": "Adds more details to output logging."
+    },
+    "liveReload": {
+      "type": "boolean",
+      "description": "Whether to reload the page on change, using live-reload.",
+      "default": true
+    },
+    "publicHost": {
+      "type": "string",
+      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
+    },
+    "allowedHosts": {
+      "type": "array",
+      "description": "List of hosts that are allowed to access the dev server.",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "servePath": {
+      "type": "string",
+      "description": "The pathname where the app will be served."
+    },
+    "disableHostCheck": {
+      "type": "boolean",
+      "description": "Don't verify connected clients are part of allowed hosts.",
+      "default": false
+    },
+    "hmr": {
+      "type": "boolean",
+      "description": "Enable hot module replacement.",
+      "default": false
+    },
+    "watch": {
+      "type": "boolean",
+      "description": "Rebuild on change.",
+      "default": true
+    },
+    "poll": {
+      "type": "number",
+      "description": "Enable and define the file watching poll time period in milliseconds."
+    }
+  },
+  "additionalProperties": false,
+  "required": ["browserTarget"]
+}

package/src/generators/application/files/tsconfig.editor.json__tpl__

@@ -1,11 +1,5 @@
 {
   "extends": "./tsconfig.json",
   "include": ["**/*.ts"],
-  "compilerOptions": {
-    "types": [
-      <% if (unitTestRunner === 'jest') { %>"jest",<% } %>
-      <% if (unitTestRunner === 'karma') { %>"jasmine",<% } %>
-      "node"
-    ]
-  }
+  "compilerOptions": {}
 }

package/src/generators/application/lib/update-editor-tsconfig.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nrwl/devkit';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function updateEditorTsConfig(host: Tree, options: NormalizedSchema): void;
+export declare function updateEditorTsConfig(tree: Tree, options: NormalizedSchema): void;

package/src/generators/application/lib/update-editor-tsconfig.js

@@ -2,9 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateEditorTsConfig = void 0;
 const devkit_1 = require("@nrwl/devkit");
-function updateEditorTsConfig(host, options) {
+function getCompilerOptionsTypes(tsConfig) {
+    var _a, _b;
+    return (_b = (_a = tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) !== null && _b !== void 0 ? _b : [];
+}
+function updateEditorTsConfig(tree, options) {
+    const types = getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json')));
+    if (options.unitTestRunner !== 'none') {
+        types.concat(getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'))));
+    }
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json'), (json) => {
+        json.compilerOptions.types = types;
+        return json;
+    });
     // This should be the last tsconfig references so it's not in the template
-    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
         json.references.push({
             path: './tsconfig.editor.json',
         });

package/src/generators/application/lib/update-editor-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-editor-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-editor-tsconfig.ts"],"names":[],"mappings":";;;AAGA,yCAA6D;AAE7D,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACxE,0EAA0E;IAC1E,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,EAC1D,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,wBAAwB;SAC/B,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;AACJ,CAAC;AAZD,oDAYC"}
+{"version":3,"file":"update-editor-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-editor-tsconfig.ts"],"names":[],"mappings":";;;AAGA,yCAAuE;AAMvE,SAAS,uBAAuB,CAAC,QAAkB;;IACjD,OAAO,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,0CAAE,KAAK,mCAAI,EAAE,CAAC;AAChD,CAAC;AAED,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACxE,MAAM,KAAK,GAAG,uBAAuB,CACnC,IAAA,iBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAC/D,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,KAAK,CAAC,MAAM,CACV,uBAAuB,CACrB,IAAA,iBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAChE,CACF,CACF,CAAC;KACH;IAED,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,EACjE,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,KAAK,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;IAEF,0EAA0E;IAC1E,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,EAC1D,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,wBAAwB;SAC/B,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;AACJ,CAAC;AAvCD,oDAuCC"}

package/src/generators/application/schema.json

@@ -132,21 +132,21 @@
       "description": "Generate a Module Federation configuration for the application",
       "type": "boolean",
       "default": false,
-      "x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
+      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
     },
     "mfeType": {
       "type": "string",
       "enum": ["host", "remote"],
       "description": "Type of application to generate the Module Federation configuration for.",
       "default": "remote",
-      "x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
+      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
     },
     "federationType": {
       "type": "string",
       "enum": ["static", "dynamic"],
       "description": "Use either Static or Dynamic Module Federation pattern for the application.",
       "default": "static",
-      "x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
+      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
     },
     "port": {
       "type": "number",
@@ -155,12 +155,12 @@
     "remotes": {
       "type": "array",
       "description": "A list of remote application names that the host application should consume.",
-      "x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
+      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
     },
     "host": {
       "type": "string",
       "description": "The name of the host application that the remote application will be consumed by.",
-      "x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
+      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
     },
     "setParserOptionsProject": {
       "type": "boolean",

package/src/generators/convert-to-with-mf/convert-to-with-mf.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const devkit_2 = require("@nrwl/devkit");
-const get_mfe_projects_1 = require("../../utils/get-mfe-projects");
+const get_mf_projects_1 = require("../../utils/get-mf-projects");
 const lib_1 = require("./lib");
 function convertToWithMF(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = new Set((0, get_mfe_projects_1.getMfeProjects)(tree, { legacy: true }));
+        const projects = new Set((0, get_mf_projects_1.getMFProjects)(tree, { legacy: true }));
         if (!projects.has(schema.project)) {
             throw new Error(`Could not find project "${schema.project}" with a Micro Frontend configuration in your workspace. Please check the name of the project you're wishing to convert exists.`);
         }
@@ -23,9 +23,9 @@ function convertToWithMF(tree, schema) {
         There are npm packages being shared with a custom configuration in webpack config (${pathToWebpackConfig}).`);
         }
         devkit_1.logger.warn(`This Micro Frontend configuration conversion will overwrite "${schema.project}"'s current webpack config. If you have anything custom that is not related to Micro Frontends, it will be lost. You should be able to see the changes in your version control system.`);
-        const [updatedWebpackConfig, mfeConfig] = (0, lib_1.writeNewWebpackConfig)(webpackAst, (0, lib_1.isHostRemoteConfig)(webpackAst), schema.project);
+        const [updatedWebpackConfig, mfConfig] = (0, lib_1.writeNewWebpackConfig)(webpackAst, (0, lib_1.isHostRemoteConfig)(webpackAst), schema.project);
         tree.write(pathToWebpackConfig, updatedWebpackConfig);
-        tree.write((0, devkit_1.joinPathFragments)(project.root, 'mfe.config.js'), mfeConfig);
+        tree.write((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js'), mfConfig);
         yield (0, devkit_2.formatFiles)(tree);
     });
 }

package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-with-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.ts"],"names":[],"mappings":";;;AAAA,yCAA+D;AAG/D,yCAAqE;AACrE,mEAA8D;AAC9D,+BAOe;AAEf,SAA8B,eAAe,CAAC,IAAU,EAAE,MAAc;;QACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAA,iCAAc,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,CAAC,OAAO,iIAAiI,CAC3K,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,IAAA,0BAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAA,6BAAuB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAA,uCAAiC,EAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE;YAClE,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;wCACb,mBAAmB,gCAAgC,CACtF,CAAC;SACH;QAED,IAAI,CAAC,IAAA,yCAAmC,EAAC,UAAU,CAAC,EAAE;YACpD,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;6FACwC,mBAAmB,IAAI,CAC/G,CAAC;SACH;QAED,eAAM,CAAC,IAAI,CACT,gEAAgE,MAAM,CAAC,OAAO,wLAAwL,CACvQ,CAAC;QAEF,MAAM,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG,IAAA,2BAAqB,EAC7D,UAAU,EACV,IAAA,wBAAkB,EAAC,UAAU,CAAC,EAC9B,MAAM,CAAC,OAAO,CACf,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,SAAS,CAAC,CAAC;QAExE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAxCD,kCAwCC"}
+{"version":3,"file":"convert-to-with-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.ts"],"names":[],"mappings":";;;AAAA,yCAA+D;AAG/D,yCAAqE;AACrE,iEAA4D;AAC5D,+BAOe;AAEf,SAA8B,eAAe,CAAC,IAAU,EAAE,MAAc;;QACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAA,+BAAa,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,CAAC,OAAO,iIAAiI,CAC3K,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,IAAA,0BAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAA,6BAAuB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAA,uCAAiC,EAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE;YAClE,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;wCACb,mBAAmB,gCAAgC,CACtF,CAAC;SACH;QAED,IAAI,CAAC,IAAA,yCAAmC,EAAC,UAAU,CAAC,EAAE;YACpD,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;6FACwC,mBAAmB,IAAI,CAC/G,CAAC;SACH;QAED,eAAM,CAAC,IAAI,CACT,gEAAgE,MAAM,CAAC,OAAO,wLAAwL,CACvQ,CAAC;QAEF,MAAM,CAAC,oBAAoB,EAAE,QAAQ,CAAC,GAAG,IAAA,2BAAqB,EAC5D,UAAU,EACV,IAAA,wBAAkB,EAAC,UAAU,CAAC,EAC9B,MAAM,CAAC,OAAO,CACf,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,6BAA6B,CAAC,EAC9D,QAAQ,CACT,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA3CD,kCA2CC"}

package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js

@@ -4,7 +4,7 @@ exports.writeNewWebpackConfig = void 0;
 const is_host_remote_config_1 = require("./is-host-remote-config");
 function writeNewWebpackConfig(ast, mfType, projectName) {
     const webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
-  const config = require('./mfe.config');
+  const config = require('./module-federation.config');
   module.exports = withModuleFederation(config);`;
     let mfeConfig = '';
     if (!mfType) {

package/src/generators/host/host.compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const host_1 = require("./host");
+exports.default = (0, devkit_1.convertNxGenerator)(host_1.default);
+//# sourceMappingURL=host.compat.js.map

package/src/generators/host/host.compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"host.compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,iCAA0B;AAE1B,kBAAe,IAAA,2BAAkB,EAAC,cAAI,CAAC,CAAC"}

package/src/generators/host/host.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+import type { Schema } from './schema';
+export default function host(tree: Tree, options: Schema): Promise<() => void>;

package/src/generators/host/host.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const devkit_2 = require("@nrwl/devkit");
+const application_1 = require("../application/application");
+const remote_1 = require("../remote/remote");
+function host(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = (0, devkit_2.getProjects)(tree);
+        const remotesToGenerate = [];
+        const remotesToIntegrate = [];
+        if (options.remotes && options.remotes.length > 0) {
+            options.remotes.forEach((remote) => {
+                if (!projects.has(remote)) {
+                    remotesToGenerate.push(remote);
+                }
+                else {
+                    remotesToIntegrate.push(remote);
+                }
+            });
+        }
+        const installTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { mfe: true, mfeType: 'host', routing: true, remotes: remotesToIntegrate !== null && remotesToIntegrate !== void 0 ? remotesToIntegrate : [], port: 4200, federationType: options.dynamic ? 'dynamic' : 'static', skipFormat: true }));
+        for (const remote of remotesToGenerate) {
+            yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, host: (0, devkit_1.names)(options.name).fileName, skipFormat: true }));
+        }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+        return installTask;
+    });
+}
+exports.default = host;
+//# sourceMappingURL=host.js.map

package/src/generators/host/host.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AAGxD,yCAA2C;AAC3C,4DAA8D;AAC9D,6CAA+C;AAE/C,SAA8B,IAAI,CAAC,IAAU,EAAE,OAAe;;QAC5D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,MAAM,kBAAkB,GAAa,EAAE,CAAC;QAExC,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACzB,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAChC;qBAAM;oBACL,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACjC;YACH,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC9C,OAAO,KACV,GAAG,EAAE,IAAI,EACT,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE,EACjC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EACtD,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;YACtC,MAAM,IAAA,gBAAe,EAAC,IAAI,kCACrB,OAAO,KACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAClC,UAAU,EAAE,IAAI,IAChB,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAzCD,uBAyCC"}

package/src/generators/{mfe-host → host}/schema.json

@@ -1,14 +1,14 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "NxMFEHost",
+  "$id": "NxMFHost",
   "cli": "nx",
-  "title": "Nx MFE Host Application",
-  "description": "Create an Angular Host Micro Frontend Application.",
+  "title": "Nx Module Federation Host Application",
+  "description": "Create an Angular Host Module Federation Application.",
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:mfe-host appName --remotes=remote1",
-      "description": "Create an Angular application with configuration in place for MFE. If the `remotes` option is provided, attach the remote application to this application's configuration"
+      "command": "nx g @nrwl/angular:host appName --remotes=remote1",
+      "description": "Create an Angular application with configuration in place for Module Federation. If the `remotes` option is provided, attach the remote application to this application's configuration"
     }
   ],
   "properties": {

package/src/generators/karma/karma.js

@@ -21,6 +21,7 @@ function karmaGenerator(tree, options) {
         'jasmine-core': '~3.10.0',
         'jasmine-spec-reporter': '~5.0.0',
         '@types/jasmine': '~3.5.0',
+        '@types/node': '16.11.7',
     });
 }
 exports.karmaGenerator = karmaGenerator;

package/src/generators/karma/karma.js.map

@@ -1 +1 @@
-{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAGtB,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;YAC9D,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IACD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,KAAK,EAAE,QAAQ;QACf,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;QAC1B,eAAe,EAAE,QAAQ;QACzB,6BAA6B,EAAE,QAAQ;QACvC,cAAc,EAAE,SAAS;QACzB,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;KAC3B,CACF,CAAC;AACJ,CAAC;AA1BD,wCA0BC;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAGtB,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;YAC9D,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IACD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,KAAK,EAAE,QAAQ;QACf,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;QAC1B,eAAe,EAAE,QAAQ;QACzB,6BAA6B,EAAE,QAAQ;QACvC,cAAc,EAAE,SAAS;QACzB,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;QAC1B,aAAa,EAAE,SAAS;KACzB,CACF,CAAC;AACJ,CAAC;AA3BD,wCA2BC;AAED,kBAAe,cAAc,CAAC"}