npm - @nx/angular - Versions diffs - 16.1.4 → 16.2.0-beta.1 - Mend

@nx/angular 16.1.4 → 16.2.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (142) hide show

package/generators.d.ts CHANGED Viewed

@@ -11,6 +11,8 @@ export * from './src/generators/library-secondary-entry-point/library-secondary-
 export * from './src/generators/library/library';
 export * from './src/generators/move/move';
 export * from './src/generators/ngrx/ngrx';
+export * from './src/generators/ngrx-feature-store/ngrx-feature-store';
+export * from './src/generators/ngrx-root-store/ngrx-root-store';
 export * from './src/generators/pipe/pipe';
 export * from './src/generators/remote/remote';
 export * from './src/generators/scam-directive/scam-directive';

package/generators.js CHANGED Viewed

@@ -14,6 +14,8 @@ tslib_1.__exportStar(require("./src/generators/library-secondary-entry-point/lib
 tslib_1.__exportStar(require("./src/generators/library/library"), exports);
 tslib_1.__exportStar(require("./src/generators/move/move"), exports);
 tslib_1.__exportStar(require("./src/generators/ngrx/ngrx"), exports);
+tslib_1.__exportStar(require("./src/generators/ngrx-feature-store/ngrx-feature-store"), exports);
+tslib_1.__exportStar(require("./src/generators/ngrx-root-store/ngrx-root-store"), exports);
 tslib_1.__exportStar(require("./src/generators/pipe/pipe"), exports);
 tslib_1.__exportStar(require("./src/generators/remote/remote"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-directive/scam-directive"), exports);

package/generators.js.map CHANGED Viewed

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

package/generators.json CHANGED Viewed

@@ -95,7 +95,8 @@
     "ngrx": {
       "factory": "./src/generators/ngrx/compat",
       "schema": "./src/generators/ngrx/schema.json",
-      "description": "Adds NgRx support to an application or library."
+      "description": "Adds NgRx support to an application or library.",
+      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead."
     },
     "scam-to-standalone": {
       "factory": "./src/generators/scam-to-standalone/compat",
@@ -252,7 +253,18 @@
     "ngrx": {
       "factory": "./src/generators/ngrx/ngrx",
       "schema": "./src/generators/ngrx/schema.json",
-      "description": "Adds NgRx support to an application or library."
+      "description": "Adds NgRx support to an application or library.",
+      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead."
+    },
+    "ngrx-feature-store": {
+      "factory": "./src/generators/ngrx-feature-store/ngrx-feature-store",
+      "schema": "./src/generators/ngrx-feature-store/schema.json",
+      "description": "Adds an NgRx Feature Store to an application or library."
+    },
+    "ngrx-root-store": {
+      "factory": "./src/generators/ngrx-root-store/ngrx-root-store",
+      "schema": "./src/generators/ngrx-root-store/schema.json",
+      "description": "Adds an NgRx Root Store to an application."
     },
     "pipe": {
       "factory": "./src/generators/pipe/pipe",

package/migrations.json CHANGED Viewed

@@ -236,6 +236,15 @@
       },
       "description": "Update the @angular/cli package version to ~16.0.0.",
       "factory": "./src/migrations/update-16-1-0/update-angular-cli"
+    },
+    "switch-data-persistence-operators-imports-to-ngrx-router-store": {
+      "cli": "nx",
+      "version": "16.2.0-beta.0",
+      "requires": {
+        "@ngrx/store": ">=16.0.0"
+      },
+      "description": "Switch the data persistence operator imports to '@ngrx/router-store/data-persistence'.",
+      "factory": "./src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store"
     }
   },
   "packageJsonUpdates": {
@@ -1126,6 +1135,18 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.2.0-ngrx": {
+      "version": "16.2.0-beta.0",
+      "requires": {
+        "@angular/core": "^16.0.0"
+      },
+      "packages": {
+        "@ngrx/store": {
+          "version": "~16.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.1.4",
+  "version": "16.2.0-beta.1",
   "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.1.4",
-    "@nx/cypress": "16.1.4",
-    "@nx/devkit": "16.1.4",
-    "@nx/jest": "16.1.4",
-    "@nx/js": "16.1.4",
-    "@nx/linter": "16.1.4",
-    "@nx/webpack": "16.1.4",
-    "@nx/workspace": "16.1.4",
+    "@nrwl/angular": "16.2.0-beta.1",
+    "@nx/cypress": "16.2.0-beta.1",
+    "@nx/devkit": "16.2.0-beta.1",
+    "@nx/jest": "16.2.0-beta.1",
+    "@nx/js": "16.2.0-beta.1",
+    "@nx/linter": "16.2.0-beta.1",
+    "@nx/webpack": "16.2.0-beta.1",
+    "@nx/workspace": "16.2.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -96,7 +96,6 @@
     "@angular-devkit/schematics": ">= 14.0.0 < 17.0.0",
     "@nguniversal/builders": ">= 14.0.0 < 17.0.0",
     "@schematics/angular": ">= 14.0.0 < 17.0.0",
-    "convert-source-map": "1.9.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "peerDependenciesMeta": {
@@ -110,5 +109,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "16f098804653374057eff7e2f9565fb4c7a90b29"
+  "gitHead": "79fa3fb0ead486e33a7e00b5c13a0f2545278202"
 }

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js CHANGED Viewed

@@ -256,16 +256,15 @@ function generatePackageExports({ destinationPath, packageJson }, graph, angular
         ? JSON.parse(JSON.stringify(packageJson.exports))
         : {};
     const insertMappingOrError = (subpath, mapping) => {
-        if (exports[subpath] === undefined) {
-            exports[subpath] = {};
-        }
+        var _a;
+        (_a = exports[subpath]) !== null && _a !== void 0 ? _a : (exports[subpath] = {});
         const subpathExport = exports[subpath];
         // Go through all conditions that should be inserted. If the condition is already
         // manually set of the subpath export, we throw an error. In general, we allow for
         // additional conditions to be set. These will always precede the generated ones.
         for (const conditionName of Object.keys(mapping)) {
             if (subpathExport[conditionName] !== undefined) {
-                throw Error(`Found a conflicting export condition for "${subpath}". The "${conditionName}" ` +
+                devkit_1.logger.warn(`Found a conflicting export condition for "${subpath}". The "${conditionName}" ` +
                     `condition would be overridden by ng-packagr. Please unset it.`);
             }
             // **Note**: The order of the conditions is preserved even though we are setting

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":"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~~IAAI~~,OAAO,CAAC,OAAO,~~CAAC~~,~~KAAK,SAAS,EAAE;YAClC,~~OAAO,CAAC,OAAO,~~CAAC~~,~~GAAG,~~EAAE,~~CAAC~~;~~SACvB;QAED~~,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvC,iFAAiF;QACjF,kFAAkF;QAClF,iFAAiF;QACjF,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,~~CAE9C~~,EAAE;~~YACD~~,IAAI,aAAa,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE;gBAC9C,~~MAAM~~,~~KAAK~~,CACT,6CAA6C,OAAO,WAAW,aAAa,IAAI;oBAC9E,+DAA+D,CAClE,CAAC;aACH;YAED,gFAAgF;YAChF,4EAA4E;YAC5E,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;SACvD;IACH,CAAC,CAAC;IAEF,MAAM,wBAAwB,GAAG,CAAC,QAAgB,EAAE,EAAE,CACpD,IAAI,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;IAElE,oBAAoB,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEtE,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAC;IAC/C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,GAC/C,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;QAC7B,MAAM,OAAO,GAAG,qBAAqB;YACnC,CAAC,CAAC,KAAK,gBAAgB,CAAC,SAAS,EAAE;YACnC,CAAC,CAAC,GAAG,CAAC;QAER,mCAAmC;QACnC,MAAM,OAAO,GACX,cAAc,CAAC,KAAK,GAAG,EAAE;YACvB,CAAC,CAAC;gBACE,KAAK,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,YAAY,CAAC;gBAC9D,MAAM,EAAE,wBAAwB,CAAE,gBAAwB,CAAC,OAAO,CAAC;gBACnE,OAAO,EAAE,wBAAwB,CAC9B,gBAAwB,CAAC,OAAO,CAClC;gBACD,OAAO,EAAE,wBAAwB,CAC9B,gBAAwB,CAAC,OAAO,CAClC;aACF;YACH,CAAC,CAAC;gBACE,OAAO,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBAC3D,GAAG,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBACvD,OAAO,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,OAAO,CAAC;aAC5D,CAAC;QAER,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACxC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB;IAC3B,OAAO,eAAe,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;AACrC,CAAC"}
1	+ {"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":"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"}

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const test_runners_1 = require("../../../utils/test-runners");
 const linter_1 = require("@nx/linter");
 const project_1 = require("../../utils/project");
@@ -13,7 +14,7 @@ function normalizeOptions(host, options) {
     const e2eProjectName = options.rootProject
         ? 'e2e'
         : `${(0, devkit_1.names)(options.name).fileName}-e2e`;
-    const { appsDir: defaultAppsDir, npmScope, standaloneAsDefault, } = (0, devkit_1.getWorkspaceLayout)(host);
+    const { appsDir: defaultAppsDir, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
     const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
     const appProjectRoot = options.rootProject
         ? '.'
@@ -24,7 +25,7 @@ function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
+    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, (0, get_npm_scope_1.getNpmScope)(host), 'app');
     options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
     const ngCliSchematicAppRoot = appProjectName;
     const ngCliSchematicE2ERoot = `${appProjectName}/e2e`;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;~~AAGpB~~,8DAA4E;AAC5E,uCAAoC;AACpC,iDAI6B;AAE7B,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,~~EACJ~~,OAAO,EAAE,cAAc,~~EACvB~~,~~QAAQ,EACR,~~mBAAmB,~~GACpB~~,~~GAAG~~,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;~~IAC7B~~,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,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,MAAM,GAAG,IAAA,~~yBAAe~~,~~EAAC~~,OAAO,CAAC,MAAM,~~EAAE~~,~~QAAQ~~,CAAC,CAAC;~~IAEzD~~,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,qBAAqB,GAAG,cAAc,CAAC;IAC7C,MAAM,qBAAqB,GAAG,GAAG,cAAc,MAAM,CAAC;IAEtD,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EACzD,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,4BAAa,CAAC,OAAO,EACpC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EACN,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;~~AA3DD~~,~~4CA2DC~~"}
1	+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB,+EAA0E;AAI1E,8DAA4E;AAC5E,uCAAoC;AACpC,iDAI6B;AAE7B,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,GACpD,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,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,MAAM,GAAG,IAAA,mCAAyB,EACtC,OAAO,CAAC,MAAM,EACd,IAAA,2BAAW,EAAC,IAAI,CAAC,EACjB,KAAK,CACN,CAAC;IAEF,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,qBAAqB,GAAG,cAAc,CAAC;IAC7C,MAAM,qBAAqB,GAAG,GAAG,cAAc,MAAM,CAAC;IAEtD,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EACzD,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,4BAAa,CAAC,OAAO,EACpC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EACN,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AA5DD,4CA4DC"}

package/src/generators/component/lib/validate-options.js CHANGED Viewed

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const path_1 = require("../../utils/path");
 const validations_1 = require("../../utils/validations");
 function validateOptions(tree, options) {
     (0, validations_1.validateProject)(tree, options.project);
-    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
     (0, validations_1.validateStandaloneOption)(tree, options.standalone);
 }
 exports.validateOptions = validateOptions;

package/src/generators/component/lib/validate-options.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,~~2CAA6D~~;~~AAC7D,yDAGiC;~~AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,~~gCAAyB~~,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;~~IAC/D~~,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}
1	+ {"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,yDAIiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,4CAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}

package/src/generators/cypress-component-configuration/cypress-component-configuration.js CHANGED Viewed

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = void 0;
 const tslib_1 = require("tslib");
 const cypress_1 = require("@nx/cypress");
+const config_1 = require("@nx/cypress/src/utils/config");
 const find_target_options_1 = require("@nx/cypress/src/utils/find-target-options");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
@@ -22,8 +23,8 @@ function cypressComponentConfiguration(tree, options) {
             skipFormat: true,
         });
         yield updateProjectConfig(tree, options);
-        addFiles(tree, projectConfig, options);
-        if (options.skipFormat) {
+        yield addFiles(tree, projectConfig, options);
+        if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
         return () => {
@@ -33,34 +34,35 @@ function cypressComponentConfiguration(tree, options) {
 }
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
 function addFiles(tree, projectConfig, options) {
-    const cypressConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
-    if (tree.exists(cypressConfigPath)) {
-        tree.delete(cypressConfigPath);
-    }
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectConfig.root, {
-        tpl: '',
-    });
-    if (options.generateTests) {
-        const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.project);
-        const componentInfo = [];
-        for (const entryPoint of entryPoints) {
-            const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
-            componentInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.project), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
-        }
-        for (const info of componentInfo) {
-            if (info === undefined) {
-                continue;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const cyConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+        const updatedCyConfig = yield (0, config_1.addDefaultCTConfig)(tree.read(cyConfigFile, 'utf-8'));
+        tree.write(cyConfigFile, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
+        const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
+        const updatedCmpContents = yield (0, config_1.addMountDefinition)(tree.read(componentFile, 'utf-8'));
+        tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
+        if (options.generateTests) {
+            const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.project);
+            const componentInfo = [];
+            for (const entryPoint of entryPoints) {
+                const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
+                componentInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.project), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
+            }
+            for (const info of componentInfo) {
+                if (info === undefined) {
+                    continue;
+                }
+                const componentDirFromProjectRoot = (0, path_1.relative)(projectConfig.root, (0, devkit_1.joinPathFragments)(info.moduleFolderPath, info.path));
+                (0, component_test_1.componentTestGenerator)(tree, {
+                    project: options.project,
+                    componentName: info.name,
+                    componentDir: componentDirFromProjectRoot,
+                    componentFileName: info.componentFileName,
+                    skipFormat: true,
+                });
             }
-            const componentDirFromProjectRoot = (0, path_1.relative)(projectConfig.root, (0, devkit_1.joinPathFragments)(info.moduleFolderPath, info.path));
-            (0, component_test_1.componentTestGenerator)(tree, {
-                project: options.project,
-                componentName: info.name,
-                componentDir: componentDirFromProjectRoot,
-                componentFileName: info.componentFileName,
-                skipFormat: true,
-            });
         }
-    }
+    });
 }
 function updateProjectConfig(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAA8E;AAC9E,mFAA4E;AAC5E,~~uCAQoB~~;AACpB,+BAAgC;AAChC,qEAA0E;AAC1E,0EAG+C;AAC/C,oEAA2E;AAC3E,oEAAwE;AAGxE;;;GAGG;AACH,SAAsB,6BAA6B,CACjD,IAAU,EACV,OAAqC;;QAErC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,IAAA,uCAAc,EAAC,IAAI,EAAE;YAC7C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;~~QACvC~~,IAAI,OAAO,CAAC,UAAU,EAAE;~~YACtB~~,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAlBD,sEAkBC;AACD,~~SAAS~~,QAAQ,~~CACf~~,IAAU,EACV,aAAmC,EACnC,OAAqC~~;IAErC~~,MAAM,~~iBAAiB~~,GAAG,IAAA,0BAAiB,~~EACzC~~,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;~~IAEF~~,IAAI,IAAI,CAAC,~~MAAM~~,CAAC,~~iBAAiB~~,CAAC~~,EAAE~~;~~QAClC~~,IAAI,CAAC,~~MAAM~~,CAAC,~~iBAAiB~~,CAAC,CAAC;~~KAChC;IACD~~,IAAA,~~sBAAa~~,~~EACX~~,IAAI,~~EACJ~~,~~IAAA~~,~~0BAAiB~~,~~EAAC~~,~~SAAS,~~EAAE,OAAO,CAAC,~~EACrC~~,~~aAAa,~~CAAC,IAAI,~~EAClB;QACE~~,~~GAAG~~,~~EAAE~~,EAAE~~;KACR~~,~~CACF~~,CAAC;~~IAEF~~,IAAI,OAAO,CAAC,aAAa,EAAE;~~QACzB~~,MAAM,WAAW,GAAG,IAAA,mCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;~~QAEjE~~,MAAM,aAAa,GAAG,EAAE,CAAC;~~QACzB~~,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;~~YACpC~~,MAAM,eAAe,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;~~YAC7D~~,aAAa,CAAC,IAAI,CAChB,GAAG,IAAA,kCAAiB,EAClB,IAAI,EACJ,UAAU,EACV,eAAe,EACf,OAAO,CAAC,OAAO,CAChB,EACD,GAAG,IAAA,4CAA2B,EAAC,IAAI,EAAE,UAAU,CAAC,CACjD,CAAC;~~SACH~~;~~QAED~~,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;~~YAChC~~,IAAI,IAAI,KAAK,SAAS,EAAE;~~gBACtB~~,SAAS;~~aACV~~;~~YACD~~,MAAM,2BAA2B,GAAG,IAAA,eAAQ,EAC1C,aAAa,CAAC,IAAI,EAClB,IAAA,0BAAiB,EAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,CACpD,CAAC;~~YACF~~,IAAA,uCAAsB,EAAC,IAAI,EAAE;~~gBAC3B~~,OAAO,EAAE,OAAO,CAAC,OAAO;~~gBACxB~~,aAAa,EAAE,IAAI,CAAC,IAAI;~~gBACxB~~,YAAY,EAAE,2BAA2B;~~gBACzC~~,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;~~gBACzC~~,UAAU,EAAE,IAAI;~~aACjB~~,CAAC,CAAC;~~SACJ~~;~~KACF~~;~~AACH~~,CAAC;AAED,SAAe,mBAAmB,CAChC,IAAU,EACV,OAAqC;;QAErC,MAAM,KAAK,GAAG,MAAM,IAAA,qCAAe,EAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,6BAA6B;gBAC7B,+BAA+B;gBAC/B,uCAAuC;aACxC,CAAC;SACH,CAAC,CAAC;QAEH,iBAAiB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC;QAEjC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,SAAS,EAAE,IAAI,EACf,eAAe,EAAE,KAAK,CAAC,MAAM,GAC9B,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACnE,CAAC;CAAA;AAED,SAAS,iBAAiB,CAAC,MAAe;IACxC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,6IAA6I,CAC9I,CAAC;KACH;AACH,CAAC;AAED,kBAAe,6BAA6B,CAAC"}
1	+ {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"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"}

package/src/generators/directive/lib/validate-options.js CHANGED Viewed

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const path_1 = require("../../utils/path");
 const validations_1 = require("../../utils/validations");
 function validateOptions(tree, options) {
     (0, validations_1.validateProject)(tree, options.project);
-    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
     (0, validations_1.validateStandaloneOption)(tree, options.standalone);
 }
 exports.validateOptions = validateOptions;

package/src/generators/directive/lib/validate-options.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/directive/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,~~2CAA6D~~;~~AAC7D,yDAGiC;~~AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,~~gCAAyB~~,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;~~IAC/D~~,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}
1	+ {"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/directive/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,yDAIiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,4CAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}

package/src/generators/host/host.js CHANGED Viewed

@@ -47,6 +47,7 @@ function host(tree, options) {
             skipFormat: true,
             skipE2E,
             e2eProjectName: skipE2E ? undefined : `${appName}-e2e`,
+            prefix: options.prefix,
         });
         let installTasks = [appInstallTask];
         if (options.ssr) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AAEpB,4DAA8D;AAC9D,6CAA+C;AAC/C,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAA+B;AAE/B,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,IAAI,CAAC,IAAU,EAAE,OAAe;;;QACpD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,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,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAErE,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QACzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE;YACjC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;YACtD,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;~~SACvD~~,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;YACtC,MAAM,IAAA,gBAAe,EAAC,IAAI,kCACrB,OAAO,KACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,IAAI,EAChB,UAAU,EAAE,OAAO,CAAC,UAAU,IAC9B,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;~~AAtED~~,~~oBAsEC~~;AAED,kBAAe,IAAI,CAAC"}
1	+ {"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"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"}

package/src/generators/library/files/base/package.json__tpl__ CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-  "name": "<% if(npmScope) { %><%= npmScope %>/<% } %><%= libFileName %>",
+  "name": "<%= importPath %>",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "<%= angularPeerDepVersion %>",

package/src/generators/library/lib/create-files.js CHANGED Viewed

@@ -7,7 +7,6 @@ const semver_1 = require("semver");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
 function createFiles(tree, options, project) {
-    const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.libraryOptions.projectRoot);
     const libNames = (0, devkit_1.names)(options.libraryOptions.fileName);
     const pathToComponent = options.componentOptions.flat
@@ -26,7 +25,7 @@ function createFiles(tree, options, project) {
         projectRoot: options.libraryOptions.projectRoot,
         routing: options.libraryOptions.routing,
         pathToComponent,
-        npmScope,
+        importPath: options.libraryOptions.importPath,
         rootOffset,
         angularPeerDepVersion: `^${major}.${minor}.0`,
         tpl: '',

package/src/generators/library/lib/create-files.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/create-files.ts"],"names":[],"mappings":";;;AACA,~~uCAMoB~~;AACpB,+BAAiD;AACjD,mCAA+B;AAC/B,8DAA6D;AAE7D,6DAAuE;AAGvE,SAAgB,WAAW,CACzB,IAAU,EACV,OAAyB,EACzB,OAAoC;IAEpC,MAAM,~~EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,~~UAAU,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI;QACnD,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ;QACjC,CAAC,CAAC,IAAA,0BAAiB,EACf,OAAO,CAAC,cAAc,CAAC,QAAQ,EAC/B,OAAO,CAAC,cAAc,CAAC,QAAQ,CAChC,CAAC;IAEN,MAAM,OAAO,GAAG,IAAA,0CAA0B,EAAC,IAAI,CAAC,CAAC;IACjD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;IAExC,MAAM,aAAa,GAAG;QACpB,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI;QACpC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ;QAC5C,YAAY,EAAE,QAAQ,CAAC,SAAS;QAChC,eAAe,EAAE,QAAQ,CAAC,YAAY;QACtC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI;QAC1E,YAAY,EAAE,IAAA,0BAAiB,EAAC,UAAU,EAAE,IAAA,4BAAuB,EAAC,IAAI,CAAC,CAAC;QAC1E,UAAU,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU;QAC7C,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,WAAW;QAC/C,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO;QACvC,eAAe;QACf,~~QAAQ~~;~~QACR~~,UAAU;QACV,qBAAqB,EAAE,IAAI,KAAK,IAAI,KAAK,IAAI;QAC7C,GAAG,EAAE,EAAE;KACR,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,EAC7C,OAAO,CAAC,cAAc,CAAC,WAAW,EAClC,aAAa,CACd,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE;QACrC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gCAAgC,CAAC,EAC9D,OAAO,CAAC,cAAc,CAAC,WAAW,EAClC,aAAa,CACd,CAAC;KACH;SAAM;QACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,oBAAoB,CAAC,EAClD,OAAO,CAAC,cAAc,CAAC,WAAW,EAClC,aAAa,CACd,CAAC;QAEF,IAAI,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE;YACrC,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,UAAU,EAClB,OAAO,OAAO,CAAC,cAAc,CAAC,QAAQ,YAAY,CACnD,CACF,CAAC;SACH;KACF;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE;QACnC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC;KACzE;IAED,IACE,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS;QACjC,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,EACnC;QACA,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;KAC9D;AACH,CAAC;~~AA/ED~~,~~kCA+EC~~"}
1	+ {"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/create-files.ts"],"names":[],"mappings":"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"}

package/src/generators/library/lib/normalize-options.js CHANGED Viewed

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("nx/src/utils/path");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const linter_1 = require("@nx/linter");
 const test_runners_1 = require("../../../utils/test-runners");
 const project_1 = require("../../utils/project");
@@ -20,7 +21,8 @@ function normalizeOptions(host, schema) {
     const fullProjectDirectory = projectDirectory
         ? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`.replace(/\/+/g, '/')
         : name;
-    const { libsDir: defaultLibsDirectory, npmScope, standaloneAsDefault, } = (0, devkit_1.getWorkspaceLayout)(host);
+    const { libsDir: defaultLibsDirectory, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
+    const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
     const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDirectory;
     const projectName = fullProjectDirectory
         .replace(new RegExp('/', 'g'), '-')
@@ -32,9 +34,9 @@ function normalizeOptions(host, schema) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
-    const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
+    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, npmScope, 'lib');
     options.standaloneConfig = (_b = options.standaloneConfig) !== null && _b !== void 0 ? _b : standaloneAsDefault;
-    const importPath = options.importPath || (0, path_1.getImportPath)(npmScope, fullProjectDirectory);
+    const importPath = options.importPath || (0, get_import_path_1.getImportPath)(host, fullProjectDirectory);
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = Object.assign(Object.assign({}, options), { linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName, projectDirectory: fullProjectDirectory, modulePath,
         parsedTags,

package/src/generators/library/lib/normalize-options.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;~~AACpB~~,~~4CAAkD~~;~~AAGlD~~,uCAAoC;~~AACpC~~,8DAA6D;AAC7D,~~iDAAsD~~;~~AAEtD~~,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAAc;;IACzD,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,WAAW,EAAE,KAAK,EAClB,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI;QACnC,yGAAyG;QACzG,eAAe,EAAE,MAAM,CAAC,WAAW;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAA,MAAM,CAAC,eAAe,mCAAI,MAAM,EACpC,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,IAC/C,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;QACpE,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,~~EACJ~~,OAAO,EAAE,oBAAoB,~~EAC7B~~,~~QAAQ~~,~~EACR~~,~~mBAAmB~~,~~GACpB~~,GAAG,IAAA,~~2BAAkB~~,EAAC,IAAI,CAAC,CAAC;~~IAC7B~~,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,oBAAoB,CAAC;IAExD,MAAM,WAAW,GAAG,oBAAoB;SACrC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IACzD,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAErE,MAAM,UAAU,GAAG,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,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;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,MAAM,GAAG,IAAA,~~yBAAe~~,EAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;~~IAEzD~~,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAA,~~oBAAa,~~EAAC,~~QAAQ~~,EAAE,oBAAoB,CAAC,CAAC;~~IAEtE~~,MAAM,qBAAqB,GAAG,WAAW,CAAC;IAC1C,MAAM,oBAAoB,mCACrB,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,6BAAc,CAAC,IAAI,EAC7D,MAAM,EACN,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,SAAS,EAAE,OAAO,EAClB,UAAU,EACV,gBAAgB,EAAE,oBAAoB,EACtC,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU;QACV,qBAAqB,EACrB,uBAAuB,EAAE,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,SAAS,WAAW,GAC7D,CAAC;IAEF,MAAM,EACJ,YAAY,EACZ,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,KAAK,EACL,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,IAAI,KAEF,oBAAoB,EADnB,cAAc,kBACf,oBAAoB,EAZlB,mJAYL,CAAuB,CAAC;IAEzB,OAAO;QACL,cAAc;QACd,gBAAgB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,cAAc,CAAC,UAAU;YACrC,YAAY;YACZ,WAAW;YACX,cAAc;YACd,iBAAiB;YACjB,eAAe;YACf,KAAK;YACL,SAAS;YACT,QAAQ;YACR,YAAY;YACZ,IAAI;SACL;KACF,CAAC;AACJ,CAAC;~~AApGD~~,~~4CAoGC~~"}
1	+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/migrate-from-angular-cli.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { GeneratorOptions } from './schema';
-export declare function migrateFromAngularCli(tree: Tree, rawOptions: GeneratorOptions): Promise<GeneratorCallback>;
+export declare function migrateFromAngularCli(tree: Tree, options: GeneratorOptions): Promise<GeneratorCallback>;

package/src/generators/ng-add/migrate-from-angular-cli.js CHANGED Viewed

@@ -5,11 +5,10 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const migrators_1 = require("./migrators");
 const utilities_1 = require("./utilities");
-function migrateFromAngularCli(tree, rawOptions) {
+function migrateFromAngularCli(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, utilities_1.validateWorkspace)(tree);
         const projects = (0, utilities_1.getAllProjects)(tree);
-        const options = (0, utilities_1.normalizeOptions)(tree, rawOptions, projects);
         const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
         (0, utilities_1.ensureAngularDevKitPeerDependenciesAreInstalled)(tree);
         const migrators = [

package/src/generators/ng-add/migrate-from-angular-cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,uCAAuE;AAEvE,2CAAuD;AAEvD,~~2CAiBqB~~;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,~~UAA4B~~;;~~QAE5B~~,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;~~QACtC~~,MAAM,~~OAAO,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,MAAM,~~WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAQ,CAAC;QAC1D,IAAA,2DAA+C,EAAC,IAAI,CAAC,CAAC;QAEtD,MAAM,SAAS,GAAsB;YACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;YAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;SACnE,CAAC;QAEF,MAAM,0BAA0B,GAAG,IAAA,yCAA6B,EAC9D,IAAI,EACJ,SAAS,CACV,CAAC;QAEF;;;;;WAKG;QACH,IAAI,YAAY,GACd,0BAA0B,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAChE,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;YAClC,CAAC,CAAC,SAAS,CAAC;QAEhB,kDAAkD;QAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;QACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;QACxD,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;QACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;QACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;QAEjC,uBAAuB;QACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED;;;;WAIG;QACH,IAAI,0BAA0B,CAAC,KAAK,EAAE;YACpC,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;SAC7B;QACD,IAAI,0BAA0B,CAAC,MAAM,EAAE;YACrC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACnE,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;SAC7B;QAED,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;QACpC,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;gBAC1B,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;YACxB,CAAC,CAAC;SACH;IACH,CAAC;CAAA;~~AAvED~~,~~sDAuEC~~"}
1	+ {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,uCAAuE;AAEvE,2CAAuD;AAEvD,2CAgBqB;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAAyB;;QAEzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAQ,CAAC;QAC1D,IAAA,2DAA+C,EAAC,IAAI,CAAC,CAAC;QAEtD,MAAM,SAAS,GAAsB;YACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;YAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;SACnE,CAAC;QAEF,MAAM,0BAA0B,GAAG,IAAA,yCAA6B,EAC9D,IAAI,EACJ,SAAS,CACV,CAAC;QAEF;;;;;WAKG;QACH,IAAI,YAAY,GACd,0BAA0B,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAChE,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;YAClC,CAAC,CAAC,SAAS,CAAC;QAEhB,kDAAkD;QAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;QACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;QACxD,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;QACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;QACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;QAEjC,uBAAuB;QACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED;;;;WAIG;QACH,IAAI,0BAA0B,CAAC,KAAK,EAAE;YACpC,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;SAC7B;QACD,IAAI,0BAA0B,CAAC,MAAM,EAAE;YACrC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACnE,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;SAC7B;QAED,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;QACpC,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;gBAC1B,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;YACxB,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AAtED,sDAsEC"}

package/src/generators/ng-add/schema.d.ts CHANGED Viewed

@@ -3,7 +3,9 @@ import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 export interface GeneratorOptions {
-  skipInstall?: boolean;
+  /**
+   * @deprecated This should be inferred with {@link getNpmScope}
+   */
   npmScope?: string;
   defaultBase?: string;

package/src/generators/ng-add/schema.json CHANGED Viewed

@@ -9,7 +9,7 @@
     "npmScope": {
       "type": "string",
       "description": "Npm scope for importing libs. NOTE: only used if running the generator in an Angular CLI workspace.",
-      "x-priority": "important"
+      "x-deprecated": "This will be inferred from your root package.json"
     },
     "defaultBase": {
       "type": "string",

package/src/generators/ng-add/utilities/index.d.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 export * from './dependencies';
 export * from './format-files-task';
 export * from './logger';
-export * from './normalize-options';
 export * from './projects';
 export * from './types';
 export * from './validation-logging';

package/src/generators/ng-add/utilities/index.js CHANGED Viewed

@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./dependencies"), exports);
 tslib_1.__exportStar(require("./format-files-task"), exports);
 tslib_1.__exportStar(require("./logger"), exports);
-tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./projects"), exports);
 tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./validation-logging"), exports);

package/src/generators/ng-add/utilities/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,mDAAyB;AACzB,~~8DAAoC;AACpC,~~qDAA2B;AAC3B,kDAAwB;AACxB,+DAAqC;AACrC,sDAA4B"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,mDAAyB;AACzB,qDAA2B;AAC3B,kDAAwB;AACxB,+DAAqC;AACrC,sDAA4B"}