From ba485edc23e32b26ecf21314769634bf8d7eafb6 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 22 Mar 2022 11:41:15 +0100 Subject: [PATCH] chore: reworking knex package Signed-off-by: blam --- .changeset/fair-dingos-glow.md | 10 ++++++++-- packages/backend/package.json | 4 +--- packages/cli/src/lib/role/packageRoles.test.ts | 1 - .../default-app/packages/backend/package.json.hbs | 4 +--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.changeset/fair-dingos-glow.md b/.changeset/fair-dingos-glow.md index 76bb05edfb..569f7a3fab 100644 --- a/.changeset/fair-dingos-glow.md +++ b/.changeset/fair-dingos-glow.md @@ -2,12 +2,18 @@ '@backstage/create-app': patch --- -Bump `knex` package that is installed in the `packages/backend` package to `^1.0.2`. You can make the following change in your `packages/backend/package.json` if you wish to apply this change. +Remove the `knex` package that is installed in the `packages/backend` as it's provided by the `@backstage/*` packages for you automatically. You can make the following change in your `packages/backend/package.json` if you wish to apply this change. + +```diff + "lint": "backstage-cli package lint", + "test": "backstage-cli package test", + "clean": "backstage-cli package clean", +- "migrate:create": "knex migrate:make -x ts" +``` ```diff "express": "^4.17.1", "express-promise-router": "^4.1.0", - "knex": "^0.21.6", -+ "knex": "^1.0.2", "pg": "^8.3.0", ``` diff --git a/packages/backend/package.json b/packages/backend/package.json index 544dea0451..dce782e972 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -23,8 +23,7 @@ "lint": "backstage-cli package lint", "test": "backstage-cli package test", "clean": "backstage-cli package clean", - "build-image": "docker build ../.. -f Dockerfile --tag example-backend", - "migrate:create": "knex migrate:make -x ts" + "build-image": "docker build ../.. -f Dockerfile --tag example-backend" }, "dependencies": { "@backstage/backend-common": "^0.13.1", @@ -69,7 +68,6 @@ "express": "^4.17.1", "express-promise-router": "^4.1.0", "express-prom-bundle": "^6.3.6", - "knex": "^1.0.2", "pg": "^8.3.0", "pg-connection-string": "^2.3.0", "prom-client": "^14.0.1", diff --git a/packages/cli/src/lib/role/packageRoles.test.ts b/packages/cli/src/lib/role/packageRoles.test.ts index 759be462d2..2772d263f1 100644 --- a/packages/cli/src/lib/role/packageRoles.test.ts +++ b/packages/cli/src/lib/role/packageRoles.test.ts @@ -152,7 +152,6 @@ describe('detectRoleFromPackage', () => { lint: 'backstage-cli lint', test: 'backstage-cli test', clean: 'backstage-cli clean', - 'migrate:create': 'knex migrate:make -x ts', }, }), ).toEqual('backend'); diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs index dc4827c1f6..cd4d3e1222 100644 --- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs @@ -13,8 +13,7 @@ "lint": "backstage-cli package lint", "test": "backstage-cli package test", "clean": "backstage-cli package clean", - "build-image": "docker build ../.. -f Dockerfile --tag backstage", - "migrate:create": "knex migrate:make -x ts" + "build-image": "docker build ../.. -f Dockerfile --tag backstage" }, "dependencies": { "app": "link:../app", @@ -41,7 +40,6 @@ "dockerode": "^3.3.1", "express": "^4.17.1", "express-promise-router": "^4.1.0", - "knex": "^1.0.2", {{#if dbTypePG}} "pg": "^8.3.0", {{/if}}