diff --git a/.changeset/mean-seas-burn.md b/.changeset/mean-seas-burn.md new file mode 100644 index 0000000000..1cd3a206dd --- /dev/null +++ b/.changeset/mean-seas-burn.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Minor internal tweak to support TypeScript 4.6 diff --git a/package.json b/package.json index db8816a7ac..a282aac2eb 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "semver": "^7.3.2", "shx": "^0.3.2", "ts-node": "^10.4.0", - "typescript": "~4.5.4", + "typescript": "~4.6.4", "yarn-lock-check": "^1.0.5" }, "prettier": "@spotify/prettier-config", diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts index eaa0ce0189..fa11903447 100644 --- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts +++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts @@ -163,14 +163,14 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog { async entities(request?: EntitiesRequest): Promise { const db = this.database; - let entitiesQuery = db('final_entities'); + let entitiesQuery = + db('final_entities').select('final_entities.*'); if (request?.filter) { entitiesQuery = parseFilter(request.filter, entitiesQuery, db); } // TODO: move final_entities to use entity_ref entitiesQuery = entitiesQuery - .select('final_entities.*') .whereNotNull('final_entities.final_entity') .orderBy('entity_id', 'asc'); diff --git a/yarn.lock b/yarn.lock index 24dfd6a6c0..62f4b84c21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24076,11 +24076,16 @@ typescript-json-schema@^0.53.0: typescript "~4.5.0" yargs "^17.1.1" -typescript@~4.5.0, typescript@~4.5.2, typescript@~4.5.4: +typescript@~4.5.0, typescript@~4.5.2: version "4.5.5" resolved "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== +typescript@~4.6.4: + version "4.6.4" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" + integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== + ua-parser-js@^0.7.18: version "0.7.28" resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"