@nrwl/angular 14.0.0-beta.2 → 14.0.0-beta.5

package/.eslintrc.json

@@ -0,0 +1,26 @@
+{
+  "extends": "../../.eslintrc",
+  "rules": {},
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["**/*.ts"],
+      "excludedFiles": ["./src/migrations/**"],
+      "rules": {
+        "no-restricted-imports": ["error", "@nrwl/workspace"]
+      }
+    }
+  ]
+}

package/executors.json

@@ -29,6 +29,11 @@
       "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."
+    },
+    "file-server": {
+      "implementation": "./src/executors/file-server/file-server.impl",
+      "schema": "./src/executors/file-server/schema.json",
+      "description": "Serve a web application from a folder."
     }
   },
   "builders": {
@@ -61,6 +66,11 @@
       "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."
+    },
+    "file-server": {
+      "implementation": "./src/executors/file-server/compat",
+      "schema": "./src/executors/file-server/schema.json",
+      "description": "Serve a web application from a folder."
     }
   }
 }

package/ng-package.json

@@ -10,6 +10,7 @@
     "@schematics",
     "@phenomnomnominal/tsquery",
     "chalk",
+    "chokidar",
     "ignore",
     "jasmine-marbles",
     "rxjs-for-await",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "14.0.0-beta.2",
+  "version": "14.0.0-beta.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, 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,15 +65,16 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~13.3.0",
-    "@nrwl/cypress": "14.0.0-beta.2",
-    "@nrwl/devkit": "14.0.0-beta.2",
-    "@nrwl/jest": "14.0.0-beta.2",
-    "@nrwl/linter": "14.0.0-beta.2",
-    "@nrwl/storybook": "14.0.0-beta.2",
-    "@nrwl/workspace": "14.0.0-beta.2",
+    "@nrwl/cypress": "14.0.0-beta.5",
+    "@nrwl/devkit": "14.0.0-beta.5",
+    "@nrwl/jest": "14.0.0-beta.5",
+    "@nrwl/linter": "14.0.0-beta.5",
+    "@nrwl/storybook": "14.0.0-beta.5",
+    "@nrwl/workspace": "14.0.0-beta.5",
     "@schematics/angular": "~13.3.0",
     "@phenomnomnominal/tsquery": "4.1.1",
     "chalk": "4.1.0",
+    "chokidar": "^3.5.1",
     "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.js

@@ -22,10 +22,16 @@ function moduleFederationDevServer(schema, context) {
     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));
+    const devServeRemotes = !options.devRemotes
+        ? []
+        : Array.isArray(options.devRemotes)
+            ? options.devRemotes
+            : [options.devRemotes];
     for (const remote of remotes) {
+        const isDev = devServeRemotes.includes(remote);
         (0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
             project: remote,
-            target: 'serve',
+            target: isDev ? 'serve' : 'serve-static',
             configuration: context.target.configuration,
             runOptions: {},
             executor: context.builder.builderName,

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

@@ -1 +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"}
+{"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,MAAM,eAAe,GAAG,CAAC,OAAO,CAAC,UAAU;QACzC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;YACnC,CAAC,CAAC,OAAO,CAAC,UAAU;YACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAA,8BAAc,EACZ,OAAO,CAAC,aAAa,EACrB;YACE,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;YACxC,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;AAlDD,8DAkDC;AAED,kBAAe,IAAA,yBAAa,EAAsB,yBAAyB,CAAC,CAAC"}

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

@@ -17,4 +17,5 @@ export interface Schema {
   hmr?: boolean;
   watch?: boolean;
   poll?: number;
+  devRemotes?: string[];
 }

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

@@ -101,6 +101,13 @@
     "poll": {
       "type": "number",
       "description": "Enable and define the file watching poll time period in milliseconds."
+    },
+    "devRemotes": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "List of remote applications to run in development mode (i.e. using serve target)."
     }
   },
   "additionalProperties": false,

package/src/executors/file-server/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/file-server/compat.js

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

package/src/executors/file-server/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,yDAAoD;AAEpD,kBAAe,IAAA,0BAAiB,EAAC,0BAAkB,CAAC,CAAC"}

package/src/executors/file-server/file-server.impl.d.ts

@@ -0,0 +1,8 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { Schema } from './schema';
+export default function fileServerExecutor(options: Schema, context: ExecutorContext): AsyncGenerator<{
+    success: boolean;
+    baseUrl: string;
+}, {
+    success: boolean;
+}, unknown>;

package/src/executors/file-server/file-server.impl.js

@@ -0,0 +1,161 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const devkit_1 = require("@nrwl/devkit");
+const ignore_1 = require("ignore");
+const fs_1 = require("fs");
+const chokidar_1 = require("chokidar");
+const os_1 = require("os");
+// platform specific command name
+const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
+function getHttpServerArgs(options) {
+    const args = ['-c-1'];
+    if (options.port) {
+        args.push(`-p=${options.port}`);
+    }
+    if (options.host) {
+        args.push(`-a=${options.host}`);
+    }
+    if (options.ssl) {
+        args.push(`-S`);
+    }
+    if (options.sslCert) {
+        args.push(`-C=${options.sslCert}`);
+    }
+    if (options.sslKey) {
+        args.push(`-K=${options.sslKey}`);
+    }
+    if (options.proxyUrl) {
+        args.push(`-P=${options.proxyUrl}`);
+    }
+    if (options.proxyOptions) {
+        Object.keys(options.proxyOptions).forEach((key) => {
+            args.push(`--proxy-options.${key}=options.proxyOptions[key]`);
+        });
+    }
+    args.push('--cors');
+    return args;
+}
+function getBuildTargetCommand(options) {
+    const cmd = ['nx', 'run', options.buildTarget];
+    if (options.withDeps) {
+        cmd.push(`--with-deps`);
+    }
+    if (options.parallel) {
+        cmd.push(`--parallel`);
+    }
+    if (options.maxParallel) {
+        cmd.push(`--maxParallel=${options.maxParallel}`);
+    }
+    return cmd;
+}
+function getBuildTargetOutputPath(options, context) {
+    let buildOptions;
+    try {
+        const [project, target, config] = options.buildTarget.split(':');
+        const buildTarget = context.workspace.projects[project].targets[target];
+        buildOptions = config
+            ? Object.assign(Object.assign({}, buildTarget.options), buildTarget.configurations[config]) : buildTarget.options;
+    }
+    catch (e) {
+        throw new Error(`Invalid buildTarget: ${options.buildTarget}`);
+    }
+    // TODO: vsavkin we should also check outputs
+    const outputPath = buildOptions.outputPath;
+    if (!outputPath) {
+        throw new Error(`Invalid buildTarget: ${options.buildTarget}. The target must contain outputPath property.`);
+    }
+    return outputPath;
+}
+function getIgnoredGlobs(root) {
+    const ig = (0, ignore_1.default)();
+    try {
+        ig.add((0, fs_1.readFileSync)(`${root}/.gitignore`, 'utf-8'));
+    }
+    catch (_a) { }
+    try {
+        ig.add((0, fs_1.readFileSync)(`${root}/.nxignore`, 'utf-8'));
+    }
+    catch (_b) { }
+    return ig;
+}
+function createFileWatcher(root, changeHandler) {
+    const ignoredGlobs = getIgnoredGlobs(root);
+    const layout = (0, devkit_1.workspaceLayout)();
+    const watcher = (0, chokidar_1.watch)([
+        (0, devkit_1.joinPathFragments)(layout.appsDir, '**'),
+        (0, devkit_1.joinPathFragments)(layout.libsDir, '**'),
+    ], {
+        cwd: root,
+        ignoreInitial: true,
+    });
+    watcher.on('all', (_event, path) => {
+        if (ignoredGlobs.ignores(path))
+            return;
+        changeHandler();
+    });
+    return () => watcher.close();
+}
+function fileServerExecutor(options, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* fileServerExecutor_1() {
+        let running = false;
+        const run = () => {
+            if (!running) {
+                running = true;
+                try {
+                    const args = getBuildTargetCommand(options);
+                    (0, child_process_1.execFileSync)(pmCmd, args, {
+                        stdio: [0, 1, 2],
+                    });
+                }
+                catch (_a) { }
+                running = false;
+            }
+        };
+        let disposeWatch;
+        if (options.watch) {
+            disposeWatch = createFileWatcher(context.root, run);
+        }
+        // perform initial run
+        run();
+        const outputPath = getBuildTargetOutputPath(options, context);
+        const args = getHttpServerArgs(options);
+        const serve = (0, child_process_1.execFile)(pmCmd, ['http-server', outputPath, ...args], {
+            cwd: context.root,
+            env: Object.assign({ FORCE_COLOR: 'true' }, process.env),
+        });
+        const processExitListener = () => {
+            serve.kill();
+            if (disposeWatch) {
+                disposeWatch();
+            }
+        };
+        process.on('exit', processExitListener);
+        process.on('SIGTERM', processExitListener);
+        serve.stdout.on('data', (chunk) => {
+            if (chunk.toString().indexOf('GET') === -1) {
+                process.stdout.write(chunk);
+            }
+        });
+        serve.stderr.on('data', (chunk) => {
+            process.stderr.write(chunk);
+        });
+        yield yield tslib_1.__await({
+            success: true,
+            baseUrl: `${options.ssl ? 'https' : 'http'}://${options.host}:${options.port}`,
+        });
+        return yield tslib_1.__await(new Promise((res) => {
+            serve.on('exit', (code) => {
+                if (code == 0) {
+                    res({ success: true });
+                }
+                else {
+                    res({ success: false });
+                }
+            });
+        }));
+    });
+}
+exports.default = fileServerExecutor;
+//# sourceMappingURL=file-server.impl.js.map

package/src/executors/file-server/file-server.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/file-server/schema.d.ts

@@ -0,0 +1,14 @@
+export interface Schema {
+  host: string;
+  port: number;
+  ssl: boolean;
+  sslKey?: string;
+  sslCert?: string;
+  proxyUrl?: string;
+  buildTarget: string;
+  parallel: boolean;
+  maxParallel?: number;
+  withDeps: boolean;
+  proxyOptions?: object;
+  watch?: boolean;
+}

package/src/executors/file-server/schema.json

@@ -0,0 +1,67 @@
+{
+  "title": "File Server",
+  "description": "Serve a web application from a folder.",
+  "type": "object",
+  "cli": "nx",
+  "properties": {
+    "buildTarget": {
+      "type": "string",
+      "description": "Target which builds the application."
+    },
+    "parallel": {
+      "type": "boolean",
+      "description": "Build the target in parallel.",
+      "default": true
+    },
+    "maxParallel": {
+      "type": "number",
+      "description": "Max number of parallel jobs."
+    },
+    "port": {
+      "type": "number",
+      "description": "Port to listen on.",
+      "default": 4200
+    },
+    "host": {
+      "type": "string",
+      "description": "Host to listen on.",
+      "default": "localhost"
+    },
+    "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`."
+    },
+    "proxyUrl": {
+      "type": "string",
+      "description": "URL to proxy unhandled requests to."
+    },
+    "proxyOptions": {
+      "type": "object",
+      "description": "Options for the proxy used by `http-server`.",
+      "default": {},
+      "properties": {
+        "secure": {
+          "type": "boolean",
+          "default": false
+        }
+      },
+      "additionalProperties": true
+    },
+    "watch": {
+      "type": "boolean",
+      "description": "Watch for file changes.",
+      "default": false
+    }
+  },
+  "additionalProperties": false,
+  "required": ["buildTarget"]
+}

package/src/generators/application/lib/normalize-options.js

@@ -4,16 +4,13 @@ exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const devkit_2 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
+const project_1 = require("../../utils/project");
 function normalizeOptions(host, options) {
     var _a, _b;
     const { appsDir, npmScope, standaloneAsDefault } = (0, devkit_2.getWorkspaceLayout)(host);
-    const appDirectory = options.directory
-        ? `${(0, devkit_2.names)(options.directory).fileName}/${(0, devkit_2.names)(options.name).fileName}`
-        : (0, devkit_2.names)(options.name).fileName;
+    const appDirectory = (0, project_1.normalizeDirectory)(options.name, options.directory);
     let e2eProjectName = `${(0, devkit_2.names)(options.name).fileName}-e2e`;
-    const appProjectName = appDirectory
-        .replace(new RegExp('/', 'g'), '-')
-        .replace(/-\d+/g, '');
+    const appProjectName = (0, project_1.normalizeProjectName)(options.name, options.directory);
     if (options.e2eTestRunner !== 'cypress') {
         e2eProjectName = `${appProjectName}-e2e`;
     }

package/src/generators/application/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAItB,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY;SAChC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACxB,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACjD,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,iBAAiB,EAAE;QACrB,CAAC,EAAE,cAAc,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAC1D;IACD,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,cAAc,CAAC;IACnB,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;IAE5B,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,qBACd,aAAa,2BACb,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AAjED,4CAiEC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAItB,yCAAyD;AAEzD,yCAAsC;AACtC,iDAA+E;AAE/E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,cAAc,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7E,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACjD,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,iBAAiB,EAAE;QACrB,CAAC,EAAE,cAAc,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAC1D;IACD,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,cAAc,CAAC;IACnB,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;IAE5B,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,qBACd,aAAa,2BACb,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AA7DD,4CA6DC"}

package/src/generators/host/host.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
 const devkit_2 = require("@nrwl/devkit");
 const application_1 = require("../application/application");
 const remote_1 = require("../remote/remote");
+const project_1 = require("../utils/project");
 function host(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const projects = (0, devkit_2.getProjects)(tree);
@@ -22,7 +23,7 @@ function host(tree, options) {
         }
         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 }));
+            yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, host: (0, project_1.normalizeProjectName)(options.name, options.directory), skipFormat: true }));
         }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);

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

@@ -1 +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"}
+{"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;AAC/C,8CAAwD;AAExD,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,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,EAC3D,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/move/lib/update-ng-package.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateNgPackage = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
 const utils_1 = require("@nrwl/workspace/src/generators/move/lib/utils");
 const path_1 = require("path");
 function updateNgPackage(tree, schema) {
@@ -16,7 +15,7 @@ function updateNgPackage(tree, schema) {
     if (!tree.exists(ngPackagePath)) {
         return;
     }
-    const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_2.workspaceRoot, project.root), devkit_2.workspaceRoot);
+    const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_1.workspaceRoot, project.root), devkit_1.workspaceRoot);
     let output = `dist/${project.root}`;
     if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.outputs) === null || _c === void 0 ? void 0 : _c.length) > 0) {
         output = project.targets.build.outputs[0];

package/src/generators/move/lib/update-ng-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,yCAA6C;AAC7C,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC,CAAC;IAC9E,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,0CAuBC"}
+{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC,CAAC;IAC9E,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,0CAuBC"}

package/src/generators/remote/remote.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
 const devkit_2 = require("@nrwl/devkit");
 const application_1 = require("../application/application");
 const get_mf_projects_1 = require("../../utils/get-mf-projects");
+const project_1 = require("../utils/project");
 function findNextAvailablePort(tree) {
     var _a, _b, _c;
     const mfeProjects = (0, get_mf_projects_1.getMFProjects)(tree);
@@ -31,7 +32,8 @@ function remote(tree, options) {
 }
 exports.default = remote;
 function removeDeadCode(tree, options) {
-    const project = (0, devkit_2.readProjectConfiguration)(tree, options.name);
+    const projectName = (0, project_1.normalizeProjectName)(options.name, options.directory);
+    const project = (0, devkit_2.readProjectConfiguration)(tree, projectName);
     ['css', 'less', 'scss', 'sass'].forEach((style) => {
         const pathToComponentStyle = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/app.component.${style}`);
         if (tree.exists(pathToComponentStyle)) {

package/src/generators/remote/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"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"}

package/src/generators/setup-mfe/lib/setup-serve-target.js

@@ -8,6 +8,24 @@ function setupServeTarget(host, options) {
     appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: options.mfeType === 'host'
             ? '@nrwl/angular:module-federation-dev-server'
             : '@nrwl/angular:webpack-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
+    if (options.mfeType === 'remote') {
+        appConfig.targets['serve-static'] = {
+            executor: '@nrwl/angular:file-server',
+            defaultConfiguration: 'development',
+            options: {
+                buildTarget: `${options.appName}:build`,
+                port: options.port,
+            },
+            configurations: {
+                development: {
+                    buildTarget: `${options.appName}:build:development`,
+                },
+                production: {
+                    buildTarget: `${options.appName}:build:production`,
+                },
+            },
+        };
+    }
     (0, devkit_1.updateProjectConfiguration)(host, options.appName, appConfig);
 }
 exports.setupServeTarget = setupServeTarget;

package/src/generators/setup-mfe/lib/setup-serve-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,OAAO,KAAK,MAAM;YACxB,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,8BAA8B,EACpC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AAjBD,4CAiBC"}
+{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,OAAO,KAAK,MAAM;YACxB,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,8BAA8B,EACpC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;QAChC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,2BAA2B;YACrC,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB;YACD,cAAc,EAAE;gBACd,WAAW,EAAE;oBACX,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,oBAAoB;iBACpD;gBACD,UAAU,EAAE;oBACV,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,mBAAmB;iBACnD;aACF;SACF,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AApCD,4CAoCC"}

package/src/generators/utils/project.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizeDirectory(appName: string, directoryName: string): string;
+export declare function normalizeProjectName(appName: string, directoryName: string): string;

package/src/generators/utils/project.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeProjectName = exports.normalizeDirectory = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function normalizeDirectory(appName, directoryName) {
+    return directoryName
+        ? `${(0, devkit_1.names)(directoryName).fileName}/${(0, devkit_1.names)(appName).fileName}`
+        : (0, devkit_1.names)(appName).fileName;
+}
+exports.normalizeDirectory = normalizeDirectory;
+function normalizeProjectName(appName, directoryName) {
+    return normalizeDirectory(appName, directoryName)
+        .replace(new RegExp('/', 'g'), '-')
+        .replace(/-\d+/g, '');
+}
+exports.normalizeProjectName = normalizeProjectName;
+//# sourceMappingURL=project.js.map

package/src/generators/utils/project.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/project.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,SAAgB,kBAAkB,CAAC,OAAe,EAAE,aAAqB;IACvE,OAAO,aAAa;QAClB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;QAC/D,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;AAC9B,CAAC;AAJD,gDAIC;AAED,SAAgB,oBAAoB,CAAC,OAAe,EAAE,aAAqB;IACzE,OAAO,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC;SAC9C,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC1B,CAAC;AAJD,oDAIC"}

package/src/utils/mfe/mfe-webpack.js

@@ -50,17 +50,54 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
     };
 }
 exports.shareWorkspaceLibraries = shareWorkspaceLibraries;
+function collectPackageSecondaries(pkgName, packages) {
+    const pathToPackage = (0, path_1.join)(devkit_1.workspaceRoot, 'node_modules', pkgName);
+    const directories = (0, fs_1.readdirSync)(pathToPackage)
+        .filter((file) => file !== 'node_modules')
+        .map((file) => (0, path_1.join)(pathToPackage, file))
+        .filter((file) => (0, fs_1.lstatSync)(file).isDirectory());
+    const recursivelyCheckSubDirectories = (directories, secondaries) => {
+        for (const directory of directories) {
+            if ((0, fs_1.existsSync)((0, path_1.join)(directory, 'package.json'))) {
+                secondaries.push(directory);
+            }
+            const subDirs = (0, fs_1.readdirSync)(directory)
+                .filter((file) => file !== 'node_modules')
+                .map((file) => (0, path_1.join)(directory, file))
+                .filter((file) => (0, fs_1.lstatSync)(file).isDirectory());
+            recursivelyCheckSubDirectories(subDirs, secondaries);
+        }
+    };
+    const secondaries = [];
+    recursivelyCheckSubDirectories(directories, secondaries);
+    for (const secondary of secondaries) {
+        const pathToPkg = (0, path_1.join)(secondary, 'package.json');
+        const libName = JSON.parse((0, fs_1.readFileSync)(pathToPkg, 'utf-8')).name;
+        if (!libName) {
+            continue;
+        }
+        packages.push(libName);
+        collectPackageSecondaries(libName, packages);
+    }
+}
 function sharePackages(packages) {
     const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
     if (!(0, fs_1.existsSync)(pkgJsonPath)) {
         throw new Error('NX MFE: Could not find root package.json to determine dependency versions.');
     }
     const pkgJson = JSON.parse((0, fs_1.readFileSync)(pkgJsonPath, 'utf-8'));
-    return packages.reduce((shared, pkgName) => (Object.assign(Object.assign({}, shared), { [pkgName]: {
-            singleton: true,
-            strictVersion: true,
-            requiredVersion: pkgJson.dependencies[pkgName],
-        } })), {});
+    const allPackages = [...packages];
+    packages.forEach((pkg) => collectPackageSecondaries(pkg, allPackages));
+    return allPackages.reduce((shared, pkgName) => {
+        const nameToUseForVersionLookup = pkgName.split('/').length > 2
+            ? pkgName.split('/').slice(0, 2).join('/')
+            : pkgName;
+        return Object.assign(Object.assign({}, shared), { [pkgName]: {
+                singleton: true,
+                strictVersion: true,
+                requiredVersion: pkgJson.dependencies[nameToUseForVersionLookup],
+            } });
+    }, {});
 }
 exports.sharePackages = sharePackages;
 //# sourceMappingURL=mfe-webpack.js.map

package/src/utils/mfe/mfe-webpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":"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"}

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
-exports.nxVersion = '14.0.0-beta.2';
+exports.nxVersion = '14.0.0-beta.5';
 exports.angularVersion = '~13.3.0';
 exports.angularDevkitVersion = '~13.3.0';
 exports.angularJsVersion = '1.7.9';