Skip to content

Commit

Permalink
Revert/dependencies changes (#1769)
Browse files Browse the repository at this point in the history 
* fix: revert package dependencies

* fix: revert package dependencies
  • Loading branch information
@Romakita
Romakita authored Feb 18, 2022
1 parent b5a666c commit ffe9ecf
Show file tree
Hide file tree
Showing 38 changed files with 207 additions and 49 deletions.
6 changes: 4 additions & 2 deletions packages/di/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@
"build:esm": "tsc --build tsconfig.compile.esm.json"
},
"dependencies": {
"@tsed/core": "6.102.4",
"@tsed/schema": "6.102.4",
"tslib": "2.2.0"
},
"devDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/schema": "6.102.4",
"@tsed/logger": ">=6.0.2"
},
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/schema": "^6.102.4",
"@tsed/logger": ">=6.0.2"
}
}
14 changes: 10 additions & 4 deletions packages/platform/common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
"dependencies": {
"@tsed/components-scan": "6.102.4",
"@tsed/core": "6.102.4",
"@tsed/di": "6.102.4",
"@tsed/exceptions": "6.102.4",
"@tsed/json-mapper": "6.102.4",
"@tsed/logger": ">=6.0.2",
"@tsed/logger-file": "^6.0.0",
"@tsed/logger-file": ">=6.0.2",
"@tsed/perf": "6.102.4",
"@tsed/platform-cache": "6.102.4",
"@tsed/platform-exceptions": "6.102.4",
"@tsed/platform-log-middleware": "6.102.4",
Expand All @@ -85,6 +85,12 @@
"tslib": "2.2.0",
"uuid": "8.3.2"
},
"devDependencies": {},
"peerDependencies": {}
"devDependencies": {
"@tsed/core": "6.102.4"
},
"peerDependencies": {
"@tsed/logger": ">=6.0.2",
"@tsed/logger-file": ">=6.0.2",
"@tsed/di": "^6.102.4"
}
}
2 changes: 1 addition & 1 deletion packages/platform/common/src/builder/PlatformBuilder.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {nameOf, Type} from "@tsed/core";
import {colors, createContainer, InjectorService, IProvider, ProviderScope, setLoggerLevel} from "@tsed/di";
import {importProviders} from "@tsed/components-scan";
import {getMiddlewaresForHook} from "@tsed/platform-middlewares";
import {GlobalAcceptMimesMiddleware} from "../middlewares";
import {Platform} from "../services/Platform";
Expand All @@ -12,6 +11,7 @@ import {Route} from "../interfaces/Route";
import {getConfiguration} from "../utils/getConfiguration";
import {IncomingMessage, ServerResponse} from "http";
import {PlatformAdapter, PlatformBuilderSettings} from "../interfaces/PlatformAdapter";
import {importProviders} from "../utils/importProviders";

/**
* @platform
Expand Down
3 changes: 3 additions & 0 deletions packages/platform/common/src/utils/data/Test1.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const value1 = "value";

export class Test1 {}
3 changes: 3 additions & 0 deletions packages/platform/common/src/utils/data/Test2.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const value2 = "value";

export class Test2 {}
3 changes: 2 additions & 1 deletion ...mponents-scan/src/importProviders.spec.ts → .../common/src/utils/importProviders.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Injectable, Module} from "@tsed/di";
import {expect} from "chai";
import {importProviders} from "./importProviders";

@Injectable({path: "/test"})
Expand Down Expand Up @@ -26,7 +27,7 @@ describe("importProviders", () => {
["imports", "mount"]
);

expect(result).toEqual([
expect(result).to.deep.eq([
{
route: "/heath",
token: Test2Ctrl
Expand Down
2 changes: 1 addition & 1 deletion ...ls/components-scan/src/importProviders.ts → ...tform/common/src/utils/importProviders.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {GlobalProviders, Provider, ProviderType} from "@tsed/di";
import {importComponents} from "./importComponents";
import {importComponents} from "@tsed/components-scan";

async function recursiveImports(providers: {token: string; route?: string}[], settings: Partial<TsED.Configuration>, properties: string[]) {
const {exclude = []} = settings;
Expand Down
1 change: 1 addition & 0 deletions packages/platform/common/src/utils/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ export * from "./printRoutes";
export * from "./listenServer";
export * from "./createContext";
export * from "./useCtxHandler";
export * from "./importProviders";
3 changes: 3 additions & 0 deletions packages/platform/platform-aws/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
"tslib": "2.2.0"
},
"peerDependencies": {
"@tsed/common": "^6.102.4",
"@tsed/core": "^6.102.4",
"@tsed/schema": "^6.102.4",
"aws-serverless-express": "^3.4.0"
},
"publishConfig": {
Expand Down
8 changes: 6 additions & 2 deletions packages/platform/platform-cache/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@
"devDependencies": {
"@tsed/core": "6.102.4",
"@tsed/di": "6.102.4",
"@tsed/exceptions": "6.102.4",
"@tsed/json-mapper": "6.102.4",
"@tsed/schema": "6.102.4",
"@types/cache-manager": "^3.4.2",
"@types/micromatch": "^4.0.1"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/schema": "^6.102.4"
}
}
7 changes: 6 additions & 1 deletion packages/platform/platform-exceptions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,10 @@
"@tsed/exceptions": "6.102.4",
"@tsed/schema": "6.102.4"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/exceptions": "^6.102.4",
"@tsed/schema": "^6.102.4"
}
}
18 changes: 16 additions & 2 deletions packages/platform/platform-express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"@tsed/core": "6.102.4",
"@tsed/di": "6.102.4",
"@tsed/platform-test-utils": "6.102.4",
"@tsed/platform-views": "^6.102.4",
"@types/body-parser": "1.19.0",
"@types/compression": "1.7.0",
"@types/cookie-parser": "1.4.2",
Expand All @@ -78,7 +79,20 @@
"method-override": "3.0.0"
},
"peerDependencies": {
"@types/multer": ">=1.4.5",
"body-parser": ">=1.19.0"
"@tsed/common": "^6.102.4",
"@tsed/platform-views": "^6.102.4",
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/logger": ">=6.0.2",
"@tsed/openspec": "^6.102.4",
"@tsed/schema": "^6.102.4",
"@types/multer": "^1.4.5",
"body-parser": "1.19.0"
},
"peerDependenciesMeta": {
"@tsed/platform-views": {
"optional": true
}
}
}
7 changes: 7 additions & 0 deletions packages/platform/platform-koa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@
"tslib": "2.2.0"
},
"peerDependencies": {
"@tsed/common": "^6.102.4",
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/logger": ">=6.0.2",
"@tsed/openspec": "^6.102.4",
"@tsed/schema": "^6.102.4",
"koa": ">=2.13.0",
"koa-bodyparser": ">=4.3.0",
"koa-compress": ">=5.0.1",
Expand Down
7 changes: 5 additions & 2 deletions packages/platform/platform-log-middleware/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@
"tslib": "2.2.0"
},
"devDependencies": {
"@tsed/core": "6.102.4",
"@tsed/di": "6.102.4",
"@tsed/platform-middlewares": "6.102.4",
"@tsed/platform-params": "6.102.4"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/di": "^6.102.4",
"@tsed/platform-middlewares": "^6.102.4",
"@tsed/platform-params": "^6.102.4"
}
}
6 changes: 5 additions & 1 deletion packages/platform/platform-middlewares/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,9 @@
"@tsed/di": "6.102.4",
"@tsed/schema": "6.102.4"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/schema": "^6.102.4"
}
}
8 changes: 7 additions & 1 deletion packages/platform/platform-params/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,11 @@
"@tsed/json-mapper": "6.102.4",
"@tsed/schema": "6.102.4"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/exceptions": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/schema": "^6.102.4"
}
}
9 changes: 7 additions & 2 deletions packages/platform/platform-response-filter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@
"@tsed/di": "6.102.4",
"@tsed/exceptions": "6.102.4",
"@tsed/json-mapper": "6.102.4",
"@tsed/platform-views": "6.102.4",
"@tsed/schema": "6.102.4"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/exceptions": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/schema": "^6.102.4"
}
}
7 changes: 7 additions & 0 deletions packages/platform/platform-serverless-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@
"serverless-http": "^2.7.0"
},
"peerDependencies": {
"@tsed/common": "^6.102.4",
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/logger": ">=6.0.2",
"@tsed/openspec": "^6.102.4",
"@tsed/schema": "^6.102.4",
"aws-lambda": ">=1.0.7",
"serverless-http": ">=2.0.0"
}
Expand Down
7 changes: 4 additions & 3 deletions packages/platform/platform-serverless/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
},
"dependencies": {
"@tsed/core": "6.102.4",
"@tsed/di": "6.102.4",
"@tsed/exceptions": "6.102.4",
"@tsed/json-mapper": "6.102.4",
"@tsed/logger": ">=6.0.2",
"@tsed/platform-exceptions": "6.102.4",
"@tsed/platform-params": "6.102.4",
"@tsed/schema": "6.102.4",
Expand All @@ -38,5 +36,8 @@
"@types/encodeurl": "^1.0.0",
"@types/mime": "^2.0.3"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/di": "^6.102.4",
"@tsed/logger": ">=6.0.2"
}
}
14 changes: 11 additions & 3 deletions packages/platform/platform-views/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,16 @@
"@types/consolidate": "0.14.0",
"@types/ejs": "3.1.0"
},
"optionalDependencies": {
"@tsed/engines": ">=1.1.5"
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/exceptions": "^6.102.4",
"@tsed/schema": "^6.102.4",
"@tsed/engines": "^1.1.5"
},
"peerDependencies": {}
"peerDependenciesMeta": {
"@tsed/engines": {
"optional": true
}
}
}
8 changes: 8 additions & 0 deletions packages/security/oidc-provider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@
"oidc-provider": "7.10.1"
},
"peerDependencies": {
"@tsed/common": "^6.102.4",
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/exceptions": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/logger": ">=6.0.2",
"@tsed/openspec": "^6.102.4",
"@tsed/schema": "^6.102.4",
"oidc-provider": ">=7.3.0"
}
}
6 changes: 6 additions & 0 deletions packages/security/passport/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
"passport-strategy": "1.0.0"
},
"peerDependencies": {
"@tsed/common": "^6.102.4",
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/json-mapper": "^6.102.4",
"@tsed/logger": ">=6.0.2",
"@tsed/schema": "^6.102.4",
"passport": ">=0.4.1"
}
}
4 changes: 4 additions & 0 deletions packages/specs/ajv/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
"ajv": "8.9.0"
},
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/di": "^6.102.4",
"@tsed/exceptions": "^6.102.4",
"@tsed/schema": "^6.102.4",
"ajv": ">=8.9.0"
}
}
9 changes: 6 additions & 3 deletions packages/specs/exceptions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
"build:esm": "tsc --build tsconfig.compile.esm.json"
},
"dependencies": {
"@tsed/schema": "6.102.4",
"tslib": "2.2.0"
},
"devDependencies": {},
"peerDependencies": {}
"devDependencies": {
"@tsed/schema": "6.102.4"
},
"peerDependencies": {
"@tsed/schema": "^6.102.4"
}
}
6 changes: 5 additions & 1 deletion packages/specs/json-mapper/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,9 @@
"@tsed/exceptions": "6.102.4",
"@tsed/schema": "6.102.4"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/core": "^6.102.4",
"@tsed/exceptions": "^6.102.4",
"@tsed/schema": "^6.102.4"
}
}
5 changes: 4 additions & 1 deletion packages/specs/schema/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"tsed"
],
"dependencies": {
"@tsed/openspec": "6.102.4",
"camel-case": "4.1.2",
"json-schema": "0.4.0",
"micromatch": "4.0.4",
Expand All @@ -44,5 +45,7 @@
"@types/micromatch": "4.0.1",
"fs-extra": "9.0.1"
},
"peerDependencies": {}
"peerDependencies": {
"@tsed/core": "^6.102.4"
}
}
Loading

0 comments on commit ffe9ecf

Please sign in to comment.