diff --git a/extensions/graphql/package.json b/extensions/graphql/package.json index 15c0f81585c7..ae5a1db30082 100644 --- a/extensions/graphql/package.json +++ b/extensions/graphql/package.json @@ -30,10 +30,11 @@ "type-graphql": "^1.1.0" }, "peerDependencies": { - "@loopback/boot": "^3.0.2", + "@loopback/booter": "^1.0.0", "@loopback/core": "^2.11.0" }, "devDependencies": { + "@loopback/booter": "^1.0.0", "@loopback/boot": "^3.0.2", "@loopback/build": "^6.2.5", "@loopback/core": "^2.11.0", diff --git a/extensions/graphql/src/booters/resolver.booter.ts b/extensions/graphql/src/booters/resolver.booter.ts index 902a92ee0933..cda644abb423 100644 --- a/extensions/graphql/src/booters/resolver.booter.ts +++ b/extensions/graphql/src/booters/resolver.booter.ts @@ -6,9 +6,9 @@ import { ArtifactOptions, BaseArtifactBooter, - BootBindings, booter, -} from '@loopback/boot'; + BooterBindings, +} from '@loopback/booter'; import { Application, config, @@ -41,7 +41,7 @@ export class GraphQLResolverBooter extends BaseArtifactBooter { constructor( @inject(CoreBindings.APPLICATION_INSTANCE) public app: Application, - @inject(BootBindings.PROJECT_ROOT) projectRoot: string, + @inject(BooterBindings.PROJECT_ROOT) projectRoot: string, @config() public interceptorConfig: ArtifactOptions = {}, ) { diff --git a/extensions/graphql/tsconfig.json b/extensions/graphql/tsconfig.json index 93415ac36cdc..b2bc9a6aa548 100644 --- a/extensions/graphql/tsconfig.json +++ b/extensions/graphql/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../../packages/boot/tsconfig.json" }, + { + "path": "../../packages/booter/tsconfig.json" + }, { "path": "../../packages/core/tsconfig.json" }, diff --git a/extensions/typeorm/package.json b/extensions/typeorm/package.json index fe50ec56c0c5..fa9576d59b5a 100644 --- a/extensions/typeorm/package.json +++ b/extensions/typeorm/package.json @@ -22,7 +22,7 @@ "access": "public" }, "peerDependencies": { - "@loopback/boot": "^3.0.2", + "@loopback/booter": "^1.0.0", "@loopback/core": "^2.11.0", "@loopback/rest": "^8.0.0" }, @@ -31,6 +31,7 @@ "typeorm": "^0.2.28" }, "devDependencies": { + "@loopback/booter": "^1.0.0", "@loopback/boot": "^3.0.2", "@loopback/build": "^6.2.5", "@loopback/core": "^2.11.0", diff --git a/extensions/typeorm/src/typeorm-connection.booter.ts b/extensions/typeorm/src/typeorm-connection.booter.ts index cb6f8d270e89..c21c4acf4fb6 100644 --- a/extensions/typeorm/src/typeorm-connection.booter.ts +++ b/extensions/typeorm/src/typeorm-connection.booter.ts @@ -6,9 +6,9 @@ import { ArtifactOptions, BaseArtifactBooter, - BootBindings, booter, -} from '@loopback/boot'; + BooterBindings, +} from '@loopback/booter'; import {config, CoreBindings, inject} from '@loopback/core'; import debugFactory from 'debug'; import {ApplicationUsingTypeOrm, ConnectionOptions} from './'; @@ -28,7 +28,7 @@ export class TypeOrmConnectionBooter extends BaseArtifactBooter { constructor( @inject(CoreBindings.APPLICATION_INSTANCE) public app: ApplicationUsingTypeOrm, - @inject(BootBindings.PROJECT_ROOT) projectRoot: string, + @inject(BooterBindings.PROJECT_ROOT) projectRoot: string, @config() public entityConfig: ArtifactOptions = {}, ) { diff --git a/extensions/typeorm/tsconfig.json b/extensions/typeorm/tsconfig.json index 81add39467bb..a101f6ab5a61 100644 --- a/extensions/typeorm/tsconfig.json +++ b/extensions/typeorm/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../../packages/boot/tsconfig.json" }, + { + "path": "../../packages/booter/tsconfig.json" + }, { "path": "../../packages/core/tsconfig.json" }, diff --git a/packages/booter-lb3app/package.json b/packages/booter-lb3app/package.json index 34faf9d8161e..9c74d426853a 100644 --- a/packages/booter-lb3app/package.json +++ b/packages/booter-lb3app/package.json @@ -21,7 +21,7 @@ "access": "public" }, "peerDependencies": { - "@loopback/boot": "^3.0.2", + "@loopback/booter": "^1.0.0", "@loopback/core": "^2.11.0", "@loopback/rest": "^8.0.0" }, @@ -34,6 +34,7 @@ "tslib": "^2.0.3" }, "devDependencies": { + "@loopback/booter": "^1.0.0", "@loopback/boot": "^3.0.2", "@loopback/build": "^6.2.5", "@loopback/core": "^2.11.0", diff --git a/packages/booter-lb3app/src/lb3app.booter.ts b/packages/booter-lb3app/src/lb3app.booter.ts index 71e14e7be7a6..914c9fb60185 100644 --- a/packages/booter-lb3app/src/lb3app.booter.ts +++ b/packages/booter-lb3app/src/lb3app.booter.ts @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import {BootBindings, Booter} from '@loopback/boot'; +import {Booter, BooterBindings} from '@loopback/booter'; import {CoreBindings, inject} from '@loopback/core'; import { ExpressRequestHandler, @@ -35,9 +35,9 @@ export class Lb3AppBooter implements Booter { constructor( @inject(CoreBindings.APPLICATION_INSTANCE) public app: RestApplication, - @inject(BootBindings.PROJECT_ROOT) + @inject(BooterBindings.PROJECT_ROOT) public projectRoot: string, - @inject(`${BootBindings.BOOT_OPTIONS}#lb3app`) + @inject(`${BooterBindings.BOOT_OPTIONS}#lb3app`) options: Partial = {}, ) { this.options = Object.assign({}, DefaultOptions, options); diff --git a/packages/booter-lb3app/tsconfig.json b/packages/booter-lb3app/tsconfig.json index 813f7cf5178f..0ea456a790a3 100644 --- a/packages/booter-lb3app/tsconfig.json +++ b/packages/booter-lb3app/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../boot/tsconfig.json" }, + { + "path": "../booter/tsconfig.json" + }, { "path": "../core/tsconfig.json" }, diff --git a/packages/cli/package.json b/packages/cli/package.json index d186226fc968..00bce01c2c71 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -114,6 +114,7 @@ "source-map-support": "^0.5.19", "typescript": "~4.0.3", "@loopback/authentication": "^7.0.2", + "@loopback/booter": "^1.0.0", "@loopback/boot": "^3.0.2", "@loopback/build": "^6.2.5", "@loopback/cli": "^2.16.1", diff --git a/packages/model-api-builder/package.json b/packages/model-api-builder/package.json index 77511ef4e886..a16e26351df6 100644 --- a/packages/model-api-builder/package.json +++ b/packages/model-api-builder/package.json @@ -21,7 +21,7 @@ "access": "public" }, "peerDependencies": { - "@loopback/boot": "^3.0.2", + "@loopback/booter": "^1.0.0", "@loopback/core": "^2.11.0", "@loopback/repository": "^3.1.0" }, @@ -30,6 +30,7 @@ }, "devDependencies": { "@loopback/build": "^6.2.5", + "@loopback/booter": "^1.0.0", "@loopback/boot": "^3.0.2", "@loopback/core": "^2.11.0", "@loopback/repository": "^3.1.0", diff --git a/packages/model-api-builder/src/booters/model-api.booter.ts b/packages/model-api-builder/src/booters/model-api.booter.ts index 7c589a8d9a61..ff595c9ed4f7 100644 --- a/packages/model-api-builder/src/booters/model-api.booter.ts +++ b/packages/model-api-builder/src/booters/model-api.booter.ts @@ -6,9 +6,9 @@ import { ArtifactOptions, BaseArtifactBooter, - BootBindings, booter, -} from '@loopback/boot'; + BooterBindings, +} from '@loopback/booter'; import { config, CoreBindings, @@ -31,7 +31,7 @@ export class ModelApiBooter extends BaseArtifactBooter { constructor( @inject(CoreBindings.APPLICATION_INSTANCE) public app: ApplicationWithRepositories, - @inject(BootBindings.PROJECT_ROOT) projectRoot: string, + @inject(BooterBindings.PROJECT_ROOT) projectRoot: string, @extensions() public getModelApiBuilders: Getter, @config() diff --git a/packages/model-api-builder/tsconfig.json b/packages/model-api-builder/tsconfig.json index 06c4c9e11d51..21cadc03c26f 100644 --- a/packages/model-api-builder/tsconfig.json +++ b/packages/model-api-builder/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../boot/tsconfig.json" }, + { + "path": "../booter/tsconfig.json" + }, { "path": "../core/tsconfig.json" }, diff --git a/packages/repository/package.json b/packages/repository/package.json index b65bb5637fbf..735f387c85ef 100644 --- a/packages/repository/package.json +++ b/packages/repository/package.json @@ -22,11 +22,12 @@ "access": "public" }, "peerDependencies": { - "@loopback/boot": "^3.0.2", + "@loopback/booter": "^1.0.0", "@loopback/core": "^2.11.0" }, "devDependencies": { "@loopback/build": "^6.2.5", + "@loopback/booter": "^1.0.0", "@loopback/boot": "^3.0.2", "@loopback/core": "^2.11.0", "@loopback/eslint-config": "^10.0.1", diff --git a/packages/repository/src/booters/datasource.booter.ts b/packages/repository/src/booters/datasource.booter.ts index 2e45ade9526f..7b23cb8e66dc 100644 --- a/packages/repository/src/booters/datasource.booter.ts +++ b/packages/repository/src/booters/datasource.booter.ts @@ -6,9 +6,9 @@ import { ArtifactOptions, BaseArtifactBooter, - BootBindings, booter, -} from '@loopback/boot'; + BooterBindings, +} from '@loopback/booter'; import {config, CoreBindings, inject} from '@loopback/core'; import {Class} from '../common-types'; import {ApplicationWithRepositories} from '../mixins'; @@ -29,7 +29,7 @@ export class DataSourceBooter extends BaseArtifactBooter { constructor( @inject(CoreBindings.APPLICATION_INSTANCE) public app: ApplicationWithRepositories, - @inject(BootBindings.PROJECT_ROOT) projectRoot: string, + @inject(BooterBindings.PROJECT_ROOT) projectRoot: string, @config() public datasourceConfig: ArtifactOptions = {}, ) { diff --git a/packages/repository/src/booters/model.booter.ts b/packages/repository/src/booters/model.booter.ts index 6b16a9a4ddc7..f3ea2592b62c 100644 --- a/packages/repository/src/booters/model.booter.ts +++ b/packages/repository/src/booters/model.booter.ts @@ -6,9 +6,9 @@ import { ArtifactOptions, BaseArtifactBooter, - BootBindings, booter, -} from '@loopback/boot'; + BooterBindings, +} from '@loopback/booter'; import {config, Constructor, CoreBindings, inject} from '@loopback/core'; import debugFactory from 'debug'; import {ModelMetadataHelper} from '../decorators'; @@ -30,7 +30,7 @@ export class ModelBooter extends BaseArtifactBooter { constructor( @inject(CoreBindings.APPLICATION_INSTANCE) public app: ApplicationWithRepositories, - @inject(BootBindings.PROJECT_ROOT) projectRoot: string, + @inject(BooterBindings.PROJECT_ROOT) projectRoot: string, @config() public modelConfig: ArtifactOptions = {}, ) { diff --git a/packages/repository/src/booters/repository.booter.ts b/packages/repository/src/booters/repository.booter.ts index 3ae10d1ab3f9..0f2eec6c9a77 100644 --- a/packages/repository/src/booters/repository.booter.ts +++ b/packages/repository/src/booters/repository.booter.ts @@ -6,9 +6,9 @@ import { ArtifactOptions, BaseArtifactBooter, - BootBindings, booter, -} from '@loopback/boot'; + BooterBindings, +} from '@loopback/booter'; import {config, CoreBindings, inject} from '@loopback/core'; import {ApplicationWithRepositories} from '../mixins'; @@ -28,7 +28,7 @@ export class RepositoryBooter extends BaseArtifactBooter { constructor( @inject(CoreBindings.APPLICATION_INSTANCE) public app: ApplicationWithRepositories, - @inject(BootBindings.PROJECT_ROOT) projectRoot: string, + @inject(BooterBindings.PROJECT_ROOT) projectRoot: string, @config() public repositoryOptions: ArtifactOptions = {}, ) { diff --git a/packages/repository/src/mixins/repository.mixin.ts b/packages/repository/src/mixins/repository.mixin.ts index 552a725b7ade..ad1fdde333ae 100644 --- a/packages/repository/src/mixins/repository.mixin.ts +++ b/packages/repository/src/mixins/repository.mixin.ts @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import {bindBooter} from '@loopback/boot'; +import {bindBooter} from '@loopback/booter'; import { Binding, BindingFromClassOptions, diff --git a/packages/repository/tsconfig.json b/packages/repository/tsconfig.json index 344086758749..ca73e8da068a 100644 --- a/packages/repository/tsconfig.json +++ b/packages/repository/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../boot/tsconfig.json" }, + { + "path": "../booter/tsconfig.json" + }, { "path": "../core/tsconfig.json" }, diff --git a/packages/rest-crud/package.json b/packages/rest-crud/package.json index 258da72ad1e1..a8c2920cd1f8 100644 --- a/packages/rest-crud/package.json +++ b/packages/rest-crud/package.json @@ -21,7 +21,7 @@ "access": "public" }, "peerDependencies": { - "@loopback/boot": "^3.0.2", + "@loopback/booter": "^1.0.0", "@loopback/core": "^2.11.0", "@loopback/repository": "^3.1.0", "@loopback/rest": "^8.0.0" @@ -33,6 +33,7 @@ }, "devDependencies": { "@loopback/build": "^6.2.5", + "@loopback/booter": "^1.0.0", "@loopback/boot": "^3.0.2", "@loopback/core": "^2.11.0", "@loopback/repository": "^3.1.0", diff --git a/packages/rest-crud/src/crud-rest.component.ts b/packages/rest-crud/src/crud-rest.component.ts index ab4125df85ba..c8331b160a41 100644 --- a/packages/rest-crud/src/crud-rest.component.ts +++ b/packages/rest-crud/src/crud-rest.component.ts @@ -3,7 +3,7 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -import {Booter} from '@loopback/boot'; +import {Booter} from '@loopback/booter'; import { Binding, Component, diff --git a/packages/rest-crud/tsconfig.json b/packages/rest-crud/tsconfig.json index 0f57aaeca415..1011c3d05be5 100644 --- a/packages/rest-crud/tsconfig.json +++ b/packages/rest-crud/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../boot/tsconfig.json" }, + { + "path": "../booter/tsconfig.json" + }, { "path": "../core/tsconfig.json" },