Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into rc
Browse files Browse the repository at this point in the history
# Conflicts:
#	lerna.json
#	package.json
#	packages/barrels/package.json
#	packages/cli-core/package.json
#	packages/cli-generate-http-client/package.json
#	packages/cli-generate-swagger/package.json
#	packages/cli-plugin-eslint/package.json
#	packages/cli-plugin-jest/package.json
#	packages/cli-plugin-mongoose/package.json
#	packages/cli-plugin-oidc-provider/package.json
#	packages/cli-plugin-passport/package.json
#	packages/cli-plugin-prisma/package.json
#	packages/cli-plugin-typegraphql/package.json
#	packages/cli-plugin-typeorm/package.json
#	packages/cli-plugin-vitest/package.json
#	packages/cli-testing/package.json
#	packages/cli/package.json
#	tools/typescript/package.json
#	tools/vitest/package.json
  • Loading branch information
Romakita committed Jan 24, 2025
2 parents 89e7b9f + 4969bbe commit eb823b2
Show file tree
Hide file tree
Showing 19 changed files with 21 additions and 23 deletions.
8 changes: 3 additions & 5 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"npmClient": "yarn",
"packages": [
"packages/*"
],
"version": "6.1.10-rc.2"
}
"packages": ["packages/*"],
"version": "6.1.10"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tsed/cli-root",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"description": "CLI to bootstrap your Ts.ED project",
"private": true,
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/barrels/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/barrels",
"description": "A simple tool to generate barrels for your TypeScript project",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"bin": "bin/barrels.js",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-core",
"description": "Build your CLI with TypeScript and Decorators",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-generate-http-client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-generate-http-client",
"description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-generate-swagger/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-generate-swagger",
"description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-eslint",
"description": "Ts.ED CLI plugin. Add EsLint support",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-jest/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-jest",
"description": "Ts.ED CLI plugin. Add Jest support",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-mongoose/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-mongoose",
"description": "Ts.ED CLI plugin. Add Mongoose support",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-oidc-provider/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-oidc-provider",
"description": "Ts.ED CLI plugin. Add OIDC Provider",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-passport/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-passport",
"description": "Ts.ED CLI plugin. Add Passport.js support",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-prisma/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-prisma",
"description": "Ts.ED CLI plugin. Add Prisma project initialisation support.",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-typegraphql/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-typegraphql",
"description": "Ts.ED CLI plugin. Add TypeGraphql support.",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-typeorm/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-typeorm",
"description": "Ts.ED CLI plugin. Add TypeORM support",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-vitest/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-plugin-vitest",
"description": "Ts.ED CLI plugin. Add Jest support",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-testing/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli-testing",
"description": "Utils to test you CLI based on Ts.ED CLI",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/cli",
"description": "CLI to bootstrap your Ts.ED project",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"type": "module",
"main": "./lib/esm/index.js",
"source": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion tools/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tsed/typescript",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"description": "Util to compile source",
"type": "module",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion tools/vitest/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tsed/vitest",
"type": "module",
"version": "6.1.10-rc.2",
"version": "6.1.10",
"private": true,
"exports": {
".": "./index.js",
Expand Down

0 comments on commit eb823b2

Please sign in to comment.