From aca2d7be5b990aed7d5004b095a369e6104fa6a2 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 7 Sep 2023 09:54:17 +0200 Subject: [PATCH 1/8] Remove src and test from the backend-core npm --- packages/backend-core/.npmignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore index 30bba85ce8..fb547825eb 100644 --- a/packages/backend-core/.npmignore +++ b/packages/backend-core/.npmignore @@ -1,6 +1,4 @@ * !dist/**/* dist/tsconfig.build.tsbuildinfo -!package.json -!src/** -!tests/** \ No newline at end of file +!package.json \ No newline at end of file From f691987e65d22b5e6ec0048ab497a7fadef34952 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 7 Sep 2023 11:18:29 +0200 Subject: [PATCH 2/8] Update node types --- packages/backend-core/package.json | 4 ++-- packages/cli/package.json | 2 +- packages/pro | 2 +- packages/server/package.json | 4 ++-- packages/types/package.json | 2 +- packages/worker/package.json | 4 ++-- qa-core/package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index cf8d6fbe17..739469b49a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -68,8 +68,8 @@ "@types/jest": "29.5.3", "@types/koa": "2.13.4", "@types/lodash": "4.14.180", - "@types/node": "14.18.20", - "@types/node-fetch": "2.6.1", + "@types/node": "18.17.0", + "@types/node-fetch": "2.6.4", "@types/pouchdb": "6.4.0", "@types/redlock": "4.0.3", "@types/semver": "7.3.7", diff --git a/packages/cli/package.json b/packages/cli/package.json index a0c885657c..6d4d78b7d7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -56,7 +56,7 @@ "@swc/core": "1.3.71", "@swc/jest": "0.2.27", "@types/jest": "29.5.3", - "@types/node-fetch": "2.6.1", + "@types/node-fetch": "2.6.4", "@types/pouchdb": "^6.4.0", "copyfiles": "^2.4.1", "eslint": "^7.20.0", diff --git a/packages/pro b/packages/pro index 961d683794..7b58ca3f3c 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 961d683794442f615468d44b684e5a94633109eb +Subproject commit 7b58ca3f3c1e5d700b1af5d6c65b2fdf478f68ba diff --git a/packages/server/package.json b/packages/server/package.json index ecf31175dc..f3016fc38e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -144,8 +144,8 @@ "@types/koa__router": "8.0.8", "@types/lodash": "4.14.180", "@types/mssql": "8.1.2", - "@types/node": "14.18.20", - "@types/node-fetch": "2.6.1", + "@types/node": "18.17.0", + "@types/node-fetch": "2.6.4", "@types/oracledb": "5.2.2", "@types/pg": "8.6.6", "@types/pouchdb": "6.4.0", diff --git a/packages/types/package.json b/packages/types/package.json index bb0163ae13..ccc8e10440 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -18,7 +18,7 @@ "@budibase/nano": "10.1.2", "@types/json5": "2.2.0", "@types/koa": "2.13.4", - "@types/node": "14.18.20", + "@types/node": "18.17.0", "@types/pouchdb": "6.4.0", "@types/redlock": "4.0.3", "concurrently": "^7.6.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3b66df264e..472f2fa29c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -82,8 +82,8 @@ "@types/koa": "2.13.4", "@types/koa__router": "8.0.8", "@types/lodash": "^4.14.191", - "@types/node": "14.18.20", - "@types/node-fetch": "2.6.1", + "@types/node": "18.17.0", + "@types/node-fetch": "2.6.4", "@types/pouchdb": "6.4.0", "@types/server-destroy": "1.0.1", "@types/supertest": "2.0.12", diff --git a/qa-core/package.json b/qa-core/package.json index cfdf7a1ee5..4954991f67 100644 --- a/qa-core/package.json +++ b/qa-core/package.json @@ -26,7 +26,7 @@ "@budibase/types": "^2.3.17", "@trendyol/jest-testcontainers": "2.1.1", "@types/jest": "29.5.3", - "@types/node-fetch": "2.6.2", + "@types/node-fetch": "2.6.4", "chance": "1.1.8", "dotenv": "16.0.1", "jest": "29.6.2", @@ -43,6 +43,6 @@ "dependencies": { "@budibase/backend-core": "^2.3.17", "form-data": "^4.0.0", - "node-fetch": "2" + "node-fetch": "2.6.7" } } diff --git a/yarn.lock b/yarn.lock index 4f5e0db2e7..4ff6647627 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6301,10 +6301,10 @@ "@types/tedious" "*" tarn "^3.0.1" -"@types/node-fetch@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975" - integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA== +"@types/node-fetch@2.6.4": + version "2.6.4" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660" + integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg== dependencies: "@types/node" "*" form-data "^3.0.0" @@ -6322,16 +6322,16 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== -"@types/node@14.18.20": - version "14.18.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.20.tgz#268f028b36eaf51181c3300252f605488c4f0650" - integrity sha512-Q8KKwm9YqEmUBRsqJ2GWJDtXltBDxTdC4m5vTdXBolu2PeQh8LX+f6BTwU+OuXPu37fLxoN6gidqBmnky36FXA== - "@types/node@16.9.1": version "16.9.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== +"@types/node@18.17.0": + version "18.17.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz#35d44267a33dd46b49ee0f73d31b05fd7407e290" + integrity sha512-GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg== + "@types/node@>=10.0.0", "@types/node@>=12.12.47", "@types/node@>=13.13.4", "@types/node@>=13.7.0": version "18.14.5" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.5.tgz#4a13a6445862159303fc38586598a9396fc408b3" From f6d1344ea510e2da1ddefa4e91df5a74678e83fd Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 7 Sep 2023 19:49:55 +0200 Subject: [PATCH 3/8] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 7b58ca3f3c..140386c7ad 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 7b58ca3f3c1e5d700b1af5d6c65b2fdf478f68ba +Subproject commit 140386c7ad7e3d50bd361fc702e49b288c1747c2 From 847d8f0732693a3954f719f103adbfc228b77bb4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 7 Sep 2023 19:54:27 +0200 Subject: [PATCH 4/8] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 140386c7ad..4638ae916e 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 140386c7ad7e3d50bd361fc702e49b288c1747c2 +Subproject commit 4638ae916e55ce89166095578cbd01745d0ee9ee From 84fa6b2233d9ecbb36ee70acd29c1374d0de7c3d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Sep 2023 18:19:22 +0000 Subject: [PATCH 5/8] Bump version to 2.9.40-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index ec3b6411c6..b60b8cb9df 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.40-alpha.4", + "version": "2.9.40-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" From 449bb5003640430739c2a4a1992f1f301ae6521a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Sep 2023 18:50:48 +0000 Subject: [PATCH 6/8] Bump version to 2.9.40-alpha.6 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index b60b8cb9df..e8211f66b1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.40-alpha.5", + "version": "2.9.40-alpha.6", "npmClient": "yarn", "packages": [ "packages/*" From f61abd1f1dcf9363732b499cde22746b9feaf023 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 7 Sep 2023 21:14:38 +0100 Subject: [PATCH 7/8] Revert "Clean backend-core package" --- packages/backend-core/.npmignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore index fb547825eb..30bba85ce8 100644 --- a/packages/backend-core/.npmignore +++ b/packages/backend-core/.npmignore @@ -1,4 +1,6 @@ * !dist/**/* dist/tsconfig.build.tsbuildinfo -!package.json \ No newline at end of file +!package.json +!src/** +!tests/** \ No newline at end of file From 9b722b7be1d00d396310f5ed373caa9bc95720b2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Sep 2023 20:27:06 +0000 Subject: [PATCH 8/8] Bump version to 2.9.40-alpha.7 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e8211f66b1..1725c59154 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.40-alpha.6", + "version": "2.9.40-alpha.7", "npmClient": "yarn", "packages": [ "packages/*"