Skip to content

Commit dd95f77

Browse files
committed
Merge remote-tracking branch 'upstream/master' into nestjs-v11-support
2 parents d3dedbf + 11a2df5 commit dd95f77

5 files changed

Lines changed: 4137 additions & 4693 deletions

File tree

apps/generator-cli/src/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,4 +283,3 @@ yarn add @openapitools/openapi-generator-cli@1.0.18-4.3.1
283283

284284
Please leave a star.
285285

286-

apps/generator-cli/src/app/services/version-manager.service.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,16 @@ export class VersionManagerService {
288288
}
289289

290290
versions : Version[] = [
291+
{
292+
version: '7.12.0',
293+
versionTags: [ '7.12.0', 'stable', 'latest' ],
294+
releaseDate: new Date("2025-02-28T06:24:58.285Z"),
295+
installed: false,
296+
downloadLink: 'https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.12.0/openapi-generator-cli-7.12.0.jar'
297+
},
291298
{
292299
version: '7.11.0',
293-
versionTags: [ '7.11.0', 'stable', 'latest' ],
300+
versionTags: [ '7.11.0', 'stable' ],
294301
releaseDate: new Date("2025-01-20T06:24:58.285Z"),
295302
installed: false,
296303
downloadLink: 'https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.11.0/openapi-generator-cli-7.11.0.jar'

apps/generator-cli/webpack.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ module.exports = composePlugins(
3434

3535
config.plugins.push(
3636
new BannerPlugin({ banner: '#!/usr/bin/env node', raw: true }),
37-
new GeneratePackageJsonPlugin(basePackageValues, {
38-
useInstalledVersions: true,
39-
})
37+
new GeneratePackageJsonPlugin(basePackageValues),
4038
);
4139

4240
return config;
43-
}
41+
},
4442
);

package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"compare-versions": "4.1.4",
9191
"concurrently": "6.5.1",
9292
"console.table": "0.10.0",
93-
"fs-extra": "10.1.0",
93+
"fs-extra": "11.3.0",
9494
"glob": "9.x",
9595
"inquirer": "8.2.6",
9696
"jsonpath": "1.1.1",
@@ -101,43 +101,43 @@
101101
"tslib": "^2.3.0"
102102
},
103103
"devDependencies": {
104-
"@commitlint/cli": "19.5.0",
105-
"@commitlint/config-conventional": "19.5.0",
104+
"@commitlint/cli": "19.8.0",
105+
"@commitlint/config-conventional": "19.8.0",
106106
"@nestjs/schematics": "^11.0.5",
107107
"@nestjs/testing": "^11.0.16",
108-
"@nx/eslint": "20.0.7",
109-
"@nx/eslint-plugin": "20.0.7",
110-
"@nx/jest": "20.0.7",
111-
"@nx/js": "20.0.7",
112-
"@nx/nest": "20.0.7",
113-
"@nx/node": "20.0.7",
114-
"@nx/webpack": "20.0.7",
115-
"@nx/workspace": "20.0.7",
108+
"@nx/eslint": "20.6.0",
109+
"@nx/eslint-plugin": "20.6.0",
110+
"@nx/jest": "20.6.0",
111+
"@nx/js": "20.6.0",
112+
"@nx/nest": "20.6.0",
113+
"@nx/node": "20.6.0",
114+
"@nx/webpack": "20.6.0",
115+
"@nx/workspace": "20.6.0",
116116
"@semantic-release/changelog": "6.0.3",
117117
"@types/concurrently": "7.0.3",
118-
"@types/fs-extra": "9.0.13",
118+
"@types/fs-extra": "11.0.4",
119119
"@types/inquirer": "8.2.10",
120120
"@types/jest": "29.5.14",
121121
"@types/jsonpath": "0.2.4",
122-
"@types/lodash": "4.17.14",
123-
"@types/node": "18.19.71",
122+
"@types/lodash": "4.17.16",
123+
"@types/node": "18.19.80",
124124
"@typescript-eslint/eslint-plugin": "7.18.0",
125125
"@typescript-eslint/parser": "7.18.0",
126126
"dotenv": "16.4.7",
127-
"eslint": "9.14.0",
128-
"eslint-config-prettier": "^9.0.0",
127+
"eslint": "9.22.0",
128+
"eslint-config-prettier": "^10.0.0",
129129
"generate-package-json-webpack-plugin": "2.6.0",
130130
"husky": "9.1.7",
131131
"jest": "29.7.0",
132132
"jest-environment-jsdom": "29.7.0",
133133
"jest-environment-node": "^29.4.1",
134-
"nx": "20.0.7",
135-
"prettier": "3.3.3",
134+
"nx": "20.6.0",
135+
"prettier": "3.5.3",
136136
"semantic-release": "22.0.12",
137-
"ts-jest": "29.2.5",
137+
"ts-jest": "29.2.6",
138138
"ts-node": "10.9.2",
139139
"tslint": "6.1.3",
140-
"type-fest": "4.26.1",
141-
"typescript": "5.5.4"
140+
"type-fest": "4.37.0",
141+
"typescript": "5.8.2"
142142
}
143143
}

0 commit comments

Comments
 (0)