From 4da80ff088de00e174398c5cb28467abdcd54388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Tue, 14 Jul 2020 09:10:57 +0200 Subject: [PATCH] refactor: remove `@loopback/openapi-v3` from dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Import OpenAPI-related helpers from `@loopback/rest` instead. Signed-off-by: Miroslav Bajtoš --- examples/access-control-migration/package.json | 1 - .../components/jwt-authentication/services/security.spec.ts | 2 +- examples/access-control-migration/tsconfig.json | 3 --- examples/express-composition/package.json | 1 - examples/express-composition/tsconfig.json | 3 --- examples/file-transfer/package.json | 1 - examples/file-transfer/tsconfig.json | 3 --- examples/greeter-extension/package.json | 1 - examples/greeter-extension/tsconfig.json | 3 --- examples/greeting-app/package.json | 1 - examples/greeting-app/tsconfig.json | 3 --- examples/log-extension/package.json | 1 - .../src/__tests__/acceptance/log.extension.acceptance.ts | 3 ++- examples/log-extension/tsconfig.json | 3 --- examples/multi-tenancy/package.json | 1 - examples/multi-tenancy/tsconfig.json | 3 --- examples/passport-login/package.json | 1 - examples/passport-login/tsconfig.json | 3 --- examples/rest-crud/package.json | 1 - examples/rest-crud/tsconfig.json | 3 --- examples/soap-calculator/package.json | 1 - examples/soap-calculator/tsconfig.json | 3 --- examples/todo-jwt/package.json | 1 - examples/todo-jwt/tsconfig.json | 3 --- examples/todo-list/package.json | 1 - examples/todo-list/tsconfig.json | 3 --- examples/todo/package.json | 1 - examples/todo/tsconfig.json | 3 --- examples/validation-app/package.json | 1 - examples/validation-app/tsconfig.json | 3 --- extensions/authentication-jwt/package.json | 1 - .../src/services/security.spec.enhancer.ts | 4 ++-- extensions/authentication-jwt/tsconfig.json | 3 --- extensions/authentication-passport/package.json | 1 - ...hentication-with-passport-strategy-adapter.acceptance.ts | 5 +++-- ...tion-with-passport-strategy-oauth2-adapter.acceptance.ts | 3 +-- extensions/authentication-passport/tsconfig.json | 3 --- extensions/typeorm/package.json | 3 +-- extensions/typeorm/src/typeorm.utils.ts | 6 +----- extensions/typeorm/tsconfig.json | 3 --- packages/authentication/package.json | 1 - .../__tests__/acceptance/basic-auth-extension.acceptance.ts | 5 ++--- .../__tests__/acceptance/jwt-auth-extension.acceptance.ts | 3 +-- .../src/__tests__/fixtures/strategies/basic-strategy.ts | 5 +++-- .../src/__tests__/fixtures/strategies/jwt-strategy.ts | 5 +++-- .../unit/types/register-authentication-strategy.unit.ts | 4 ++-- packages/authentication/tsconfig.json | 3 --- packages/boot/package.json | 1 - packages/boot/tsconfig.json | 3 --- packages/repository/README.md | 2 +- 50 files changed, 23 insertions(+), 102 deletions(-) diff --git a/examples/access-control-migration/package.json b/examples/access-control-migration/package.json index 048d86d3d9bc..df6b431a06c3 100644 --- a/examples/access-control-migration/package.json +++ b/examples/access-control-migration/package.json @@ -43,7 +43,6 @@ "@loopback/authorization": "^0.6.2", "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/access-control-migration/src/components/jwt-authentication/services/security.spec.ts b/examples/access-control-migration/src/components/jwt-authentication/services/security.spec.ts index 20a63d6d988e..49fe5d67686c 100644 --- a/examples/access-control-migration/src/components/jwt-authentication/services/security.spec.ts +++ b/examples/access-control-migration/src/components/jwt-authentication/services/security.spec.ts @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import {SecuritySchemeObject, ReferenceObject} from '@loopback/openapi-v3'; +import {SecuritySchemeObject, ReferenceObject} from '@loopback/rest'; export const OPERATION_SECURITY_SPEC = [{jwt: []}]; export type SecuritySchemeObjects = { diff --git a/examples/access-control-migration/tsconfig.json b/examples/access-control-migration/tsconfig.json index a4d3534bda59..0acc458e63da 100644 --- a/examples/access-control-migration/tsconfig.json +++ b/examples/access-control-migration/tsconfig.json @@ -26,9 +26,6 @@ { "path": "../../packages/http-caching-proxy/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/express-composition/package.json b/examples/express-composition/package.json index 87ed1fe55885..9d8eb5b71cdb 100644 --- a/examples/express-composition/package.json +++ b/examples/express-composition/package.json @@ -47,7 +47,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/express-composition/tsconfig.json b/examples/express-composition/tsconfig.json index a4bb932c1d8b..9dfbd9a7be84 100644 --- a/examples/express-composition/tsconfig.json +++ b/examples/express-composition/tsconfig.json @@ -17,9 +17,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/file-transfer/package.json b/examples/file-transfer/package.json index 45c0d1a979de..4d1d77271bce 100644 --- a/examples/file-transfer/package.json +++ b/examples/file-transfer/package.json @@ -40,7 +40,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", "multer": "^1.4.2", diff --git a/examples/file-transfer/tsconfig.json b/examples/file-transfer/tsconfig.json index 1f0f3fec3432..5193f4493743 100644 --- a/examples/file-transfer/tsconfig.json +++ b/examples/file-transfer/tsconfig.json @@ -17,9 +17,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/rest-explorer/tsconfig.json" }, diff --git a/examples/greeter-extension/package.json b/examples/greeter-extension/package.json index 6adcfebf0397..b2780117821f 100644 --- a/examples/greeter-extension/package.json +++ b/examples/greeter-extension/package.json @@ -56,7 +56,6 @@ }, "dependencies": { "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "chalk": "^4.1.0", "debug": "^4.1.1", "tslib": "^2.0.0" diff --git a/examples/greeter-extension/tsconfig.json b/examples/greeter-extension/tsconfig.json index 4e1d26c08eb1..c286e2aee8eb 100644 --- a/examples/greeter-extension/tsconfig.json +++ b/examples/greeter-extension/tsconfig.json @@ -14,9 +14,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/testlab/tsconfig.json" } diff --git a/examples/greeting-app/package.json b/examples/greeting-app/package.json index 12008093a5d1..507bd2127e12 100644 --- a/examples/greeting-app/package.json +++ b/examples/greeting-app/package.json @@ -59,7 +59,6 @@ "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", "@loopback/example-greeter-extension": "^2.1.5", - "@loopback/openapi-v3": "^3.4.5", "@loopback/rest": "^5.2.0", "chalk": "^4.1.0", "debug": "^4.1.1", diff --git a/examples/greeting-app/tsconfig.json b/examples/greeting-app/tsconfig.json index 72a004274319..f5b393c46f66 100644 --- a/examples/greeting-app/tsconfig.json +++ b/examples/greeting-app/tsconfig.json @@ -17,9 +17,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/rest/tsconfig.json" }, diff --git a/examples/log-extension/package.json b/examples/log-extension/package.json index 7669d42cf5cf..04a2b2e3cee4 100644 --- a/examples/log-extension/package.json +++ b/examples/log-extension/package.json @@ -54,7 +54,6 @@ }, "dependencies": { "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/rest": "^5.2.0", "chalk": "^4.1.0", "debug": "^4.1.1", diff --git a/examples/log-extension/src/__tests__/acceptance/log.extension.acceptance.ts b/examples/log-extension/src/__tests__/acceptance/log.extension.acceptance.ts index 54555402a971..57bf3cb0d960 100644 --- a/examples/log-extension/src/__tests__/acceptance/log.extension.acceptance.ts +++ b/examples/log-extension/src/__tests__/acceptance/log.extension.acceptance.ts @@ -4,10 +4,11 @@ // License text available at https://opensource.org/licenses/MIT import {inject} from '@loopback/core'; -import {get, param} from '@loopback/openapi-v3'; import { + get, FindRoute, InvokeMethod, + param, ParseParams, Reject, RequestContext, diff --git a/examples/log-extension/tsconfig.json b/examples/log-extension/tsconfig.json index 2f84603592b2..4f7904a79ab5 100644 --- a/examples/log-extension/tsconfig.json +++ b/examples/log-extension/tsconfig.json @@ -14,9 +14,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/rest/tsconfig.json" }, diff --git a/examples/multi-tenancy/package.json b/examples/multi-tenancy/package.json index ed717caf0e6f..c6ab0e7e7238 100644 --- a/examples/multi-tenancy/package.json +++ b/examples/multi-tenancy/package.json @@ -53,7 +53,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/multi-tenancy/tsconfig.json b/examples/multi-tenancy/tsconfig.json index a4bb932c1d8b..9dfbd9a7be84 100644 --- a/examples/multi-tenancy/tsconfig.json +++ b/examples/multi-tenancy/tsconfig.json @@ -17,9 +17,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/passport-login/package.json b/examples/passport-login/package.json index 8ea499fa4cf8..323186835f45 100644 --- a/examples/passport-login/package.json +++ b/examples/passport-login/package.json @@ -42,7 +42,6 @@ "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", "@loopback/mock-oauth2-provider": "^0.1.3", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-crud": "^0.8.9", diff --git a/examples/passport-login/tsconfig.json b/examples/passport-login/tsconfig.json index a4b67558f9d2..46c302a84a36 100644 --- a/examples/passport-login/tsconfig.json +++ b/examples/passport-login/tsconfig.json @@ -30,9 +30,6 @@ { "path": "../../packages/http-caching-proxy/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/rest-crud/package.json b/examples/rest-crud/package.json index 5ec40f66347f..c38ec08d47f5 100644 --- a/examples/rest-crud/package.json +++ b/examples/rest-crud/package.json @@ -41,7 +41,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-crud": "^0.8.9", diff --git a/examples/rest-crud/tsconfig.json b/examples/rest-crud/tsconfig.json index e05af391f484..20918eff4fae 100644 --- a/examples/rest-crud/tsconfig.json +++ b/examples/rest-crud/tsconfig.json @@ -20,9 +20,6 @@ { "path": "../../packages/http-caching-proxy/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/soap-calculator/package.json b/examples/soap-calculator/package.json index 95d3ad0f9e3c..705037c443dd 100644 --- a/examples/soap-calculator/package.json +++ b/examples/soap-calculator/package.json @@ -46,7 +46,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/soap-calculator/tsconfig.json b/examples/soap-calculator/tsconfig.json index a4bb932c1d8b..9dfbd9a7be84 100644 --- a/examples/soap-calculator/tsconfig.json +++ b/examples/soap-calculator/tsconfig.json @@ -17,9 +17,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/todo-jwt/package.json b/examples/todo-jwt/package.json index 8750effcf01e..50abea31e14c 100644 --- a/examples/todo-jwt/package.json +++ b/examples/todo-jwt/package.json @@ -43,7 +43,6 @@ "@loopback/authentication-jwt": "^0.4.3", "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/todo-jwt/tsconfig.json b/examples/todo-jwt/tsconfig.json index b2cda2988898..85da887014e5 100644 --- a/examples/todo-jwt/tsconfig.json +++ b/examples/todo-jwt/tsconfig.json @@ -26,9 +26,6 @@ { "path": "../../packages/http-caching-proxy/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/todo-list/package.json b/examples/todo-list/package.json index 31faf846ba17..161dd2b6ba0e 100644 --- a/examples/todo-list/package.json +++ b/examples/todo-list/package.json @@ -41,7 +41,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/todo-list/tsconfig.json b/examples/todo-list/tsconfig.json index 49d11fc02dfd..d92a21a77f27 100644 --- a/examples/todo-list/tsconfig.json +++ b/examples/todo-list/tsconfig.json @@ -20,9 +20,6 @@ { "path": "../../packages/http-caching-proxy/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/todo/package.json b/examples/todo/package.json index 0072b94281e6..4bbd42dec43a 100644 --- a/examples/todo/package.json +++ b/examples/todo/package.json @@ -41,7 +41,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/todo/tsconfig.json b/examples/todo/tsconfig.json index 49d11fc02dfd..d92a21a77f27 100644 --- a/examples/todo/tsconfig.json +++ b/examples/todo/tsconfig.json @@ -20,9 +20,6 @@ { "path": "../../packages/http-caching-proxy/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/examples/validation-app/package.json b/examples/validation-app/package.json index f308ec9335c9..702b8e18d268 100644 --- a/examples/validation-app/package.json +++ b/examples/validation-app/package.json @@ -43,7 +43,6 @@ "dependencies": { "@loopback/boot": "^2.3.5", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/repository": "^2.9.0", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", diff --git a/examples/validation-app/tsconfig.json b/examples/validation-app/tsconfig.json index a4bb932c1d8b..9dfbd9a7be84 100644 --- a/examples/validation-app/tsconfig.json +++ b/examples/validation-app/tsconfig.json @@ -17,9 +17,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/extensions/authentication-jwt/package.json b/extensions/authentication-jwt/package.json index 75b77fd76bc9..c28067df34a9 100644 --- a/extensions/authentication-jwt/package.json +++ b/extensions/authentication-jwt/package.json @@ -23,7 +23,6 @@ "dependencies": { "@loopback/authentication": "^4.2.9", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/rest": "^5.2.0", "@loopback/rest-explorer": "^2.2.6", "@loopback/security": "^0.2.14", diff --git a/extensions/authentication-jwt/src/services/security.spec.enhancer.ts b/extensions/authentication-jwt/src/services/security.spec.enhancer.ts index 36838cc2738b..e743628f5d2a 100644 --- a/extensions/authentication-jwt/src/services/security.spec.enhancer.ts +++ b/extensions/authentication-jwt/src/services/security.spec.enhancer.ts @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2019. All Rights Reserved. -// Node module: @loopback/openapi-v3 +// Node module: @loopback/authentication-jwt" // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT @@ -11,7 +11,7 @@ import { OpenApiSpec, ReferenceObject, SecuritySchemeObject, -} from '@loopback/openapi-v3'; +} from '@loopback/rest'; import debugModule from 'debug'; import {inspect} from 'util'; const debug = debugModule('loopback:jwt-extension:spec-enhancer'); diff --git a/extensions/authentication-jwt/tsconfig.json b/extensions/authentication-jwt/tsconfig.json index 66dfed3c71c0..8ada1a68b1b0 100644 --- a/extensions/authentication-jwt/tsconfig.json +++ b/extensions/authentication-jwt/tsconfig.json @@ -20,9 +20,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/extensions/authentication-passport/package.json b/extensions/authentication-passport/package.json index 276e44b074eb..36dba5560c5f 100644 --- a/extensions/authentication-passport/package.json +++ b/extensions/authentication-passport/package.json @@ -42,7 +42,6 @@ "dependencies": { "@loopback/authentication": "^4.2.9", "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/rest": "^5.2.0", "@loopback/security": "^0.2.14", "passport": "^0.4.1", diff --git a/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-adapter.acceptance.ts b/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-adapter.acceptance.ts index 7b0d76461e90..361093158256 100644 --- a/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-adapter.acceptance.ts +++ b/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-adapter.acceptance.ts @@ -13,11 +13,12 @@ import { UserProfileFactory, USER_PROFILE_NOT_FOUND, } from '@loopback/authentication'; -import {inject, addExtension, CoreTags, Provider} from '@loopback/core'; +import {addExtension, CoreTags, inject, Provider} from '@loopback/core'; import {anOpenApiSpec} from '@loopback/openapi-spec-builder'; -import {api, get} from '@loopback/openapi-v3'; import { + api, FindRoute, + get, InvokeMethod, ParseParams, Reject, diff --git a/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-oauth2-adapter.acceptance.ts b/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-oauth2-adapter.acceptance.ts index a71bac215da8..9a688cde8a04 100644 --- a/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-oauth2-adapter.acceptance.ts +++ b/extensions/authentication-passport/src/__tests__/acceptance/authentication-with-passport-strategy-oauth2-adapter.acceptance.ts @@ -10,8 +10,7 @@ import { MyUser, userRepository, } from '@loopback/mock-oauth2-provider'; -import {get} from '@loopback/openapi-v3'; -import {Response, RestApplication, RestBindings} from '@loopback/rest'; +import {get, Response, RestApplication, RestBindings} from '@loopback/rest'; import {SecurityBindings, securityId, UserProfile} from '@loopback/security'; import { Client, diff --git a/extensions/authentication-passport/tsconfig.json b/extensions/authentication-passport/tsconfig.json index f3a75e586a84..9132eff55a4a 100644 --- a/extensions/authentication-passport/tsconfig.json +++ b/extensions/authentication-passport/tsconfig.json @@ -22,9 +22,6 @@ { "path": "../../packages/openapi-spec-builder/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/rest/tsconfig.json" }, diff --git a/extensions/typeorm/package.json b/extensions/typeorm/package.json index f2790a6c8a8a..cf2f3b5158e8 100644 --- a/extensions/typeorm/package.json +++ b/extensions/typeorm/package.json @@ -25,7 +25,6 @@ "@loopback/build": "^5.4.3", "@loopback/eslint-config": "^8.0.1", "@loopback/repository": "^2.7.0", - "@loopback/rest": "^5.1.1", "@loopback/testlab": "^3.1.7", "@types/json-schema": "^7.0.5", "@types/node": "^10.17.27", @@ -34,7 +33,7 @@ "dependencies": { "@loopback/boot": "^2.3.3", "@loopback/core": "^2.8.0", - "@loopback/openapi-v3": "^3.4.3", + "@loopback/rest": "^5.1.1", "tslib": "^2.0.0", "typeorm": "^0.2.25" }, diff --git a/extensions/typeorm/src/typeorm.utils.ts b/extensions/typeorm/src/typeorm.utils.ts index aaa5d6c9ccd8..607e14816aab 100644 --- a/extensions/typeorm/src/typeorm.utils.ts +++ b/extensions/typeorm/src/typeorm.utils.ts @@ -3,11 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import { - JsonSchemaOptions, - ReferenceObject, - SchemaObject, -} from '@loopback/openapi-v3'; +import {JsonSchemaOptions, ReferenceObject, SchemaObject} from '@loopback/rest'; import debugFactory from 'debug'; import {getMetadataArgsStorage} from 'typeorm'; import {ColumnType} from 'typeorm/driver/types/ColumnTypes'; diff --git a/extensions/typeorm/tsconfig.json b/extensions/typeorm/tsconfig.json index 5d891f4be892..81add39467bb 100644 --- a/extensions/typeorm/tsconfig.json +++ b/extensions/typeorm/tsconfig.json @@ -16,9 +16,6 @@ { "path": "../../packages/core/tsconfig.json" }, - { - "path": "../../packages/openapi-v3/tsconfig.json" - }, { "path": "../../packages/repository/tsconfig.json" }, diff --git a/packages/authentication/package.json b/packages/authentication/package.json index 14e3ab801e32..fc3d777fda64 100644 --- a/packages/authentication/package.json +++ b/packages/authentication/package.json @@ -25,7 +25,6 @@ }, "dependencies": { "@loopback/core": "^2.9.1", - "@loopback/openapi-v3": "^3.4.5", "@loopback/rest": "^5.2.0", "@loopback/security": "^0.2.14", "@types/express": "^4.17.7", diff --git a/packages/authentication/src/__tests__/acceptance/basic-auth-extension.acceptance.ts b/packages/authentication/src/__tests__/acceptance/basic-auth-extension.acceptance.ts index cf3934f7d2eb..6fcb759b3121 100644 --- a/packages/authentication/src/__tests__/acceptance/basic-auth-extension.acceptance.ts +++ b/packages/authentication/src/__tests__/acceptance/basic-auth-extension.acceptance.ts @@ -3,10 +3,9 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import {inject, Application} from '@loopback/core'; +import {Application, inject} from '@loopback/core'; import {anOpenApiSpec} from '@loopback/openapi-spec-builder'; -import {api, get} from '@loopback/openapi-v3'; -import {Request, RestServer} from '@loopback/rest'; +import {api, get, Request, RestServer} from '@loopback/rest'; import {SecurityBindings, securityId, UserProfile} from '@loopback/security'; import {Client, createClientForHandler, expect} from '@loopback/testlab'; import { diff --git a/packages/authentication/src/__tests__/acceptance/jwt-auth-extension.acceptance.ts b/packages/authentication/src/__tests__/acceptance/jwt-auth-extension.acceptance.ts index 7503e961b523..a98df22835db 100644 --- a/packages/authentication/src/__tests__/acceptance/jwt-auth-extension.acceptance.ts +++ b/packages/authentication/src/__tests__/acceptance/jwt-auth-extension.acceptance.ts @@ -4,8 +4,7 @@ // License text available at https://opensource.org/licenses/MIT import {inject, Application} from '@loopback/core'; -import {get, post} from '@loopback/openapi-v3'; -import {Request, RestServer} from '@loopback/rest'; +import {get, post, Request, RestServer} from '@loopback/rest'; import {SecurityBindings, securityId, UserProfile} from '@loopback/security'; import {Client, createClientForHandler, expect} from '@loopback/testlab'; import { diff --git a/packages/authentication/src/__tests__/fixtures/strategies/basic-strategy.ts b/packages/authentication/src/__tests__/fixtures/strategies/basic-strategy.ts index 3010791100a1..2978576e4888 100644 --- a/packages/authentication/src/__tests__/fixtures/strategies/basic-strategy.ts +++ b/packages/authentication/src/__tests__/fixtures/strategies/basic-strategy.ts @@ -6,11 +6,12 @@ import {bind, inject} from '@loopback/core'; import { asSpecEnhancer, + HttpErrors, mergeSecuritySchemeToSpec, OASEnhancer, OpenApiSpec, -} from '@loopback/openapi-v3'; -import {HttpErrors, Request} from '@loopback/rest'; + Request, +} from '@loopback/rest'; import {UserProfile} from '@loopback/security'; import {asAuthStrategy, AuthenticationStrategy} from '../../../types'; import {BasicAuthenticationStrategyBindings} from '../keys'; diff --git a/packages/authentication/src/__tests__/fixtures/strategies/jwt-strategy.ts b/packages/authentication/src/__tests__/fixtures/strategies/jwt-strategy.ts index 8f0caf1ddc3f..21f4008f3cd7 100644 --- a/packages/authentication/src/__tests__/fixtures/strategies/jwt-strategy.ts +++ b/packages/authentication/src/__tests__/fixtures/strategies/jwt-strategy.ts @@ -6,11 +6,12 @@ import {bind, inject} from '@loopback/core'; import { asSpecEnhancer, + HttpErrors, mergeSecuritySchemeToSpec, OASEnhancer, OpenApiSpec, -} from '@loopback/openapi-v3'; -import {HttpErrors, Request} from '@loopback/rest'; + Request, +} from '@loopback/rest'; import {UserProfile} from '@loopback/security'; import {asAuthStrategy, AuthenticationStrategy} from '../../../types'; import {JWTAuthenticationStrategyBindings} from '../keys'; diff --git a/packages/authentication/src/__tests__/unit/types/register-authentication-strategy.unit.ts b/packages/authentication/src/__tests__/unit/types/register-authentication-strategy.unit.ts index bd65b9ea4f7a..c2ab2fc3e8aa 100644 --- a/packages/authentication/src/__tests__/unit/types/register-authentication-strategy.unit.ts +++ b/packages/authentication/src/__tests__/unit/types/register-authentication-strategy.unit.ts @@ -9,8 +9,8 @@ import { OASEnhancer, OASEnhancerBindings, OpenApiSpec, -} from '@loopback/openapi-v3'; -import {Request} from '@loopback/rest'; + Request, +} from '@loopback/rest'; import {securityId, UserProfile} from '@loopback/security'; import {expect} from '@loopback/testlab'; import { diff --git a/packages/authentication/tsconfig.json b/packages/authentication/tsconfig.json index 46e4e92795c6..33b827d0c91b 100644 --- a/packages/authentication/tsconfig.json +++ b/packages/authentication/tsconfig.json @@ -16,9 +16,6 @@ { "path": "../openapi-spec-builder/tsconfig.json" }, - { - "path": "../openapi-v3/tsconfig.json" - }, { "path": "../rest/tsconfig.json" }, diff --git a/packages/boot/package.json b/packages/boot/package.json index 9520169015e4..ed44145f4853 100644 --- a/packages/boot/package.json +++ b/packages/boot/package.json @@ -37,7 +37,6 @@ "devDependencies": { "@loopback/build": "^6.1.0", "@loopback/eslint-config": "^8.0.3", - "@loopback/openapi-v3": "^3.4.5", "@loopback/rest": "^5.2.0", "@loopback/rest-crud": "^0.8.9", "@loopback/testlab": "^3.2.0", diff --git a/packages/boot/tsconfig.json b/packages/boot/tsconfig.json index 8c3eee450c18..15ff0870c691 100644 --- a/packages/boot/tsconfig.json +++ b/packages/boot/tsconfig.json @@ -17,9 +17,6 @@ { "path": "../model-api-builder/tsconfig.json" }, - { - "path": "../openapi-v3/tsconfig.json" - }, { "path": "../repository/tsconfig.json" }, diff --git a/packages/repository/README.md b/packages/repository/README.md index 199b3ee95f0c..e6faec07858f 100644 --- a/packages/repository/README.md +++ b/packages/repository/README.md @@ -97,7 +97,7 @@ or properties. import {repository} from '@loopback/repository'; import {NoteRepository} from '../repositories'; import {Note} from '../models'; -import {post, requestBody, get, param} from '@loopback/openapi-v3'; +import {post, requestBody, get, param} from '@loopback/rest'; export class NoteController { constructor(