@rxap/plugin-library 16.2.0 → 16.3.0
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.
- package/CHANGELOG.md +10 -0
- package/README.md +1 -1
- package/package.json +13 -13
- package/src/executors/update-package-group/executor.js +19 -4
- package/src/executors/update-package-group/executor.js.map +1 -1
- package/src/executors/update-package-group/schema.d.ts +1 -0
- package/src/executors/update-package-group/schema.json +7 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [16.3.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.3.0-dev.0...@rxap/plugin-library@16.3.0) (2024-05-27)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rxap/plugin-library
|
|
9
|
+
|
|
10
|
+
# [16.3.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.2.0...@rxap/plugin-library@16.3.0-dev.0) (2024-05-27)
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
- add include option ([ad5ad54](https://gitlab.com/rxap/packages/commit/ad5ad5406bb2797f9bcfb9d742b1a7c53f7c349a))
|
|
15
|
+
|
|
6
16
|
# [16.2.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.2.0-dev.1...@rxap/plugin-library@16.2.0) (2024-05-27)
|
|
7
17
|
|
|
8
18
|
**Note:** Version bump only for package @rxap/plugin-library
|
package/README.md
CHANGED
|
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-library
|
|
|
19
19
|
```
|
|
20
20
|
**Install peer dependencies:**
|
|
21
21
|
```bash
|
|
22
|
-
yarn add @nx/devkit@^16.10.0 @rxap/generator-ts-morph@^1.0.3
|
|
22
|
+
yarn add @nx/devkit@^16.10.0 @rxap/generator-ts-morph@^1.0.3 @rxap/node-utilities@^1.2.0 @rxap/plugin-utilities@^16.4.0 @rxap/ts-morph@^1.2.0 @rxap/utilities@^16.2.0 @rxap/workspace-utilities@^16.3.0 nx@^16.10.0 ts-morph@^18.0.0 tslib@2.6.2
|
|
23
23
|
```
|
|
24
24
|
**Execute the init generator:**
|
|
25
25
|
```bash
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.
|
|
2
|
+
"version": "16.3.0",
|
|
3
3
|
"name": "@rxap/plugin-library",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -14,12 +14,12 @@
|
|
|
14
14
|
},
|
|
15
15
|
"peerDependencies": {
|
|
16
16
|
"@nx/devkit": "^16.10.0",
|
|
17
|
-
"@rxap/generator-ts-morph": "^1.0.3
|
|
17
|
+
"@rxap/generator-ts-morph": "^1.0.3",
|
|
18
18
|
"@rxap/node-utilities": "^1.2.0",
|
|
19
|
-
"@rxap/plugin-utilities": "^16.4.0
|
|
20
|
-
"@rxap/ts-morph": "^1.2.0
|
|
21
|
-
"@rxap/utilities": "^16.2.0
|
|
22
|
-
"@rxap/workspace-utilities": "^16.3.0
|
|
19
|
+
"@rxap/plugin-utilities": "^16.4.0",
|
|
20
|
+
"@rxap/ts-morph": "^1.2.0",
|
|
21
|
+
"@rxap/utilities": "^16.2.0",
|
|
22
|
+
"@rxap/workspace-utilities": "^16.3.0",
|
|
23
23
|
"nx": "^16.10.0",
|
|
24
24
|
"ts-morph": "^18.0.0",
|
|
25
25
|
"tslib": "2.6.2",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
},
|
|
52
52
|
{
|
|
53
53
|
"package": "@rxap/generator-ts-morph",
|
|
54
|
-
"version": "1.0.3
|
|
54
|
+
"version": "1.0.3"
|
|
55
55
|
},
|
|
56
56
|
{
|
|
57
57
|
"package": "@rxap/node-utilities",
|
|
@@ -59,23 +59,23 @@
|
|
|
59
59
|
},
|
|
60
60
|
{
|
|
61
61
|
"package": "@rxap/plugin-utilities",
|
|
62
|
-
"version": "16.4.0
|
|
62
|
+
"version": "16.4.0"
|
|
63
63
|
},
|
|
64
64
|
{
|
|
65
65
|
"package": "@rxap/ts-morph",
|
|
66
|
-
"version": "1.2.0
|
|
66
|
+
"version": "1.2.0"
|
|
67
67
|
},
|
|
68
68
|
{
|
|
69
69
|
"package": "@rxap/utilities",
|
|
70
|
-
"version": "16.2.0
|
|
70
|
+
"version": "16.2.0"
|
|
71
71
|
},
|
|
72
72
|
{
|
|
73
73
|
"package": "@rxap/workspace-ts-morph",
|
|
74
|
-
"version": "16.1.1
|
|
74
|
+
"version": "16.1.1"
|
|
75
75
|
},
|
|
76
76
|
{
|
|
77
77
|
"package": "@rxap/workspace-utilities",
|
|
78
|
-
"version": "16.3.0
|
|
78
|
+
"version": "16.3.0"
|
|
79
79
|
}
|
|
80
80
|
]
|
|
81
81
|
},
|
|
@@ -90,6 +90,6 @@
|
|
|
90
90
|
},
|
|
91
91
|
"schematics": "./generators.json",
|
|
92
92
|
"type": "commonjs",
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "b6254f4b1402e59d320bf3763618a0ccab10f8bc",
|
|
94
94
|
"main": "./src/index.js"
|
|
95
95
|
}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
5
|
+
const fs_1 = require("fs");
|
|
5
6
|
const package_json_1 = require("nx/src/utils/package-json");
|
|
7
|
+
const path_1 = require("path");
|
|
6
8
|
function normalizePackageVersion(version) {
|
|
7
9
|
return version.replace(/[\^~>=<]/g, '');
|
|
8
10
|
}
|
|
@@ -23,8 +25,20 @@ function getPackageGroupFromPeerDependencies(context, packageGroupRegex) {
|
|
|
23
25
|
const peerDependencies = (_a = (0, plugin_utilities_1.readPackageJsonForProject)(context).peerDependencies) !== null && _a !== void 0 ? _a : {};
|
|
24
26
|
return convertToPackageGroup(peerDependencies, packageGroupRegex);
|
|
25
27
|
}
|
|
26
|
-
function
|
|
27
|
-
|
|
28
|
+
function getPackageGroupFromRootDependencies(context, include) {
|
|
29
|
+
if (include.length === 0) {
|
|
30
|
+
console.log('No packages to include from the root package.json');
|
|
31
|
+
return [];
|
|
32
|
+
}
|
|
33
|
+
console.log('Include the following packages:', include.join(', '), 'from the root package.json');
|
|
34
|
+
const { dependencies = {}, devDependencies = {}, } = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(context.root, 'package.json'), 'utf-8'));
|
|
35
|
+
const includeDependencies = Object.entries(dependencies).filter(([packageName]) => include.includes(packageName)).reduce((acc, [packageName, version]) => (Object.assign(Object.assign({}, acc), { [packageName]: version })), {});
|
|
36
|
+
const includePeerDependencies = Object.entries(devDependencies).filter(([packageName]) => include.includes(packageName)).reduce((acc, [packageName, version]) => (Object.assign(Object.assign({}, acc), { [packageName]: version })), {});
|
|
37
|
+
const includes = Object.assign(Object.assign({}, includeDependencies), includePeerDependencies);
|
|
38
|
+
return convertToPackageGroup(includes, [/.*/]);
|
|
39
|
+
}
|
|
40
|
+
function getPackageGroup(context, packageGroupRegex, include = []) {
|
|
41
|
+
return mergePackageGroup(mergePackageGroup(getPackageGroupFromPeerDependencies(context, packageGroupRegex), getPackageGroupFromDependencies(context, packageGroupRegex)), getPackageGroupFromRootDependencies(context, include));
|
|
28
42
|
}
|
|
29
43
|
function mergePackageGroup(original, updated) {
|
|
30
44
|
const normalized = (0, package_json_1.normalizePackageGroup)(original);
|
|
@@ -35,6 +49,7 @@ function mergePackageGroup(original, updated) {
|
|
|
35
49
|
function runExecutor(options, context) {
|
|
36
50
|
var _a, _b;
|
|
37
51
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
console.log('Executor ran for update-package-group', options);
|
|
38
53
|
const packageJson = (0, plugin_utilities_1.readPackageJsonForProject)(context);
|
|
39
54
|
// ensure the property "ng-migrations" exists
|
|
40
55
|
(_a = packageJson['nx-migrations']) !== null && _a !== void 0 ? _a : (packageJson['nx-migrations'] = {});
|
|
@@ -50,14 +65,14 @@ function runExecutor(options, context) {
|
|
|
50
65
|
const packageGroupRegex = options.packageGroupRegex.map(regex => new RegExp(regex));
|
|
51
66
|
console.log(`Update package group for project ${context.projectName} with the following package group regex:`, packageGroupRegex.map(regex => regex.toString()));
|
|
52
67
|
(0, plugin_utilities_1.LoadProjectToPackageMapping)(context);
|
|
53
|
-
let packageGroup = getPackageGroup(context, packageGroupRegex);
|
|
68
|
+
let packageGroup = getPackageGroup(context, packageGroupRegex, options.include);
|
|
54
69
|
(_b = nxMigrations.packageGroup) !== null && _b !== void 0 ? _b : (nxMigrations.packageGroup = []);
|
|
55
70
|
if (options.merge) {
|
|
56
71
|
console.log('Merge the package group');
|
|
57
72
|
packageGroup = mergePackageGroup(nxMigrations.packageGroup, packageGroup);
|
|
58
73
|
}
|
|
59
74
|
console.log('set the package group', JSON.stringify(packageGroup, undefined, 2));
|
|
60
|
-
nxMigrations.packageGroup = packageGroup;
|
|
75
|
+
nxMigrations.packageGroup = packageGroup.sort((a, b) => a.package.localeCompare(b.package));
|
|
61
76
|
(0, plugin_utilities_1.writePackageJsonFormProject)(context, packageJson);
|
|
62
77
|
return {
|
|
63
78
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":";;;AACA,6DAKgC;AAChC,4DAImC;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,13 @@
|
|
|
21
21
|
"type": "boolean",
|
|
22
22
|
"default": false,
|
|
23
23
|
"description": "If true, the package group will be merged with the existing package group. If false, the package group will be replaced."
|
|
24
|
+
},
|
|
25
|
+
"include": {
|
|
26
|
+
"type": "array",
|
|
27
|
+
"items": {
|
|
28
|
+
"type": "string"
|
|
29
|
+
},
|
|
30
|
+
"description": "List of package names that should be added to the package group"
|
|
24
31
|
}
|
|
25
32
|
},
|
|
26
33
|
"required": []
|