@rxap/plugin-nestjs 16.1.0-dev.36 → 16.1.0-dev.37
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
CHANGED
|
@@ -3,6 +3,13 @@
|
|
|
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.1.0-dev.37](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.1.0-dev.36...@rxap/plugin-nestjs@16.1.0-dev.37) (2023-10-02)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- set correct default publishable library package json version ([32c032d](https://gitlab.com/rxap/packages/commit/32c032dd47552dc53f5adbc39af0ef2a074beea6))
|
|
11
|
+
- use function CoerceNxJsonCacheableOperation ([14f26b0](https://gitlab.com/rxap/packages/commit/14f26b0d679f5d1208a23ae20d6d9f6f4516a60d))
|
|
12
|
+
|
|
6
13
|
# [16.1.0-dev.36](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.1.0-dev.35...@rxap/plugin-nestjs@16.1.0-dev.36) (2023-10-02)
|
|
7
14
|
|
|
8
15
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.37",
|
|
3
3
|
"name": "@rxap/plugin-nestjs",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
},
|
|
82
82
|
"schematics": "./generators.json",
|
|
83
83
|
"type": "commonjs",
|
|
84
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "2a35463ea23db61495357c2484e3558c93700890",
|
|
85
85
|
"main": "./src/index.js",
|
|
86
86
|
"types": "./src/index.d.ts"
|
|
87
87
|
}
|
|
@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
7
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
|
+
const path_1 = require("path");
|
|
9
|
+
const semver_1 = require("semver");
|
|
8
10
|
const skip_non_nest_project_1 = require("../../lib/skip-non-nest-project");
|
|
9
11
|
function skipProject(tree, options, project, projectName) {
|
|
10
12
|
if ((0, skip_non_nest_project_1.SkipNonNestProject)(tree, options, project, projectName)) {
|
|
@@ -30,10 +32,33 @@ function updateProjectTargets(tree, project) {
|
|
|
30
32
|
});
|
|
31
33
|
}
|
|
32
34
|
}
|
|
35
|
+
function getNestMajorVersion(rootPackageJson) {
|
|
36
|
+
var _a;
|
|
37
|
+
let targetVersion = (_a = rootPackageJson.dependencies['@nestjs/core']) !== null && _a !== void 0 ? _a : rootPackageJson.devDependencies['@nestjs/cli'];
|
|
38
|
+
if (!targetVersion) {
|
|
39
|
+
console.error(`The package @nestjs/core and @nestjs/cli are not installed in the root package.json`);
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
targetVersion = targetVersion.replace(/^[~^]/, '');
|
|
43
|
+
const version = (0, semver_1.parse)(targetVersion);
|
|
44
|
+
return `${version.major}.0.0`;
|
|
45
|
+
}
|
|
46
|
+
function updatePackageJson(tree, project, rootPackageJson) {
|
|
47
|
+
var _a;
|
|
48
|
+
if ((0, generator_utilities_1.IsPublishable)(tree, project) && tree.exists((0, path_1.join)(project.root, 'package.json'))) {
|
|
49
|
+
const packageJson = (0, devkit_1.readJson)(tree, (0, path_1.join)(project.root, 'package.json'));
|
|
50
|
+
const version = (_a = getNestMajorVersion(rootPackageJson)) !== null && _a !== void 0 ? _a : packageJson.version;
|
|
51
|
+
if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
|
|
52
|
+
packageJson.version = version;
|
|
53
|
+
}
|
|
54
|
+
(0, devkit_1.writeJson)(tree, (0, path_1.join)(project.root, 'package.json'), packageJson);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
33
57
|
function initLibraryGenerator(tree, options) {
|
|
34
58
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
59
|
console.log('nestjs library init generator:', options);
|
|
36
60
|
setGeneralTargetDefaults(tree);
|
|
61
|
+
const rootPackageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
37
62
|
if (!options.skipProjects) {
|
|
38
63
|
for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
|
|
39
64
|
if (skipProject(tree, options, project, projectName)) {
|
|
@@ -41,6 +66,7 @@ function initLibraryGenerator(tree, options) {
|
|
|
41
66
|
}
|
|
42
67
|
console.log(`init project: ${projectName}`);
|
|
43
68
|
updateProjectTargets(tree, project);
|
|
69
|
+
updatePackageJson(tree, project, rootPackageJson);
|
|
44
70
|
// apply changes to the project configuration
|
|
45
71
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
|
46
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,22 +49,8 @@ function updateProjectTargets(project) {
|
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
51
|
function updateNxDefaults(tree) {
|
|
52
|
-
var _a, _b, _c, _d;
|
|
53
|
-
var _e, _f, _g;
|
|
54
52
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
55
|
-
(
|
|
56
|
-
(_b = (_e = nxJson.tasksRunnerOptions)['default']) !== null && _b !== void 0 ? _b : (_e['default'] = {
|
|
57
|
-
runner: 'nx-cloud',
|
|
58
|
-
options: {},
|
|
59
|
-
});
|
|
60
|
-
(_c = (_f = nxJson.tasksRunnerOptions['default']).options) !== null && _c !== void 0 ? _c : (_f.options = {});
|
|
61
|
-
(_d = (_g = nxJson.tasksRunnerOptions['default'].options)['cacheableOperations']) !== null && _d !== void 0 ? _d : (_g['cacheableOperations'] = []);
|
|
62
|
-
if (!nxJson.tasksRunnerOptions['default'].options['cacheableOperations'].includes('swagger-build')) {
|
|
63
|
-
nxJson.tasksRunnerOptions['default'].options['cacheableOperations'].push('swagger-build');
|
|
64
|
-
}
|
|
65
|
-
if (!nxJson.tasksRunnerOptions['default'].options['cacheableOperations'].includes('swagger-generate')) {
|
|
66
|
-
nxJson.tasksRunnerOptions['default'].options['cacheableOperations'].push('swagger-generate');
|
|
67
|
-
}
|
|
53
|
+
(0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'swagger-build', 'swagger-generate');
|
|
68
54
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
69
55
|
}
|
|
70
56
|
function swaggerGenerator(tree, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,mEAA2D;AAC3D,6DAGgC;AAChC,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":"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"}
|