@rxap/plugin-library 16.1.0 → 16.2.0-dev.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 +6 -0
- package/README.md +1 -1
- package/package.json +18 -26
- package/src/executors/update-package-group/executor.d.ts +1 -1
- package/src/executors/update-package-group/executor.js +31 -8
- package/src/executors/update-package-group/executor.js.map +1 -1
- package/src/executors/update-package-group/schema.d.ts +4 -1
- package/src/executors/update-package-group/schema.json +19 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
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.2.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0...@rxap/plugin-library@16.2.0-dev.0) (2024-05-27)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- **plugin-library:** enhance update-package-group executor functionality ([38f76c6](https://gitlab.com/rxap/packages/commit/38f76c6e3c628711a7617484925d024a445b840d))
|
|
11
|
+
|
|
6
12
|
# [16.1.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.12...@rxap/plugin-library@16.1.0) (2024-04-17)
|
|
7
13
|
|
|
8
14
|
**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.2 @rxap/node-utilities@^1.2.0 @rxap/plugin-utilities@^16.
|
|
22
|
+
yarn add @nx/devkit@^16.10.0 @rxap/generator-ts-morph@^1.0.2 @rxap/node-utilities@^1.2.0 @rxap/plugin-utilities@^16.4.0-dev.0 @rxap/ts-morph@^1.2.0-dev.0 @rxap/utilities@^16.2.0-dev.1 @rxap/workspace-utilities@^16.3.0-dev.1 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.2.0-dev.0",
|
|
3
3
|
"name": "@rxap/plugin-library",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -16,14 +16,14 @@
|
|
|
16
16
|
"@nx/devkit": "^16.10.0",
|
|
17
17
|
"@rxap/generator-ts-morph": "^1.0.2",
|
|
18
18
|
"@rxap/node-utilities": "^1.2.0",
|
|
19
|
-
"@rxap/plugin-utilities": "^16.
|
|
20
|
-
"@rxap/ts-morph": "^1.
|
|
21
|
-
"@rxap/utilities": "^16.
|
|
22
|
-
"@rxap/workspace-utilities": "^16.
|
|
19
|
+
"@rxap/plugin-utilities": "^16.4.0-dev.0",
|
|
20
|
+
"@rxap/ts-morph": "^1.2.0-dev.0",
|
|
21
|
+
"@rxap/utilities": "^16.2.0-dev.1",
|
|
22
|
+
"@rxap/workspace-utilities": "^16.3.0-dev.1",
|
|
23
23
|
"nx": "^16.10.0",
|
|
24
24
|
"ts-morph": "^18.0.0",
|
|
25
25
|
"tslib": "2.6.2",
|
|
26
|
-
"@rxap/workspace-ts-morph": "16.1.0"
|
|
26
|
+
"@rxap/workspace-ts-morph": "16.1.1-dev.0"
|
|
27
27
|
},
|
|
28
28
|
"author": {
|
|
29
29
|
"name": "Merzough Münker",
|
|
@@ -46,44 +46,36 @@
|
|
|
46
46
|
"nx-migrations": {
|
|
47
47
|
"packageGroup": [
|
|
48
48
|
{
|
|
49
|
-
"package": "@
|
|
50
|
-
"version": "
|
|
49
|
+
"package": "@nx/devkit",
|
|
50
|
+
"version": "16.10.0"
|
|
51
51
|
},
|
|
52
52
|
{
|
|
53
|
-
"package": "@rxap/generator-
|
|
54
|
-
"version": "1.
|
|
53
|
+
"package": "@rxap/generator-ts-morph",
|
|
54
|
+
"version": "1.0.2"
|
|
55
55
|
},
|
|
56
56
|
{
|
|
57
57
|
"package": "@rxap/node-utilities",
|
|
58
58
|
"version": "1.2.0"
|
|
59
59
|
},
|
|
60
|
-
{
|
|
61
|
-
"package": "@rxap/plugin-angular",
|
|
62
|
-
"version": "16.1.1-dev.1"
|
|
63
|
-
},
|
|
64
|
-
{
|
|
65
|
-
"package": "@rxap/plugin-nestjs",
|
|
66
|
-
"version": "16.2.0-dev.0"
|
|
67
|
-
},
|
|
68
60
|
{
|
|
69
61
|
"package": "@rxap/plugin-utilities",
|
|
70
|
-
"version": "16.
|
|
71
|
-
},
|
|
72
|
-
{
|
|
73
|
-
"package": "@rxap/schematics-utilities",
|
|
74
|
-
"version": "16.0.0-dev.4"
|
|
62
|
+
"version": "16.4.0-dev.0"
|
|
75
63
|
},
|
|
76
64
|
{
|
|
77
65
|
"package": "@rxap/ts-morph",
|
|
78
|
-
"version": "1.
|
|
66
|
+
"version": "1.2.0-dev.0"
|
|
79
67
|
},
|
|
80
68
|
{
|
|
81
69
|
"package": "@rxap/utilities",
|
|
70
|
+
"version": "16.2.0-dev.1"
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
"package": "@rxap/workspace-ts-morph",
|
|
82
74
|
"version": "16.1.0"
|
|
83
75
|
},
|
|
84
76
|
{
|
|
85
77
|
"package": "@rxap/workspace-utilities",
|
|
86
|
-
"version": "16.
|
|
78
|
+
"version": "16.3.0-dev.1"
|
|
87
79
|
}
|
|
88
80
|
]
|
|
89
81
|
},
|
|
@@ -98,6 +90,6 @@
|
|
|
98
90
|
},
|
|
99
91
|
"schematics": "./generators.json",
|
|
100
92
|
"type": "commonjs",
|
|
101
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "ca2e1999cd330fd3c1a07a2b2471a36567dab3e9",
|
|
102
94
|
"main": "./src/index.js"
|
|
103
95
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { UpdatePackageGroupExecutorSchema } from './schema';
|
|
2
1
|
import { ExecutorContext } from '@nx/devkit';
|
|
2
|
+
import { UpdatePackageGroupExecutorSchema } from './schema';
|
|
3
3
|
export default function runExecutor(options: UpdatePackageGroupExecutorSchema, context: ExecutorContext): Promise<{
|
|
4
4
|
success: boolean;
|
|
5
5
|
}>;
|
|
@@ -1,22 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const package_json_1 = require("nx/src/utils/package-json");
|
|
5
4
|
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
return
|
|
9
|
-
|
|
5
|
+
const package_json_1 = require("nx/src/utils/package-json");
|
|
6
|
+
function normalizePackageVersion(version) {
|
|
7
|
+
return version.replace(/[\^~>=<]/g, '');
|
|
8
|
+
}
|
|
9
|
+
function convertToPackageGroup(input, packageGroupRegex) {
|
|
10
|
+
return Object.entries(input)
|
|
11
|
+
.filter(([packageName]) => packageGroupRegex.some(regex => regex.test(packageName)))
|
|
10
12
|
.map(([packageName, version]) => ({
|
|
11
13
|
package: packageName,
|
|
12
|
-
version: version,
|
|
14
|
+
version: normalizePackageVersion(version),
|
|
13
15
|
}));
|
|
14
16
|
}
|
|
17
|
+
function getPackageGroupFromDependencies(context, packageGroupRegex) {
|
|
18
|
+
const directPackageDependencies = (0, plugin_utilities_1.GetAllPackageDependenciesForProject)(context);
|
|
19
|
+
return convertToPackageGroup(directPackageDependencies, packageGroupRegex);
|
|
20
|
+
}
|
|
21
|
+
function getPackageGroupFromPeerDependencies(context, packageGroupRegex) {
|
|
22
|
+
var _a;
|
|
23
|
+
const peerDependencies = (_a = (0, plugin_utilities_1.readPackageJsonForProject)(context).peerDependencies) !== null && _a !== void 0 ? _a : {};
|
|
24
|
+
return convertToPackageGroup(peerDependencies, packageGroupRegex);
|
|
25
|
+
}
|
|
26
|
+
function getPackageGroup(context, packageGroupRegex) {
|
|
27
|
+
return mergePackageGroup(getPackageGroupFromPeerDependencies(context, packageGroupRegex), getPackageGroupFromDependencies(context, packageGroupRegex));
|
|
28
|
+
}
|
|
15
29
|
function mergePackageGroup(original, updated) {
|
|
16
30
|
const normalized = (0, package_json_1.normalizePackageGroup)(original);
|
|
17
31
|
return [...updated, ...normalized].filter((item, index, array) => {
|
|
18
32
|
return array.findIndex(({ package: packageName }) => packageName === item.package) === index;
|
|
19
|
-
})
|
|
33
|
+
});
|
|
20
34
|
}
|
|
21
35
|
function runExecutor(options, context) {
|
|
22
36
|
var _a, _b;
|
|
@@ -33,8 +47,17 @@ function runExecutor(options, context) {
|
|
|
33
47
|
console.error('INTERNAL: The nx-migrations property in the package.json is not an object');
|
|
34
48
|
return { success: false };
|
|
35
49
|
}
|
|
50
|
+
const packageGroupRegex = options.packageGroupRegex.map(regex => new RegExp(regex));
|
|
51
|
+
console.log(`Update package group for project ${context.projectName} with the following package group regex:`, packageGroupRegex.map(regex => regex.toString()));
|
|
52
|
+
(0, plugin_utilities_1.LoadProjectToPackageMapping)(context);
|
|
53
|
+
let packageGroup = getPackageGroup(context, packageGroupRegex);
|
|
36
54
|
(_b = nxMigrations.packageGroup) !== null && _b !== void 0 ? _b : (nxMigrations.packageGroup = []);
|
|
37
|
-
|
|
55
|
+
if (options.merge) {
|
|
56
|
+
console.log('Merge the package group');
|
|
57
|
+
packageGroup = mergePackageGroup(nxMigrations.packageGroup, packageGroup);
|
|
58
|
+
}
|
|
59
|
+
console.log('set the package group', JSON.stringify(packageGroup, undefined, 2));
|
|
60
|
+
nxMigrations.packageGroup = packageGroup;
|
|
38
61
|
(0, plugin_utilities_1.writePackageJsonFormProject)(context, packageJson);
|
|
39
62
|
return {
|
|
40
63
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,24 @@
|
|
|
4
4
|
"title": "UpdatePackageGroup executor",
|
|
5
5
|
"description": "",
|
|
6
6
|
"type": "object",
|
|
7
|
-
"properties": {
|
|
7
|
+
"properties": {
|
|
8
|
+
"packageGroupRegex": {
|
|
9
|
+
"type": "array",
|
|
10
|
+
"items": {
|
|
11
|
+
"type": "string"
|
|
12
|
+
},
|
|
13
|
+
"default": [
|
|
14
|
+
"@rxap\/",
|
|
15
|
+
"@angular\/",
|
|
16
|
+
"@nx\/"
|
|
17
|
+
],
|
|
18
|
+
"description": "List of regexes to match package name that should be added to the package group"
|
|
19
|
+
},
|
|
20
|
+
"merge": {
|
|
21
|
+
"type": "boolean",
|
|
22
|
+
"default": false,
|
|
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
|
+
},
|
|
8
26
|
"required": []
|
|
9
27
|
}
|