From 02ab0a134e3aaad0a9350a8b28233dff8a616efa Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 22 Sep 2023 18:17:19 +0200 Subject: [PATCH 1/8] Update ts to 5.x --- package.json | 2 +- packages/backend-core/package.json | 2 +- packages/builder/package.json | 2 +- packages/cli/package.json | 2 +- packages/pro | 2 +- packages/server/package.json | 2 +- packages/shared-core/package.json | 3 +-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 2 +- qa-core/package.json | 2 +- yarn.lock | 8 ++++---- 12 files changed, 15 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 6df4105e25..68dd6360e0 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "rimraf": "^3.0.2", "rollup-plugin-replace": "^2.2.0", "svelte": "^3.38.2", - "typescript": "4.7.3", + "typescript": "5.2.2", "@babel/core": "^7.22.5", "@babel/eslint-parser": "^7.22.5", "@babel/preset-env": "^7.22.5", diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 739469b49a..1c94163d93 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -87,7 +87,7 @@ "timekeeper": "2.2.0", "ts-node": "10.8.1", "tsconfig-paths": "4.0.0", - "typescript": "4.7.3" + "typescript": "5.2.2" }, "nx": { "targets": { diff --git a/packages/builder/package.json b/packages/builder/package.json index 43f1ae3bff..a53f3509cf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -108,7 +108,7 @@ "svelte-jester": "^1.3.2", "ts-node": "10.8.1", "tsconfig-paths": "4.0.0", - "typescript": "4.7.3", + "typescript": "5.2.2", "vite": "^3.0.8", "vite-plugin-static-copy": "^0.16.0", "vitest": "^0.29.2" diff --git a/packages/cli/package.json b/packages/cli/package.json index 6d4d78b7d7..04eeb523cd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -62,6 +62,6 @@ "eslint": "^7.20.0", "renamer": "^4.0.0", "ts-node": "^10.9.1", - "typescript": "4.7.3" + "typescript": "5.2.2" } } diff --git a/packages/pro b/packages/pro index 4638ae916e..c1bf60cb8f 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 4638ae916e55ce89166095578cbd01745d0ee9ee +Subproject commit c1bf60cb8f00b488082db4a2fc50528e8c2d3469 diff --git a/packages/server/package.json b/packages/server/package.json index 8851237d8e..4d60d61331 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -174,7 +174,7 @@ "timekeeper": "2.2.0", "ts-node": "10.8.1", "tsconfig-paths": "4.0.0", - "typescript": "4.7.3", + "typescript": "5.2.2", "update-dotenv": "1.1.1" }, "optionalDependencies": { diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 160a42f086..9d03df21e0 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -19,7 +19,7 @@ "devDependencies": { "concurrently": "^7.6.0", "rimraf": "3.0.2", - "typescript": "4.7.3" + "typescript": "5.2.2" }, "nx": { "targets": { @@ -43,7 +43,6 @@ } ] } - } } } diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aee60f4732..317b0fc3af 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -45,6 +45,6 @@ "rollup-plugin-node-globals": "^1.4.0", "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-terser": "^7.0.2", - "typescript": "4.7.3" + "typescript": "5.2.2" } } diff --git a/packages/types/package.json b/packages/types/package.json index df49ec3cea..ad190bb1a6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -24,7 +24,7 @@ "concurrently": "^7.6.0", "koa-body": "4.2.0", "rimraf": "3.0.2", - "typescript": "4.7.3" + "typescript": "5.2.2" }, "dependencies": { "scim-patch": "^0.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a1344d89e3..efb22d97f8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -100,7 +100,7 @@ "timekeeper": "2.2.0", "ts-node": "10.8.1", "tsconfig-paths": "4.0.0", - "typescript": "4.7.3", + "typescript": "5.2.2", "update-dotenv": "1.1.1" }, "nx": { diff --git a/qa-core/package.json b/qa-core/package.json index 4954991f67..3c789d89e6 100644 --- a/qa-core/package.json +++ b/qa-core/package.json @@ -38,7 +38,7 @@ "ts-jest": "29.1.1", "ts-node": "10.8.1", "tsconfig-paths": "4.0.0", - "typescript": "4.7.3" + "typescript": "5.2.2" }, "dependencies": { "@budibase/backend-core": "^2.3.17", diff --git a/yarn.lock b/yarn.lock index d777dca0bd..bdb71ef06b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24120,10 +24120,10 @@ typeof@^1.0.0: resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440" integrity sha512-Pze0mIxYXhaJdpw1ayMzOA7rtGr1OmsTY/Z+FWtRKIqXFz6aoDLjqdbWE/tcIBSC8nhnVXiRrEXujodR/xiFAA== -typescript@4.7.3: - version "4.7.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" - integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +typescript@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" + integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== "typescript@>=3 < 6": version "5.0.4" From 124ff401595cdfcbc75e9532d99b52f06874f5b1 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 22 Sep 2023 18:24:00 +0200 Subject: [PATCH 2/8] Fix types --- packages/cli/src/plugins/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/plugins/index.ts b/packages/cli/src/plugins/index.ts index 45e024be7f..c29de2a297 100644 --- a/packages/cli/src/plugins/index.ts +++ b/packages/cli/src/plugins/index.ts @@ -49,8 +49,8 @@ async function askAboutTopLevel(name: string) { } } -async function init(opts: PluginOpts) { - const type = opts["init"] || (opts as PluginType) +async function init(opts: PluginOpts | PluginType) { + const type = (opts as PluginOpts).init || (opts as PluginType) if (!type || !PLUGIN_TYPE_ARR.includes(type)) { console.log( error( From aee590bbba0f6b4c376f532c2e18f6bbd9a4d487 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 25 Sep 2023 09:42:48 +0200 Subject: [PATCH 3/8] Update lint --- package.json | 2 +- packages/server/package.json | 1 - packages/worker/package.json | 1 - yarn.lock | 81 +++++++++++++++++++++--------------- 4 files changed, 48 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 68dd6360e0..d758888eab 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "@esbuild-plugins/tsconfig-paths": "^0.1.2", "@nx/js": "16.4.3", "@rollup/plugin-json": "^4.0.2", - "@typescript-eslint/parser": "5.45.0", + "@typescript-eslint/parser": "6.7.2", "esbuild": "^0.18.17", "esbuild-node-externals": "^1.8.0", "eslint": "^8.44.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4d60d61331..c4d4f883b7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -153,7 +153,6 @@ "@types/server-destroy": "1.0.1", "@types/supertest": "2.0.12", "@types/tar": "6.1.5", - "@typescript-eslint/parser": "5.45.0", "apidoc": "0.50.4", "babel-jest": "29.6.2", "copyfiles": "2.4.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index efb22d97f8..4d1f1581b8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -88,7 +88,6 @@ "@types/server-destroy": "1.0.1", "@types/supertest": "2.0.12", "@types/uuid": "8.3.4", - "@typescript-eslint/parser": "5.45.0", "copyfiles": "2.4.1", "eslint": "6.8.0", "jest": "29.6.2", diff --git a/yarn.lock b/yarn.lock index bdb71ef06b..34441ee45f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6696,51 +6696,52 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/parser@5.45.0": - version "5.45.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e" - integrity sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ== +"@typescript-eslint/parser@6.7.2": + version "6.7.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.2.tgz#e0ae93771441b9518e67d0660c79e3a105497af4" + integrity sha512-KA3E4ox0ws+SPyxQf9iSI25R6b4Ne78ORhNHeVKrPQnoYsb9UhieoiRoJgrzgEeKGOXhcY1i8YtOeCHHTDa6Fw== dependencies: - "@typescript-eslint/scope-manager" "5.45.0" - "@typescript-eslint/types" "5.45.0" - "@typescript-eslint/typescript-estree" "5.45.0" + "@typescript-eslint/scope-manager" "6.7.2" + "@typescript-eslint/types" "6.7.2" + "@typescript-eslint/typescript-estree" "6.7.2" + "@typescript-eslint/visitor-keys" "6.7.2" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.45.0": - version "5.45.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz#7a4ac1bfa9544bff3f620ab85947945938319a96" - integrity sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw== +"@typescript-eslint/scope-manager@6.7.2": + version "6.7.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.2.tgz#cf59a2095d2f894770c94be489648ad1c78dc689" + integrity sha512-bgi6plgyZjEqapr7u2mhxGR6E8WCzKNUFWNh6fkpVe9+yzRZeYtDTbsIBzKbcxI+r1qVWt6VIoMSNZ4r2A+6Yw== dependencies: - "@typescript-eslint/types" "5.45.0" - "@typescript-eslint/visitor-keys" "5.45.0" + "@typescript-eslint/types" "6.7.2" + "@typescript-eslint/visitor-keys" "6.7.2" "@typescript-eslint/types@4.33.0": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== -"@typescript-eslint/types@5.45.0": - version "5.45.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5" - integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA== - "@typescript-eslint/types@5.53.0": version "5.53.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f" integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A== -"@typescript-eslint/typescript-estree@5.45.0": - version "5.45.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d" - integrity sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ== +"@typescript-eslint/types@6.7.2": + version "6.7.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.2.tgz#75a615a6dbeca09cafd102fe7f465da1d8a3c066" + integrity sha512-flJYwMYgnUNDAN9/GAI3l8+wTmvTYdv64fcH8aoJK76Y+1FCZ08RtI5zDerM/FYT5DMkAc+19E4aLmd5KqdFyg== + +"@typescript-eslint/typescript-estree@6.7.2": + version "6.7.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.2.tgz#ce5883c23b581a5caf878af641e49dd0349238c7" + integrity sha512-kiJKVMLkoSciGyFU0TOY0fRxnp9qq1AzVOHNeN1+B9erKFCJ4Z8WdjAkKQPP+b1pWStGFqezMLltxO+308dJTQ== dependencies: - "@typescript-eslint/types" "5.45.0" - "@typescript-eslint/visitor-keys" "5.45.0" + "@typescript-eslint/types" "6.7.2" + "@typescript-eslint/visitor-keys" "6.7.2" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" + semver "^7.5.4" + ts-api-utils "^1.0.1" "@typescript-eslint/typescript-estree@^4.33.0": version "4.33.0" @@ -6776,14 +6777,6 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" -"@typescript-eslint/visitor-keys@5.45.0": - version "5.45.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz#e0d160e9e7fdb7f8da697a5b78e7a14a22a70528" - integrity sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg== - dependencies: - "@typescript-eslint/types" "5.45.0" - eslint-visitor-keys "^3.3.0" - "@typescript-eslint/visitor-keys@5.53.0": version "5.53.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f" @@ -6792,6 +6785,14 @@ "@typescript-eslint/types" "5.53.0" eslint-visitor-keys "^3.3.0" +"@typescript-eslint/visitor-keys@6.7.2": + version "6.7.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.2.tgz#4cb2bd786f1f459731b0ad1584c9f73e1c7a4d5c" + integrity sha512-uVw9VIMFBUTz8rIeaUT3fFe8xIUx8r4ywAdlQv1ifH+6acn/XF8Y6rwJ7XNmkNMDrTW+7+vxFFPIF40nJCVsMQ== + dependencies: + "@typescript-eslint/types" "6.7.2" + eslint-visitor-keys "^3.4.1" + "@vitest/expect@0.29.8": version "0.29.8" resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.29.8.tgz#6ecdd031b4ea8414717d10b65ccd800908384612" @@ -21927,6 +21928,13 @@ semver@^7.3.2, semver@^7.3.7, semver@^7.3.8: dependencies: lru-cache "^6.0.0" +semver@^7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" @@ -23882,6 +23890,11 @@ triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== +ts-api-utils@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" + integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== + ts-graphviz@^1.5.0: version "1.5.4" resolved "https://registry.yarnpkg.com/ts-graphviz/-/ts-graphviz-1.5.4.tgz#61a3059afeac4f6d4be3c6729a4d88546ca9e095" From 2530ebda2bfd5e75bdff87ed5eb083c646826010 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 25 Sep 2023 09:48:27 +0200 Subject: [PATCH 4/8] Fix tests --- .../backend-core/tests/core/utilities/structures/users.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/backend-core/tests/core/utilities/structures/users.ts b/packages/backend-core/tests/core/utilities/structures/users.ts index 420a9fde0e..66d23696e0 100644 --- a/packages/backend-core/tests/core/utilities/structures/users.ts +++ b/packages/backend-core/tests/core/utilities/structures/users.ts @@ -10,14 +10,13 @@ import { authDetails } from "./sso" import { uuid } from "./common" import { generator } from "./generator" import { tenant } from "." -import { generateGlobalUserID } from "../../../../src/docIds" export const newEmail = () => { return `${uuid()}@test.com` } export const user = (userProps?: Partial>): User => { - const userId = userProps?._id || generateGlobalUserID() + const userId = userProps?._id return { _id: userId, userId, @@ -53,7 +52,7 @@ export const adminOnlyUser = (userProps?: any): AdminOnlyUser => { } } -export const builderUser = (userProps?: any): BuilderUser => { +export const builderUser = (userProps?: Partial): BuilderUser => { return { ...user(userProps), builder: { From 4cd7be52aea146fd5af64343653249e573fafcb4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 25 Sep 2023 17:46:29 +0200 Subject: [PATCH 5/8] Update pro --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index c1bf60cb8f..3c51e0938e 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit c1bf60cb8f00b488082db4a2fc50528e8c2d3469 +Subproject commit 3c51e0938e2226038f4456bb8c96d857310b8d0c From 2142a847431b25978c5ba410673d7e41334faa47 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 25 Sep 2023 17:24:31 +0100 Subject: [PATCH 6/8] send PR number to deploys --- .github/workflows/deploy-featurebranch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml index 75b6907732..f06707ab2b 100644 --- a/.github/workflows/deploy-featurebranch.yml +++ b/.github/workflows/deploy-featurebranch.yml @@ -13,6 +13,7 @@ jobs: - uses: passeidireto/trigger-external-workflow-action@main env: PAYLOAD_BRANCH: ${{ github.head_ref }} + PAYLOAD_PR_NUMBER: ${{ github.ref }} with: repository: budibase/budibase-deploys event: featurebranch-qa-deploy From ae7d5634cc1223fc6db127dd90dda89f1294118e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 25 Sep 2023 16:24:51 +0000 Subject: [PATCH 7/8] Bump version to 2.10.12-alpha.9 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 4c72d139a4..710b8e4596 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.10.12-alpha.8", + "version": "2.10.12-alpha.9", "npmClient": "yarn", "packages": [ "packages/*" From b7eb5847fd16057a9b748948d7ad6885f6a56dad Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 25 Sep 2023 16:49:13 +0000 Subject: [PATCH 8/8] Bump version to 2.10.12-alpha.10 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 710b8e4596..be8d247eb1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.10.12-alpha.9", + "version": "2.10.12-alpha.10", "npmClient": "yarn", "packages": [ "packages/*"