@rxap/plugin-library 19.2.0-dev.1 → 19.2.0-dev.10

package/CHANGELOG.md

@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [19.2.0-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.9...@rxap/plugin-library@19.2.0-dev.10) (2024-06-18)
+
+**Note:** Version bump only for package @rxap/plugin-library
+
+# [19.2.0-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.8...@rxap/plugin-library@19.2.0-dev.9) (2024-06-18)
+
+**Note:** Version bump only for package @rxap/plugin-library
+
+# [19.2.0-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.7...@rxap/plugin-library@19.2.0-dev.8) (2024-06-18)
+
+**Note:** Version bump only for package @rxap/plugin-library
+
+# [19.2.0-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.6...@rxap/plugin-library@19.2.0-dev.7) (2024-06-17)
+
+### Bug Fixes
+
+- ensure all new publishable libraries are added to the rxap project ([ee25608](https://gitlab.com/rxap/packages/commit/ee25608ffbd869a187739ac31b31a216308e5e91))
+
+### Features
+
+- add include dependencies option ([c5fcf7c](https://gitlab.com/rxap/packages/commit/c5fcf7cf8ed4d3f72c6e45496b9cd849208fa5ba))
+
+# [19.2.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.5...@rxap/plugin-library@19.2.0-dev.6) (2024-06-17)
+
+### Bug Fixes
+
+- ensure the package version is only updated if required ([b1a9cd3](https://gitlab.com/rxap/packages/commit/b1a9cd33ba603401361dacc100ef6ff14317a6f1))
+
+# [19.2.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.4...@rxap/plugin-library@19.2.0-dev.5) (2024-06-17)
+
+### Bug Fixes
+
+- always add the expose-as-schematic target to plugin projects ([fb8e9f0](https://gitlab.com/rxap/packages/commit/fb8e9f0771dcb4cfdc25334775ddcedba0a3e4bc))
+- ensure standalone packages only have dependencies ([877a4ca](https://gitlab.com/rxap/packages/commit/877a4ca54a2cb211089a1bdec05246b36873fbc4))
+- only add dependencies to preset and plugin projects ([6e779b4](https://gitlab.com/rxap/packages/commit/6e779b46a34b329e4721af7bac529f1f801bb17a))
+- only include direct package peer dependencies ([dd0e600](https://gitlab.com/rxap/packages/commit/dd0e60025c26e6ce26637b1e10ec8d09fccc03f3))
+- resolve package group based on peer dependencies ([6f76b16](https://gitlab.com/rxap/packages/commit/6f76b163d1ae3f2a9ec4949401cdff2f23fcd7a1))
+- simplify index-export target adding ([8241689](https://gitlab.com/rxap/packages/commit/824168987779b6c260d16c950895ef1b3514b44f))
+
+### Features
+
+- add init preset generator ([1ebe1f8](https://gitlab.com/rxap/packages/commit/1ebe1f839a4b0620efcb0d5b46b09182d07d7893))
+- add init schematic generator ([121026d](https://gitlab.com/rxap/packages/commit/121026db02845c41b95c3ba405f897c02c7cca9c))
+- add onlyDependencies option ([459144b](https://gitlab.com/rxap/packages/commit/459144b1b66a1744994e97e42929874dc1c33415))
+
+# [19.2.0-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.3...@rxap/plugin-library@19.2.0-dev.4) (2024-06-17)
+
+### Bug Fixes
+
+- delete target ([2a08aa2](https://gitlab.com/rxap/packages/commit/2a08aa23b8a7fdb4fc6fe7d72a5fd51b1d98672a))
+- use coerce file function ([822c33c](https://gitlab.com/rxap/packages/commit/822c33c0021276844114e859d53c79cad6feb51a))
+
+# [19.2.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.2...@rxap/plugin-library@19.2.0-dev.3) (2024-06-06)
+
+### Bug Fixes
+
+- check in any file ([84b98e3](https://gitlab.com/rxap/packages/commit/84b98e39c4273d6146b1be8f777b2a50e0877d15))
+
+# [19.2.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.1...@rxap/plugin-library@19.2.0-dev.2) (2024-06-05)
+
+### Bug Fixes
+
+- only set the tslib version initial ([964b896](https://gitlab.com/rxap/packages/commit/964b896375d547c9fd98752faeb3052a5ef0b2de))
+
 # [19.2.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.2.0-dev.0...@rxap/plugin-library@19.2.0-dev.1) (2024-06-04)
 
 ### Features

package/generators.json

@@ -54,6 +54,16 @@
       "factory": "./src/generators/add-migration/generator",
       "schema": "./src/generators/add-migration/schema.json",
       "description": "add-migration generator"
+    },
+    "init-preset": {
+      "factory": "./src/generators/init-preset/generator",
+      "schema": "./src/generators/init-preset/schema.json",
+      "description": "init-preset generator"
+    },
+    "init-schematic": {
+      "factory": "./src/generators/init-schematic/generator",
+      "schema": "./src/generators/init-schematic/schema.json",
+      "description": "init-schematic generator"
     }
   },
   "schematics": {
@@ -111,6 +121,16 @@
       "factory": "./src/generators/add-migration/index",
       "schema": "./src/generators/add-migration/schema.json",
       "description": "add-migration generator"
+    },
+    "init-preset": {
+      "factory": "./src/generators/init-preset/index",
+      "schema": "./src/generators/init-preset/schema.json",
+      "description": "init-preset generator"
+    },
+    "init-schematic": {
+      "factory": "./src/generators/init-schematic/index",
+      "schema": "./src/generators/init-schematic/schema.json",
+      "description": "init-schematic generator"
     }
   }
 }

package/package.json

@@ -1,26 +1,24 @@
 {
-  "version": "19.2.0-dev.1",
+  "version": "19.2.0-dev.10",
   "name": "@rxap/plugin-library",
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "9.0.9",
-    "colors": "^1.4.0",
-    "handlebars": "^4.7.7",
-    "semver": "^7.5.3",
+    "@nx/devkit": "19.1.1",
+    "@nx/plugin": "19.1.1",
+    "@rxap/generator-ts-morph": "^1.0.8-dev.4",
+    "@rxap/node-utilities": "^1.3.0-dev.1",
+    "@rxap/plugin-utilities": "^19.0.3-dev.5",
+    "@rxap/ts-morph": "^1.4.0-dev.3",
+    "@rxap/utilities": "^16.2.3-dev.0",
+    "@rxap/workspace-utilities": "^19.2.0-dev.9",
+    "colors": "1.4.0",
+    "handlebars": "4.7.8",
+    "nx": "19.1.1",
+    "semver": "7.5.3",
+    "ts-morph": "18.0.0",
     "tslib": "2.6.2"
   },
-  "peerDependencies": {
-    "@nx/devkit": "^19.1.1",
-    "@nx/plugin": "^19.1.1",
-    "@rxap/generator-ts-morph": "^1.0.7",
-    "@rxap/node-utilities": "^1.2.2",
-    "@rxap/plugin-utilities": "^19.0.3-dev.0",
-    "@rxap/ts-morph": "^1.3.0",
-    "@rxap/utilities": "^16.2.2",
-    "@rxap/workspace-utilities": "^19.2.0-dev.0",
-    "nx": "^19.1.1",
-    "ts-morph": "^18.0.0"
-  },
   "author": {
     "name": "Merzough Münker",
     "email": "mmuenker@digitaix.com"
@@ -39,46 +37,6 @@
     "plugin-library",
     "rxap"
   ],
-  "nx-migrations": {
-    "packageGroup": [
-      {
-        "package": "@nx/devkit",
-        "version": "19.1.1"
-      },
-      {
-        "package": "@nx/plugin",
-        "version": "19.1.1"
-      },
-      {
-        "package": "@rxap/generator-ts-morph",
-        "version": "1.0.7"
-      },
-      {
-        "package": "@rxap/node-utilities",
-        "version": "1.2.2"
-      },
-      {
-        "package": "@rxap/plugin-utilities",
-        "version": "19.0.3-dev.0"
-      },
-      {
-        "package": "@rxap/ts-morph",
-        "version": "1.3.0"
-      },
-      {
-        "package": "@rxap/utilities",
-        "version": "16.2.2"
-      },
-      {
-        "package": "@rxap/workspace-ts-morph",
-        "version": "19.0.2"
-      },
-      {
-        "package": "@rxap/workspace-utilities",
-        "version": "19.2.0-dev.0"
-      }
-    ]
-  },
   "publishConfig": {
     "access": "public",
     "directory": "../../../dist/packages/plugin/library"
@@ -90,6 +48,6 @@
   },
   "schematics": "./generators.json",
   "type": "commonjs",
-  "gitHead": "ae79ca2aed680609ef2b560fe7528fb03ec87756",
+  "gitHead": "8ff7acb2b84b1ebde1e0569362be8aaae556fe11",
   "main": "./src/index.js"
 }

package/src/executors/update-package-group/executor.js

@@ -22,10 +22,57 @@ function getPackageGroupFromDependencies(context, packageGroupRegex) {
         return convertToPackageGroup(directPackageDependencies, packageGroupRegex);
     });
 }
+function loadPackageJsonForPackage(packageName) {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const packageJsonPath = require.resolve(`${packageName}/package.json`);
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        return require(packageJsonPath);
+    }
+    catch (e) {
+        console.error(`Could not load package.json for package ${packageName}`, e);
+    }
+    return null;
+}
+function getPeerDependenciesForPackage(packageName) {
+    var _a, _b;
+    const packageJson = loadPackageJsonForPackage(packageName);
+    if (!packageJson) {
+        return {};
+    }
+    console.log(`Package ${packageName} has the following peer dependencies:`, Object.keys((_a = packageJson.peerDependencies) !== null && _a !== void 0 ? _a : {}).join(', '));
+    return (_b = packageJson.peerDependencies) !== null && _b !== void 0 ? _b : {};
+}
+function getAllPeerDependenciesForProject(context_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (context, projectName = context.projectName, resolvedPeerDependencies = []) {
+        let { peerDependencies = {} } = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context, projectName);
+        console.log(`Project ${projectName} has the following peer dependencies:`, Object.keys(peerDependencies).join(', '));
+        for (const peerDependency of Object.keys(peerDependencies)) {
+            if (resolvedPeerDependencies.includes(peerDependency)) {
+                continue;
+            }
+            if ((0, plugin_utilities_1.HasProjectWithPackageName)(peerDependency)) {
+                console.log(`Peer dependency ${peerDependency} is a project`);
+                const deps = yield getAllPeerDependenciesForProject(context, (0, plugin_utilities_1.PackageNameToProjectName)(peerDependency), [...resolvedPeerDependencies]);
+                peerDependencies = Object.assign(Object.assign({}, deps), peerDependencies);
+                resolvedPeerDependencies.push(peerDependency);
+                resolvedPeerDependencies.push(...Object.keys(deps));
+            }
+            else {
+                console.log(`Peer dependency ${peerDependency} is a package`);
+                const deps = getPeerDependenciesForPackage(peerDependency);
+                peerDependencies = Object.assign(Object.assign({}, deps), peerDependencies);
+                resolvedPeerDependencies.push(peerDependency);
+                resolvedPeerDependencies.push(...Object.keys(deps));
+            }
+        }
+        return Object.assign({}, peerDependencies);
+    });
+}
 function getPackageGroupFromPeerDependencies(context, packageGroupRegex) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const peerDependencies = (_a = (yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context)).peerDependencies) !== null && _a !== void 0 ? _a : {};
+        const peerDependencies = yield getAllPeerDependenciesForProject(context);
+        console.log('Include the following packages from the peer dependencies:', Object.keys(peerDependencies).join(', '));
         return convertToPackageGroup(peerDependencies, packageGroupRegex);
     });
 }
@@ -41,9 +88,17 @@ function getPackageGroupFromRootDependencies(context, include) {
     const includes = Object.assign(Object.assign({}, includeDependencies), includePeerDependencies);
     return convertToPackageGroup(includes, [/.*/]);
 }
-function getPackageGroup(context_1, packageGroupRegex_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* (context, packageGroupRegex, include = []) {
-        return mergePackageGroup(mergePackageGroup(yield getPackageGroupFromPeerDependencies(context, packageGroupRegex), yield getPackageGroupFromDependencies(context, packageGroupRegex)), getPackageGroupFromRootDependencies(context, include));
+function getPackageGroup(context, packageGroupRegex, include, includeDependnecies) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let packageGroupArray = mergePackageGroup(
+        // load package defined as peer dependencies
+        yield getPackageGroupFromPeerDependencies(context, packageGroupRegex), 
+        // load package defined by the include option from the root package.json
+        getPackageGroupFromRootDependencies(context, include));
+        if (includeDependnecies) {
+            packageGroupArray = mergePackageGroup(packageGroupArray, yield getPackageGroupFromDependencies(context, packageGroupRegex));
+        }
+        return packageGroupArray;
     });
 }
 function mergePackageGroup(original, updated) {
@@ -54,7 +109,7 @@ function mergePackageGroup(original, updated) {
 }
 function runExecutor(options, context) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         console.log('Executor ran for update-package-group', options);
         const packageJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
         // ensure the property "ng-migrations" exists
@@ -71,8 +126,8 @@ function runExecutor(options, context) {
         const packageGroupRegex = options.packageGroupRegex.map(regex => new RegExp(regex));
         console.log(`Update package group for project ${context.projectName} with the following package group regex:`, packageGroupRegex.map(regex => regex.toString()));
         yield (0, plugin_utilities_1.LoadProjectToPackageMappingWithRetry)(context);
-        let packageGroup = yield getPackageGroup(context, packageGroupRegex, options.include);
-        (_b = nxMigrations.packageGroup) !== null && _b !== void 0 ? _b : (nxMigrations.packageGroup = []);
+        let packageGroup = yield getPackageGroup(context, packageGroupRegex, (_b = options.include) !== null && _b !== void 0 ? _b : [], (_c = options.includeDependencies) !== null && _c !== void 0 ? _c : false);
+        (_d = nxMigrations.packageGroup) !== null && _d !== void 0 ? _d : (nxMigrations.packageGroup = []);
         if (options.merge) {
             console.log('Merge the package group');
             packageGroup = mergePackageGroup(nxMigrations.packageGroup, packageGroup);

package/src/executors/update-package-group/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":";;;AACA,6DAQgC;AAChC,2BAAkC;AAClC,4DAImC;AACnC,+BAA4B;AAG5B,SAAS,uBAAuB,CAAC,OAAe;IAC9C,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,qBAAqB,CAAC,KAA6B,EAAE,iBAA2B;IACvF,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;SACzB,MAAM,CAAC,CAAC,CAAE,WAAW,CAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;SACrF,GAAG,CAAC,CAAC,CAAE,WAAW,EAAE,OAAO,CAAE,EAAE,EAAE,CAAC,CAAC;QAClC,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,uBAAuB,CAAC,OAAO,CAAC;KAC1C,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAe,+BAA+B,CAAC,OAAwB,EAAE,iBAA2B;;QAClG,MAAM,yBAAyB,GAAG,MAAM,IAAA,8DAA2C,EAAC,OAAO,CAAC,CAAC;QAC7F,OAAO,qBAAqB,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,CAAC;IAC7E,CAAC;CAAA;AAED,SAAe,mCAAmC,CAAC,OAAwB,EAAE,iBAA2B;;;QACtG,MAAM,gBAAgB,GAAG,MAAA,CAAC,MAAM,IAAA,qDAAkC,EAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,mCAAI,EAAE,CAAC;QACpG,OAAO,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACpE,CAAC;CAAA;AAED,SAAS,mCAAmC,CAAC,OAAwB,EAAE,OAAiB;IACtF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;QACjE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,4BAA4B,CAAC,CAAC;IACjG,MAAM,EACJ,YAAY,GAAG,EAAE,EACjB,eAAe,GAAG,EAAE,GACrB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1E,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAC7D,CAAC,CAAE,WAAW,CAAE,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAE,WAAW,EAAE,OAAO,CAAE,EAAE,EAAE,CAAC,iCAEzF,GAAG,KACN,CAAC,WAAW,CAAC,EAAE,OAAO,IAEzB,EAAE,EAAE,CAAC,CAAC;IACP,MAAM,uBAAuB,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,MAAM,CACpE,CAAC,CAAE,WAAW,CAAE,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAE,WAAW,EAAE,OAAO,CAAE,EAAE,EAAE,CAAC,iCAEzF,GAAG,KACN,CAAC,WAAW,CAAC,EAAE,OAAO,IAEzB,EAAE,EAAE,CAAC,CAAC;IACP,MAAM,QAAQ,mCAAQ,mBAAmB,GAAK,uBAAuB,CAAE,CAAC;IACxE,OAAO,qBAAqB,CAAC,QAAQ,EAAE,CAAE,IAAI,CAAE,CAAC,CAAC;AACnD,CAAC;AAED,SAAe,eAAe;iEAAC,OAAwB,EAAE,iBAA2B,EAAE,UAAoB,EAAE;QAC1G,OAAO,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,mCAAmC,CAAC,OAAO,EAAE,iBAAiB,CAAC,EAC9G,MAAM,+BAA+B,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAClE,EAAE,mCAAmC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;CAAA;AAED,SAAS,iBAAiB,CAAC,QAAsB,EAAE,OAA0B;IAC3E,MAAM,UAAU,GAAG,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC;IACnD,OAAO,CAAE,GAAG,OAAO,EAAE,GAAG,UAAU,CAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACjE,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC;IAC/F,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAA8B,WAAW,CACvC,OAAyC,EACzC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,uCAAuC,EAAE,OAAO,CAAC,CAAC;QAG9D,MAAM,WAAW,GAAG,MAAM,IAAA,qDAAkC,EAAC,OAAO,CAAC,CAAC;QAEtE,6CAA6C;QAC7C,MAAA,WAAW,CAAC,eAAe,qCAA3B,WAAW,CAAC,eAAe,IAAM,EAAE,EAAC;QAEpC,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAEtD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC9F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC;YAC3F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC5B,CAAC;QAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAEpF,OAAO,CAAC,GAAG,CAAC,oCAAqC,OAAO,CAAC,WAAY,0CAA0C,EAAE,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEnK,MAAM,IAAA,uDAAoC,EAAC,OAAO,CAAC,CAAC;QAEpD,IAAI,YAAY,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtF,MAAA,YAAY,CAAC,YAAY,oCAAzB,YAAY,CAAC,YAAY,GAAK,EAAE,EAAC;QAEjC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QACjF,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAE5F,IAAA,8CAA2B,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAElD,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AA9CD,8BA8CC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":"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"}

package/src/executors/update-package-group/schema.d.ts

@@ -2,4 +2,5 @@ export interface UpdatePackageGroupExecutorSchema {
   packageGroupRegex: string[];
   merge?: boolean;
   include?: string[];
+  includeDependencies?: boolean;
 }

package/src/executors/update-package-group/schema.json

@@ -29,6 +29,11 @@
         "type": "string"
       },
       "description": "List of package names that should be added to the package group"
+    },
+    "includeDependencies": {
+      "type": "boolean",
+      "default": false,
+      "description": "If true, the dependencies of the included packages will be added to the package group"
     }
   },
   "required": []

package/src/generators/bundle-json-schema/generator.js

@@ -97,7 +97,7 @@ function bundleJsonSchemaGenerator(tree, options) {
                 }
                 (_a = bundledSchema['definitions']) !== null && _a !== void 0 ? _a : (bundledSchema['definitions'] = {});
                 bundledSchema['definitions'] = Object.entries(bundledSchema['definitions']).sort(([a], [b]) => a.localeCompare(b)).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [key]: value })), {});
-                tree.write(file.path.replace('template.schema.json', 'schema.json'), JSON.stringify(bundledSchema, null, 2));
+                (0, workspace_utilities_1.CoerceFile)(tree, file.path.replace('template.schema.json', 'schema.json'), JSON.stringify(bundledSchema, null, 2), true);
             }
         }
     });

package/src/generators/bundle-json-schema/generator.js.map

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

package/src/generators/expose-as-schematic/generator.js

@@ -23,7 +23,7 @@ function exposeAsSchematicGenerator(tree, options) {
                 var _a;
                 (_a = generators.schematics) !== null && _a !== void 0 ? _a : (generators.schematics = {});
                 for (const [name, generator] of Object.entries(generators.generators)) {
-                    tree.write((0, path_1.join)(project.root, (0, path_1.dirname)(generator.schema), 'index.ts'), `import { convertNxGenerator } from '@nx/devkit';\nimport generator from './generator';\n\nconst schematic = convertNxGenerator(generator);\nexport default schematic;\n`);
+                    (0, workspace_utilities_1.CoerceFile)(tree, (0, path_1.join)(project.root, (0, path_1.dirname)(generator.schema), 'index.ts'), `import { convertNxGenerator } from '@nx/devkit';\nimport generator from './generator';\n\nconst schematic = convertNxGenerator(generator);\nexport default schematic;\n`, true);
                     generators.schematics[name] = {
                         factory: `${(0, path_1.dirname)(generator.schema)}/index`,
                         schema: generator.schema,

package/src/generators/expose-as-schematic/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/expose-as-schematic/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAImC;AACnC,+BAGc;AAGd,SAAS,WAAW,CAClB,IAAU,EACV,OAAyC,EACzC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,8CAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,0BAA0B,CAC9C,IAAU,EACV,OAAyC;;QAEzC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAEnE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;gBACrD,SAAS;YACX,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,oCAAqC,WAAY,EAAE,CAAC,CAAC;YAEjE,IAAA,sCAAgB,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE;;gBAE7C,MAAA,UAAU,CAAC,UAAU,oCAArB,UAAU,CAAC,UAAU,GAAK,EAAE,EAAC;gBAE7B,KAAK,MAAM,CAAE,IAAI,EAAE,SAAS,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBACxE,IAAI,CAAC,KAAK,CACR,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,EACzD,yKAAyK,CAC1K,CAAC;oBACF,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;wBAC5B,OAAO,EAAE,GAAI,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAE,QAAQ;wBAC/C,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,WAAW,EAAE,SAAS,CAAC,WAAW;qBACnC,CAAC;gBACJ,CAAC;gBAED,OAAO,UAAU,CAAC;YAEpB,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;gBACnD,WAAW,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;YACxD,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAEtB,CAAC;IACH,CAAC;CAAA;AAvCD,gEAuCC;AAED,kBAAe,0BAA0B,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/expose-as-schematic/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAKmC;AACnC,+BAGc;AAGd,SAAS,WAAW,CAClB,IAAU,EACV,OAAyC,EACzC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,8CAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,0BAA0B,CAC9C,IAAU,EACV,OAAyC;;QAEzC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAEnE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;gBACrD,SAAS;YACX,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,oCAAqC,WAAY,EAAE,CAAC,CAAC;YAEjE,IAAA,sCAAgB,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE;;gBAE7C,MAAA,UAAU,CAAC,UAAU,oCAArB,UAAU,CAAC,UAAU,GAAK,EAAE,EAAC;gBAE7B,KAAK,MAAM,CAAE,IAAI,EAAE,SAAS,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBACxE,IAAA,gCAAU,EACR,IAAI,EACJ,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,EACzD,yKAAyK,EACzK,IAAI,CACL,CAAC;oBACF,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;wBAC5B,OAAO,EAAE,GAAI,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAE,QAAQ;wBAC/C,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,WAAW,EAAE,SAAS,CAAC,WAAW;qBACnC,CAAC;gBACJ,CAAC;gBAED,OAAO,UAAU,CAAC;YAEpB,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;gBACnD,WAAW,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;YACxD,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAEtB,CAAC;IACH,CAAC;CAAA;AAzCD,gEAyCC;AAED,kBAAe,0BAA0B,CAAC"}

package/src/generators/fix-dependencies/generator.js

@@ -144,6 +144,7 @@ const PACKAGE_ADD_BLACK_LIST = [
     'axios',
 ];
 const PACKAGE_PEER_DEPENDENCIES_BLACK_LIST = ['tslib'];
+const PACKAGE_FORCED_PEER_DEPENDENCIES = ['rxjs', /@angular\//, /@nestjs\//, /@storybook\//, /@types\//];
 function addDependedProjects(projectGraph, tree, packageName, projectRoot, dependencies) {
     const projectName = (0, workspace_utilities_1.PackageNameToProjectName)(packageName);
     const dependedProjectList = resolveProjectDependencies(projectGraph, projectName);
@@ -404,7 +405,7 @@ function replaceLatestPackageVersionForProject(tree, projectName) {
         yield replaceLatestPackageVersion(peerDependencies);
         yield replaceLatestPackageVersion(devDependencies);
         yield replaceLatestPackageVersion(optionalDependencies);
-        tree.write((0, path_1.join)(projectRoot, 'package.json'), JSON.stringify(packageJson, null, 2) + '\n');
+        (0, workspace_utilities_1.CoerceFile)(tree, (0, path_1.join)(projectRoot, 'package.json'), JSON.stringify(packageJson, null, 2) + '\n', true);
     });
 }
 exports.replaceLatestPackageVersionForProject = replaceLatestPackageVersionForProject;
@@ -460,9 +461,10 @@ function fixDependenciesGenerator(tree, options) {
                 packageJson.peerDependencies = {};
                 packageJson.devDependencies = {};
                 packageJson.optionalDependencies = {};
-                tree.write(`${projectRoot}/package.json`, JSON.stringify(packageJson, null, 2) + '\n');
+                (0, workspace_utilities_1.CoerceFile)(tree, `${projectRoot}/package.json`, JSON.stringify(packageJson, null, 2) + '\n', true);
             }
         }
+        const rootPackageJson = (0, workspace_utilities_1.GetRootPackageJson)(tree);
         const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
         (0, workspace_utilities_1.LoadProjectToPackageMapping)(tree, projectGraph);
         const unknownPackageMap = {};
@@ -474,8 +476,8 @@ function fixDependenciesGenerator(tree, options) {
             }
             console.log(`Fix dependencies for project ${projectName}`);
             yield loadAvailablePackageVersion(tree, projectRoot);
-            yield (0, workspace_utilities_1.UpdatePackageJson)(tree, packageJson => {
-                var _a, _b, _c, _d;
+            (0, workspace_utilities_1.UpdatePackageJson)(tree, packageJson => {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
                 (_b = packageJson.peerDependencies) !== null && _b !== void 0 ? _b : (packageJson.peerDependencies = {});
                 (_c = packageJson.devDependencies) !== null && _c !== void 0 ? _c : (packageJson.devDependencies = {});
@@ -485,7 +487,7 @@ function fixDependenciesGenerator(tree, options) {
                         delete packageJson.dependencies[name];
                     }
                 }
-                if (latestTsLibVersion) {
+                if (latestTsLibVersion && !packageJson.dependencies['tslib']) {
                     packageJson.dependencies['tslib'] = latestTsLibVersion;
                 }
                 const peerReport = fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot, packageJson);
@@ -495,6 +497,21 @@ function fixDependenciesGenerator(tree, options) {
                         delete packageJson.peerDependencies[banned];
                     }
                 }
+                if (options.onlyDependencies) {
+                    packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.peerDependencies);
+                    packageJson.peerDependencies = {};
+                }
+                for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
+                    packageJson.dependencies[packageName] = (_h = (_f = (_e = rootPackageJson.dependencies) === null || _e === void 0 ? void 0 : _e[packageName]) !== null && _f !== void 0 ? _f : (_g = rootPackageJson.devDependencies) === null || _g === void 0 ? void 0 : _g[packageName]) !== null && _h !== void 0 ? _h : version;
+                }
+                for (const forcedPeerDependency of PACKAGE_FORCED_PEER_DEPENDENCIES) {
+                    for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
+                        if (forcedPeerDependency instanceof RegExp ? forcedPeerDependency.test(packageName) : forcedPeerDependency === packageName) {
+                            packageJson.peerDependencies[packageName] = version;
+                            delete packageJson.dependencies[packageName];
+                        }
+                    }
+                }
                 console.log(`====================  Report for project ${projectName}`);
                 console.log('========== Peer dependencies:');
                 printReport(peerReport);

package/src/generators/fix-dependencies/generator.js.map

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

package/src/generators/fix-dependencies/schema.d.ts

@@ -5,4 +5,5 @@ export interface FixDependenciesGeneratorSchema {
   verbose?: boolean;
   resolve?: boolean;
   strict?: boolean;
+  onlyDependencies?: boolean;
 }

package/src/generators/fix-dependencies/schema.json

@@ -25,6 +25,11 @@
       "type": "boolean",
       "default": false,
       "description": "If true, will fail if any dependency is not found"
+    },
+    "onlyDependencies": {
+      "type": "boolean",
+      "default": false,
+      "description": "If true, will move all peer dependencies to dependencies"
     }
   },
   "required": []

package/src/generators/index-export/generator.js

@@ -24,7 +24,7 @@ function generateIndexFile(tree, sourceRoot) {
     }
     filePathList = filePathList.filter(path => {
         const content = tree.read(path, 'utf-8');
-        return content && !content.split('\n')[0].match(/rxap-no-index-export/);
+        return content && !content.split('\n').some(line => line.match(/rxap-no-index-export/));
     });
     filePathList = filePathList.map(path => path.replace(new RegExp(`^${libRoot}/`), ''));
     const map = new Map();