@nx/angular 16.8.0-beta.1 → 16.8.0-beta.3

package/migrations.json

@@ -325,6 +325,10 @@
           "version": "~14.0.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~14.0.0",
+          "alwaysAddToPackageJson": false
+        },
         "@angular/core": {
           "version": "~14.0.0",
           "alwaysAddToPackageJson": true
@@ -542,6 +546,10 @@
           "version": "~14.1.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~14.1.0",
+          "alwaysAddToPackageJson": false
+        },
         "@schematics/angular": {
           "version": "~14.1.0",
           "alwaysAddToPackageJson": false
@@ -602,6 +610,10 @@
           "version": "~14.1.1",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~14.1.1",
+          "alwaysAddToPackageJson": false
+        },
         "@schematics/angular": {
           "version": "~14.1.1",
           "alwaysAddToPackageJson": false
@@ -656,6 +668,10 @@
           "version": "~14.2.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~14.2.0",
+          "alwaysAddToPackageJson": false
+        },
         "@schematics/angular": {
           "version": "~14.2.0",
           "alwaysAddToPackageJson": false
@@ -770,6 +786,10 @@
           "version": "~15.0.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~15.0.0",
+          "alwaysAddToPackageJson": false
+        },
         "@schematics/angular": {
           "version": "~15.0.0",
           "alwaysAddToPackageJson": false
@@ -903,6 +923,10 @@
           "version": "~15.1.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~15.1.0",
+          "alwaysAddToPackageJson": false
+        },
         "@angular/core": {
           "version": "~15.1.0",
           "alwaysAddToPackageJson": true
@@ -968,6 +992,10 @@
           "version": "~15.2.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
         "@angular/core": {
           "version": "~15.2.0",
           "alwaysAddToPackageJson": true
@@ -1101,6 +1129,10 @@
           "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~16.0.0",
+          "alwaysAddToPackageJson": false
+        },
         "@schematics/angular": {
           "version": "~16.0.0",
           "alwaysAddToPackageJson": false
@@ -1211,6 +1243,10 @@
           "version": "~16.1.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
         "@angular/core": {
           "version": "~16.1.0",
           "alwaysAddToPackageJson": true
@@ -1272,6 +1308,10 @@
           "version": "~16.2.0",
           "alwaysAddToPackageJson": false
         },
+        "@angular/pwa": {
+          "version": "~16.2.0",
+          "alwaysAddToPackageJson": false
+        },
         "@angular/core": {
           "version": "~16.2.0",
           "alwaysAddToPackageJson": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.8.0-beta.1",
+  "version": "16.8.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -66,14 +66,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.8.0-beta.1",
-    "@nx/cypress": "16.8.0-beta.1",
-    "@nx/devkit": "16.8.0-beta.1",
-    "@nx/jest": "16.8.0-beta.1",
-    "@nx/js": "16.8.0-beta.1",
-    "@nx/linter": "16.8.0-beta.1",
-    "@nx/webpack": "16.8.0-beta.1",
-    "@nx/workspace": "16.8.0-beta.1",
+    "@nrwl/angular": "16.8.0-beta.3",
+    "@nx/cypress": "16.8.0-beta.3",
+    "@nx/devkit": "16.8.0-beta.3",
+    "@nx/jest": "16.8.0-beta.3",
+    "@nx/js": "16.8.0-beta.3",
+    "@nx/linter": "16.8.0-beta.3",
+    "@nx/webpack": "16.8.0-beta.3",
+    "@nx/workspace": "16.8.0-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -99,6 +99,9 @@
   "peerDependenciesMeta": {
     "@nguniversal/builders": {
       "optional": true
+    },
+    "esbuild": {
+      "optional": true
     }
   },
   "publishConfig": {
@@ -107,5 +110,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
+  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
 }

package/src/generators/add-linting/add-linting.js

@@ -6,7 +6,8 @@ const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const lint_project_1 = require("@nx/linter/src/generators/lint-project/lint-project");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
-const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
+const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
+const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 function addLintingGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
@@ -27,7 +28,51 @@ function addLintingGenerator(tree, options) {
             rootProject: rootProject,
         });
         tasks.push(lintTask);
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => (0, create_eslint_configuration_1.extendAngularEslintJson)(json, options));
+        if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
+            const eslintFile = (0, eslint_file_1.findEslintFile)(tree, options.projectRoot);
+            // keep parser options if they exist
+            const hasParserOptions = tree
+                .read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
+                .includes(`${options.projectRoot}/tsconfig.*?.json`);
+            (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+                Object.assign(Object.assign({ files: ['*.ts'] }, (hasParserOptions
+                    ? {
+                        parserOptions: {
+                            project: [`${options.projectRoot}/tsconfig.*?.json`],
+                        },
+                    }
+                    : {})), { extends: [
+                        'plugin:@nx/angular',
+                        'plugin:@angular-eslint/template/process-inline-templates',
+                    ], rules: {
+                        '@angular-eslint/directive-selector': [
+                            'error',
+                            {
+                                type: 'attribute',
+                                prefix: (0, string_utils_1.camelize)(options.prefix),
+                                style: 'camelCase',
+                            },
+                        ],
+                        '@angular-eslint/component-selector': [
+                            'error',
+                            {
+                                type: 'element',
+                                prefix: (0, string_utils_1.dasherize)(options.prefix),
+                                style: 'kebab-case',
+                            },
+                        ],
+                    } }),
+                {
+                    files: ['*.html'],
+                    extends: ['plugin:@nx/angular-template'],
+                    /**
+                     * Having an empty rules object present makes it more obvious to the user where they would
+                     * extend things from if they needed to
+                     */
+                    rules: {},
+                },
+            ]);
+        }
         if (!options.skipPackageJson) {
             const installTask = (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
             tasks.push(installTask);

package/src/generators/add-linting/lib/create-eslint-configuration.d.ts

@@ -4,6 +4,9 @@ import type { AddLintingGeneratorSchema } from '../schema';
 type EslintExtensionSchema = {
     prefix: string;
 };
+/**
+ * @deprecated Use tools from `@nx/linter/src/generators/utils/eslint-file` instead
+ */
 export declare const extendAngularEslintJson: (json: Linter.Config, options: EslintExtensionSchema) => {
     overrides: ({
         files: string[];
@@ -26,7 +29,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
             [name: string]: boolean;
         };
         globals?: {
-            [name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
+            [name: string]: boolean | "off" | "readonly" | "readable" | "writable" | "writeable";
         };
         noInlineConfig?: boolean;
         overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
@@ -58,7 +61,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
     };
     extends?: string | string[];
     globals?: {
-        [name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
+        [name: string]: boolean | "off" | "readonly" | "readable" | "writable" | "writeable";
     };
     noInlineConfig?: boolean;
     parser?: string;

package/src/generators/add-linting/lib/create-eslint-configuration.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEsLintConfiguration = exports.extendAngularEslintJson = void 0;
 const devkit_1 = require("@nx/devkit");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
+/**
+ * @deprecated Use tools from `@nx/linter/src/generators/utils/eslint-file` instead
+ */
 const extendAngularEslintJson = (json, options) => {
     const overrides = [
         Object.assign(Object.assign({}, json.overrides[0]), { files: ['*.ts'], extends: [

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

@@ -20,20 +20,8 @@ function normalizeOptions(host, options) {
         });
         options.rootProject = appProjectRoot === '.';
         options.projectNameAndRootFormat = projectNameAndRootFormat;
-        let e2eProjectName = 'e2e';
-        let e2eProjectRoot = 'e2e';
-        if (!options.rootProject) {
-            const projectNameAndRoot = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-                name: `${options.name}-e2e`,
-                projectType: 'application',
-                directory: options.directory,
-                projectNameAndRootFormat: options.projectNameAndRootFormat,
-                rootProject: options.rootProject,
-                callingGenerator: '@nx/angular:application',
-            });
-            e2eProjectName = projectNameAndRoot.projectName;
-            e2eProjectRoot = projectNameAndRoot.projectRoot;
-        }
+        const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
+        const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
         const parsedTags = options.tags
             ? options.tags.split(',').map((s) => s.trim())
             : [];

package/src/generators/host/host.js

@@ -67,7 +67,17 @@ function hostInternal(tree, options) {
             installTasks.push(ssrInstallTask);
         }
         for (const remote of remotesToGenerate) {
-            yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, host: hostProjectName, skipFormat: true, standalone: options.standalone }));
+            let remoteDirectory = options.directory;
+            if (options.projectNameAndRootFormat === 'as-provided' &&
+                options.directory) {
+                /**
+                 * With the `as-provided` format, the provided directory would be the root
+                 * of the host application. Append the remote name to the host parent
+                 * directory to get the remote directory.
+                 */
+                remoteDirectory = (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
+            }
+            yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, directory: remoteDirectory, host: hostProjectName, skipFormat: true, standalone: options.standalone }));
         }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);

package/src/generators/host/lib/add-ssr.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
 const versions_1 = require("../../../utils/versions");
+const path_1 = require("path");
 function addSsr(tree, options, appName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
@@ -14,7 +15,7 @@ function addSsr(tree, options, appName) {
         });
         tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
         tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files'), project.root, {
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files'), project.root, {
             appName,
             standalone: options.standalone,
             tmpl: '',

package/src/generators/ng-add/utilities/workspace.js

@@ -9,6 +9,7 @@ const default_base_1 = require("nx/src/utils/default-base");
 const versions_1 = require("@nx/js/src/utils/versions");
 const angular_json_1 = require("nx/src/adapter/angular-json");
 const versions_2 = require("../../../utils/versions");
+const path_1 = require("path");
 function validateWorkspace(tree) {
     const errors = [];
     if (!tree.exists('package.json')) {
@@ -234,7 +235,7 @@ function createWorkspaceFiles(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         updateVsCodeRecommendedExtensions(tree);
         yield (0, js_1.initGenerator)(tree, { skipFormat: true });
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/root'), '.', {
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/root'), '.', {
             tmpl: '',
             dot: '.',
             rootTsConfigPath: (0, js_1.getRootTsConfigPathInTree)(tree),

package/src/generators/setup-ssr/lib/generate-files.js

@@ -4,12 +4,13 @@ exports.generateSSRFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
+const path_1 = require("path");
 function generateSSRFiles(tree, schema) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const projectRoot = projectConfig.root;
     const browserBundleOutputPath = projectConfig.targets.build.options.outputPath;
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'base'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(pathToFiles, 'base'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
     if (schema.standalone) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
     }