@rxap/plugin-library 17.0.1-dev.0 → 17.0.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.
- package/CHANGELOG.md +6 -0
- package/README.md +1 -1
- package/package.json +15 -15
- package/src/executors/check-version/executor.js +2 -2
- package/src/executors/check-version/executor.js.map +1 -1
- package/src/executors/readme/executor.js +17 -15
- package/src/executors/readme/executor.js.map +1 -1
- package/src/executors/update-dependencies/executor.js +16 -14
- package/src/executors/update-dependencies/executor.js.map +1 -1
- package/src/executors/update-package-group/executor.js +14 -8
- package/src/executors/update-package-group/executor.js.map +1 -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
|
+
## [17.0.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@17.0.1-dev.0...@rxap/plugin-library@17.0.1) (2024-05-29)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- support async package json reading ([6b8a163](https://gitlab.com/rxap/packages/commit/6b8a16323b25108a81291ccf976ee7c2aaedacc3))
|
|
11
|
+
|
|
6
12
|
## [17.0.1-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.3.1...@rxap/plugin-library@17.0.1-dev.0) (2024-05-29)
|
|
7
13
|
|
|
8
14
|
### Bug Fixes
|
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@^17.3.2 @rxap/generator-ts-morph@^1.0.5
|
|
22
|
+
yarn add @nx/devkit@^17.3.2 @rxap/generator-ts-morph@^1.0.5 @rxap/node-utilities@^1.2.2 @rxap/plugin-utilities@^17.0.1 @rxap/ts-morph@^1.2.2 @rxap/utilities@^16.2.2 @rxap/workspace-utilities@^16.3.2 nx@^17.3.2 ts-morph@^18.0.0
|
|
23
23
|
```
|
|
24
24
|
**Execute the init generator:**
|
|
25
25
|
```bash
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "17.0.1
|
|
2
|
+
"version": "17.0.1",
|
|
3
3
|
"name": "@rxap/plugin-library",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -11,12 +11,12 @@
|
|
|
11
11
|
},
|
|
12
12
|
"peerDependencies": {
|
|
13
13
|
"@nx/devkit": "^17.3.2",
|
|
14
|
-
"@rxap/generator-ts-morph": "^1.0.5
|
|
15
|
-
"@rxap/node-utilities": "^1.2.2
|
|
16
|
-
"@rxap/plugin-utilities": "^17.0.1
|
|
17
|
-
"@rxap/ts-morph": "^1.2.2
|
|
18
|
-
"@rxap/utilities": "^16.2.2
|
|
19
|
-
"@rxap/workspace-utilities": "^16.3.2
|
|
14
|
+
"@rxap/generator-ts-morph": "^1.0.5",
|
|
15
|
+
"@rxap/node-utilities": "^1.2.2",
|
|
16
|
+
"@rxap/plugin-utilities": "^17.0.1",
|
|
17
|
+
"@rxap/ts-morph": "^1.2.2",
|
|
18
|
+
"@rxap/utilities": "^16.2.2",
|
|
19
|
+
"@rxap/workspace-utilities": "^16.3.2",
|
|
20
20
|
"nx": "^17.3.2",
|
|
21
21
|
"ts-morph": "^18.0.0"
|
|
22
22
|
},
|
|
@@ -46,31 +46,31 @@
|
|
|
46
46
|
},
|
|
47
47
|
{
|
|
48
48
|
"package": "@rxap/generator-ts-morph",
|
|
49
|
-
"version": "1.0.5
|
|
49
|
+
"version": "1.0.5"
|
|
50
50
|
},
|
|
51
51
|
{
|
|
52
52
|
"package": "@rxap/node-utilities",
|
|
53
|
-
"version": "1.2.2
|
|
53
|
+
"version": "1.2.2"
|
|
54
54
|
},
|
|
55
55
|
{
|
|
56
56
|
"package": "@rxap/plugin-utilities",
|
|
57
|
-
"version": "17.0.1
|
|
57
|
+
"version": "17.0.1"
|
|
58
58
|
},
|
|
59
59
|
{
|
|
60
60
|
"package": "@rxap/ts-morph",
|
|
61
|
-
"version": "1.2.2
|
|
61
|
+
"version": "1.2.2"
|
|
62
62
|
},
|
|
63
63
|
{
|
|
64
64
|
"package": "@rxap/utilities",
|
|
65
|
-
"version": "16.2.2
|
|
65
|
+
"version": "16.2.2"
|
|
66
66
|
},
|
|
67
67
|
{
|
|
68
68
|
"package": "@rxap/workspace-ts-morph",
|
|
69
|
-
"version": "16.1.3
|
|
69
|
+
"version": "16.1.3"
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
72
|
"package": "@rxap/workspace-utilities",
|
|
73
|
-
"version": "16.3.2
|
|
73
|
+
"version": "16.3.2"
|
|
74
74
|
}
|
|
75
75
|
]
|
|
76
76
|
},
|
|
@@ -85,6 +85,6 @@
|
|
|
85
85
|
},
|
|
86
86
|
"schematics": "./generators.json",
|
|
87
87
|
"type": "commonjs",
|
|
88
|
-
"gitHead": "
|
|
88
|
+
"gitHead": "5fbe2959907b2f431b9bb9309415df831b8ff520",
|
|
89
89
|
"main": "./src/index.js"
|
|
90
90
|
}
|
|
@@ -7,8 +7,8 @@ function runExecutor(options, context) {
|
|
|
7
7
|
var _a, _b, _c;
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
9
|
console.log('Executor ran for CheckVersion', options);
|
|
10
|
-
const projectJson = (0, plugin_utilities_1.
|
|
11
|
-
const rootPackageJson = (0, plugin_utilities_1.
|
|
10
|
+
const projectJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
11
|
+
const rootPackageJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context, 'workspace');
|
|
12
12
|
let targetVersion = (_b = (_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[options.packageName]) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.dependencies) === null || _c === void 0 ? void 0 : _c[options.packageName];
|
|
13
13
|
if (!targetVersion) {
|
|
14
14
|
console.error(`The package ${options.packageName} is not installed in the root package.json`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/check-version/executor.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/check-version/executor.ts"],"names":[],"mappings":";;;AACA,6DAGgC;AAChC,mCAGgB;AAGhB,SAA8B,WAAW,CACvC,OAAmC,EACnC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,MAAM,IAAA,qDAAkC,EAAC,OAAO,CAAC,CAAC;QACtE,MAAM,eAAe,GAAG,MAAM,IAAA,qDAAkC,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAEvF,IAAI,aAAa,GAAG,MAAA,MAAA,eAAe,CAAC,eAAe,0CAAG,OAAO,CAAC,WAAW,CAAC,mCACxE,MAAA,eAAe,CAAC,YAAY,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAEtD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,CAAC,eAAgB,OAAO,CAAC,WAAY,4CAA4C,CAAC,CAAC;YAChG,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;QACJ,CAAC;QAED,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEnD,OAAO,CAAC,GAAG,CAAC,YAAa,OAAO,CAAC,WAAY,cAAe,aAAc,EAAE,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,oBAAqB,WAAW,CAAC,OAAQ,EAAE,CAAC,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC;QAErC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,wBAAyB,aAAc,EAAE,CAAC,CAAC;YACzD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,KAAM,OAAO,CAAC,KAAM,EAAE,CAAC;QAE5C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACpD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,IAAA,kBAAS,EAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAAC;YAChD,OAAO,CAAC,KAAK,CAAC,wBAAyB,WAAW,CAAC,OAAQ,iBAAkB,iBAAkB,iCAAkC,OAAO,CAAC,WAAY,cAAe,aAAc,qBAAsB,YAAa,GAAG,CAAC,CAAC;YAC1N,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;gBAClC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBACjD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC3B,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA1DD,8BA0DC"}
|
|
@@ -59,7 +59,7 @@ function normalizeSchema(context, schema, basePath) {
|
|
|
59
59
|
function getSchematics(context) {
|
|
60
60
|
var _a;
|
|
61
61
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
62
|
-
const { schematics } = (0, plugin_utilities_1.
|
|
62
|
+
const { schematics } = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
63
63
|
if (!schematics) {
|
|
64
64
|
return [];
|
|
65
65
|
}
|
|
@@ -79,7 +79,7 @@ function getSchematics(context) {
|
|
|
79
79
|
function getGenerators(context) {
|
|
80
80
|
var _a;
|
|
81
81
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
82
|
-
const { generators } = (0, plugin_utilities_1.
|
|
82
|
+
const { generators } = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
83
83
|
if (!generators) {
|
|
84
84
|
return [];
|
|
85
85
|
}
|
|
@@ -100,7 +100,7 @@ function getGenerators(context) {
|
|
|
100
100
|
function getBuilders(context) {
|
|
101
101
|
var _a;
|
|
102
102
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
103
|
-
const { builders } = (0, plugin_utilities_1.
|
|
103
|
+
const { builders } = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
104
104
|
if (!builders) {
|
|
105
105
|
return [];
|
|
106
106
|
}
|
|
@@ -120,7 +120,7 @@ function getBuilders(context) {
|
|
|
120
120
|
function getExecutors(context) {
|
|
121
121
|
var _a;
|
|
122
122
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
123
|
-
const { executors } = (0, plugin_utilities_1.
|
|
123
|
+
const { executors } = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
124
124
|
if (!executors) {
|
|
125
125
|
return [];
|
|
126
126
|
}
|
|
@@ -140,15 +140,17 @@ function getExecutors(context) {
|
|
|
140
140
|
}
|
|
141
141
|
function getPeerDependencyList(context) {
|
|
142
142
|
var _a;
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
143
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
144
|
+
const packageJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
145
|
+
const peerDependencyList = [];
|
|
146
|
+
for (const [packageName, version] of Object.entries((_a = packageJson.peerDependencies) !== null && _a !== void 0 ? _a : {})) {
|
|
147
|
+
peerDependencyList.push({
|
|
148
|
+
name: packageName,
|
|
149
|
+
version,
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
return peerDependencyList;
|
|
153
|
+
});
|
|
152
154
|
}
|
|
153
155
|
Handlebars.registerHelper('hasProperties', function (record, options) {
|
|
154
156
|
if (Object.keys(record).length > 0) {
|
|
@@ -159,11 +161,11 @@ function runExecutor(options, context) {
|
|
|
159
161
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
160
162
|
const getStartedContent = readGetStartedFile(context);
|
|
161
163
|
const guidesContent = readGetGuidsFile(context);
|
|
162
|
-
const packageJson = (0, plugin_utilities_1.
|
|
164
|
+
const packageJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
163
165
|
const template = getTemplate(context);
|
|
164
166
|
const generatorList = yield getGenerators(context);
|
|
165
167
|
const executorsList = yield getExecutors(context);
|
|
166
|
-
const peerDependencyList = getPeerDependencyList(context);
|
|
168
|
+
const peerDependencyList = yield getPeerDependencyList(context);
|
|
167
169
|
console.log('Input for README.md template ready');
|
|
168
170
|
let readme;
|
|
169
171
|
const templateContext = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/readme/executor.ts"],"names":[],"mappings":";;;AAAA,yGAA6D;AAC7D,uCAGoB;AACpB,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/readme/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,25 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
5
5
|
function replaceVersionWithCurrentVersion(dependencies = {}, context) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
6
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
const directPackageDependencies = yield (0, plugin_utilities_1.getDirectPackageDependenciesForProjectWihRetry)(context);
|
|
8
|
+
for (const [packageName] of Object.entries(dependencies)) {
|
|
9
|
+
console.log(`Check if ${packageName} is a direct dependency`);
|
|
10
|
+
if (directPackageDependencies[packageName]) {
|
|
11
|
+
dependencies[packageName] = '^' + directPackageDependencies[packageName];
|
|
12
|
+
console.log(`Updated the version of ${packageName} to ${directPackageDependencies[packageName]}`);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
console.log(`Skip ${packageName} because it is not a direct dependency`);
|
|
16
|
+
}
|
|
15
17
|
}
|
|
16
|
-
}
|
|
18
|
+
});
|
|
17
19
|
}
|
|
18
20
|
function runExecutor(options, context) {
|
|
19
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
|
-
const packageJson = (0, plugin_utilities_1.
|
|
22
|
+
const packageJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
21
23
|
const { dependencies, peerDependencies, optionalDependencies, } = packageJson;
|
|
22
|
-
replaceVersionWithCurrentVersion(dependencies, context);
|
|
23
|
-
replaceVersionWithCurrentVersion(peerDependencies, context);
|
|
24
|
-
replaceVersionWithCurrentVersion(optionalDependencies, context);
|
|
24
|
+
yield replaceVersionWithCurrentVersion(dependencies, context);
|
|
25
|
+
yield replaceVersionWithCurrentVersion(peerDependencies, context);
|
|
26
|
+
yield replaceVersionWithCurrentVersion(optionalDependencies, context);
|
|
25
27
|
(0, plugin_utilities_1.writePackageJsonFormProject)(context, packageJson);
|
|
26
28
|
return {
|
|
27
29
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-dependencies/executor.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-dependencies/executor.ts"],"names":[],"mappings":";;;AAEA,6DAMgC;AAGhC,SAAe,gCAAgC,CAC7C,eAAuC,EAAE,EACzC,OAAwB;;QAGxB,MAAM,yBAAyB,GAAG,MAAM,IAAA,iEAA8C,EAAC,OAAO,CAAC,CAAC;QAEhG,KAAK,MAAM,CAAE,WAAW,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,YAAa,WAAY,yBAAyB,CAAC,CAAC;YAChE,IAAI,yBAAyB,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3C,YAAY,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC;gBACzE,OAAO,CAAC,GAAG,CAAC,0BAA2B,WAAY,OAAQ,yBAAyB,CAAC,WAAW,CAAE,EAAE,CAAC,CAAC;YACxG,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,QAAS,WAAY,wCAAwC,CAAC,CAAC;YAC7E,CAAC;QACH,CAAC;IAEH,CAAC;CAAA;AAED,SAA8B,WAAW,CACvC,OAAyC,EACzC,OAAwB;;QAExB,MAAM,WAAW,GAAG,MAAM,IAAA,qDAAkC,EAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,EACJ,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,GACrB,GAAG,WAAW,CAAC;QAEhB,MAAM,gCAAgC,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,gCAAgC,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,gCAAgC,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QAEtE,IAAA,8CAA2B,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAElD,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AArBD,8BAqBC"}
|
|
@@ -17,13 +17,17 @@ function convertToPackageGroup(input, packageGroupRegex) {
|
|
|
17
17
|
}));
|
|
18
18
|
}
|
|
19
19
|
function getPackageGroupFromDependencies(context, packageGroupRegex) {
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
const directPackageDependencies = yield (0, plugin_utilities_1.GetAllPackageDependenciesForProjectWihRetry)(context);
|
|
22
|
+
return convertToPackageGroup(directPackageDependencies, packageGroupRegex);
|
|
23
|
+
});
|
|
22
24
|
}
|
|
23
25
|
function getPackageGroupFromPeerDependencies(context, packageGroupRegex) {
|
|
24
26
|
var _a;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
const peerDependencies = (_a = (yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context)).peerDependencies) !== null && _a !== void 0 ? _a : {};
|
|
29
|
+
return convertToPackageGroup(peerDependencies, packageGroupRegex);
|
|
30
|
+
});
|
|
27
31
|
}
|
|
28
32
|
function getPackageGroupFromRootDependencies(context, include) {
|
|
29
33
|
if (include.length === 0) {
|
|
@@ -38,7 +42,9 @@ function getPackageGroupFromRootDependencies(context, include) {
|
|
|
38
42
|
return convertToPackageGroup(includes, [/.*/]);
|
|
39
43
|
}
|
|
40
44
|
function getPackageGroup(context, packageGroupRegex, include = []) {
|
|
41
|
-
return
|
|
45
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
return mergePackageGroup(mergePackageGroup(yield getPackageGroupFromPeerDependencies(context, packageGroupRegex), yield getPackageGroupFromDependencies(context, packageGroupRegex)), getPackageGroupFromRootDependencies(context, include));
|
|
47
|
+
});
|
|
42
48
|
}
|
|
43
49
|
function mergePackageGroup(original, updated) {
|
|
44
50
|
const normalized = (0, package_json_1.normalizePackageGroup)(original);
|
|
@@ -50,7 +56,7 @@ function runExecutor(options, context) {
|
|
|
50
56
|
var _a, _b;
|
|
51
57
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
52
58
|
console.log('Executor ran for update-package-group', options);
|
|
53
|
-
const packageJson = (0, plugin_utilities_1.
|
|
59
|
+
const packageJson = yield (0, plugin_utilities_1.readPackageJsonForProjectWithRetry)(context);
|
|
54
60
|
// ensure the property "ng-migrations" exists
|
|
55
61
|
(_a = packageJson['nx-migrations']) !== null && _a !== void 0 ? _a : (packageJson['nx-migrations'] = {});
|
|
56
62
|
const { 'nx-migrations': nxMigrations } = packageJson;
|
|
@@ -64,8 +70,8 @@ function runExecutor(options, context) {
|
|
|
64
70
|
}
|
|
65
71
|
const packageGroupRegex = options.packageGroupRegex.map(regex => new RegExp(regex));
|
|
66
72
|
console.log(`Update package group for project ${context.projectName} with the following package group regex:`, packageGroupRegex.map(regex => regex.toString()));
|
|
67
|
-
(0, plugin_utilities_1.
|
|
68
|
-
let packageGroup = getPackageGroup(context, packageGroupRegex, options.include);
|
|
73
|
+
yield (0, plugin_utilities_1.LoadProjectToPackageMappingWithRetry)(context);
|
|
74
|
+
let packageGroup = yield getPackageGroup(context, packageGroupRegex, options.include);
|
|
69
75
|
(_b = nxMigrations.packageGroup) !== null && _b !== void 0 ? _b : (nxMigrations.packageGroup = []);
|
|
70
76
|
if (options.merge) {
|
|
71
77
|
console.log('Merge the package group');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":"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"}
|