From f4f70220d232bb4f52dbc436e9fa8f5ca1bdeab5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 11:49:52 +0100 Subject: [PATCH 01/25] Monorepo package versions to * --- package.json | 8 ++++---- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 6 +++--- packages/client/package.json | 10 +++++----- packages/frontend-core/package.json | 6 +++--- packages/pro | 2 +- packages/server/package.json | 14 +++++++------- packages/shared-core/package.json | 2 +- packages/worker/package.json | 10 +++++----- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 2e9a2cc9af..3ccba61a71 100644 --- a/package.json +++ b/package.json @@ -99,10 +99,10 @@ ] }, "resolutions": { - "@budibase/backend-core": "0.0.0", - "@budibase/shared-core": "0.0.0", - "@budibase/string-templates": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/backend-core": "*", + "@budibase/shared-core": "*", + "@budibase/string-templates": "*", + "@budibase/types": "*", "@budibase/pro": "npm:@budibase/pro@latest", "tough-cookie": "4.1.3", "node-fetch": "2.6.7", diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3248fd8ceb..b2cb1ba526 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -31,8 +31,8 @@ "dependencies": { "@budibase/nano": "10.1.5", "@budibase/pouchdb-replication-stream": "1.2.11", - "@budibase/shared-core": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/shared-core": "*", + "@budibase/types": "*", "@techpass/passport-openidconnect": "0.3.3", "aws-cloudfront-sign": "3.0.2", "aws-sdk": "2.1692.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 35f6676fdc..89f72bc46d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -29,8 +29,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "0.0.0", - "@budibase/string-templates": "0.0.0", + "@budibase/shared-core": "*", + "@budibase/string-templates": "*", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index c98e817486..485cced7ab 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -48,11 +48,11 @@ ] }, "dependencies": { - "@budibase/bbui": "0.0.0", - "@budibase/frontend-core": "0.0.0", - "@budibase/shared-core": "0.0.0", - "@budibase/string-templates": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/bbui": "*", + "@budibase/frontend-core": "*", + "@budibase/shared-core": "*", + "@budibase/string-templates": "*", + "@budibase/types": "*", "@codemirror/autocomplete": "^6.7.1", "@codemirror/commands": "^6.2.4", "@codemirror/lang-javascript": "^6.1.8", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8efdcc7816..2d5f3b47ef 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -15,9 +15,9 @@ "start": "ts-node ./src/index.ts" }, "dependencies": { - "@budibase/backend-core": "0.0.0", - "@budibase/string-templates": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/backend-core": "*", + "@budibase/string-templates": "*", + "@budibase/types": "*", "chalk": "4.1.0", "cli-progress": "3.11.2", "commander": "7.1.0", diff --git a/packages/client/package.json b/packages/client/package.json index 073869415d..23d75f5fd1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,11 +19,11 @@ "dev": "vite build --watch" }, "dependencies": { - "@budibase/bbui": "0.0.0", - "@budibase/frontend-core": "0.0.0", - "@budibase/shared-core": "0.0.0", - "@budibase/string-templates": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/bbui": "*", + "@budibase/frontend-core": "*", + "@budibase/shared-core": "*", + "@budibase/string-templates": "*", + "@budibase/types": "*", "@spectrum-css/card": "3.0.3", "apexcharts": "^3.48.0", "dayjs": "^1.10.8", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2eed29f77c..44ffd6580f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,9 +6,9 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "0.0.0", - "@budibase/shared-core": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/bbui": "*", + "@budibase/shared-core": "*", + "@budibase/types": "*", "dayjs": "^1.10.8", "lodash": "4.17.21", "shortid": "2.2.15", diff --git a/packages/pro b/packages/pro index 7b8789efd9..bbef2952d5 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 7b8789efd940d9f8e5be9927243b19f07361c445 +Subproject commit bbef2952d51ce5a592cf1d537ab2a7cc433c6c8c diff --git a/packages/server/package.json b/packages/server/package.json index 63d7ed3a9a..0c7afdfe23 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -51,14 +51,14 @@ "dependencies": { "@apidevtools/swagger-parser": "10.0.3", "@azure/msal-node": "^2.5.1", - "@budibase/backend-core": "0.0.0", - "@budibase/client": "0.0.0", - "@budibase/frontend-core": "0.0.0", + "@budibase/backend-core": "*", + "@budibase/client": "*", + "@budibase/frontend-core": "*", "@budibase/nano": "10.1.5", - "@budibase/pro": "0.0.0", - "@budibase/shared-core": "0.0.0", - "@budibase/string-templates": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/pro": "*", + "@budibase/shared-core": "*", + "@budibase/string-templates": "*", + "@budibase/types": "*", "@bull-board/api": "5.10.2", "@bull-board/koa": "5.10.2", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index da74d090b6..7c5c7aabbb 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -16,7 +16,7 @@ "test:watch": "yarn test --watchAll" }, "dependencies": { - "@budibase/types": "0.0.0", + "@budibase/types": "*", "cron-validate": "1.4.5" }, "devDependencies": { diff --git a/packages/worker/package.json b/packages/worker/package.json index 36c88a9a49..9038b0c4f5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,11 +38,11 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "0.0.0", - "@budibase/pro": "0.0.0", - "@budibase/shared-core": "0.0.0", - "@budibase/string-templates": "0.0.0", - "@budibase/types": "0.0.0", + "@budibase/backend-core": "*", + "@budibase/pro": "*", + "@budibase/shared-core": "*", + "@budibase/string-templates": "*", + "@budibase/types": "*", "@koa/router": "13.1.0", "@techpass/passport-openidconnect": "0.3.3", "@types/global-agent": "2.1.1", From 8cfe886d465fa925f9ebb47386137da4e2b9dab8 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 12:01:14 +0100 Subject: [PATCH 02/25] Add base tsconfig.build.json --- nx.json | 3 ++- tsconfig.build.json | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tsconfig.build.json diff --git a/nx.json b/nx.json index 22b23a7874..a71ee6961c 100644 --- a/nx.json +++ b/nx.json @@ -12,7 +12,8 @@ "inputs": [ "{workspaceRoot}/scripts/*", "{workspaceRoot}/lerna.json", - "{workspaceRoot}/.github/workflows/*" + "{workspaceRoot}/.github/workflows/*", + "{workspaceRoot}/tsconfig.build.json" ] }, "test": { diff --git a/tsconfig.build.json b/tsconfig.build.json new file mode 100644 index 0000000000..022e0ae76d --- /dev/null +++ b/tsconfig.build.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "lib": ["es2020"], + "strict": true, + "noImplicitAny": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "declaration": true, + "isolatedModules": true + }, + "exclude": [] +} From 17910271507e00e87eb0a9120bd3b352b2cab24a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 12:08:52 +0100 Subject: [PATCH 03/25] Use base tsconfig --- packages/types/tsconfig.build.json | 17 +++-------------- packages/types/tsconfig.json | 6 +----- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index 1e289260e4..3c2699efee 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -1,19 +1,8 @@ { + "extends": "../../tsconfig.build.json", "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": ["es2020"], - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "sourceMap": true, - "declaration": true, - "skipLibCheck": true, - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo" + "outDir": "dist" }, "include": ["src/**/*"], - "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.js"] + "exclude": ["node_modules", "dist"] } diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index ad5356c2dc..d8faaf5080 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -1,7 +1,3 @@ { - "extends": "./tsconfig.build.json", - "compilerOptions": { - "composite": true - }, - "exclude": ["node_modules", "dist"] + "extends": "./tsconfig.build.json" } From 9272e170bea8ee3ec70107c71bb87f455ba5bc1c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 12:17:10 +0100 Subject: [PATCH 04/25] Run dev without building types --- packages/client/package.json | 3 +-- packages/pro | 2 +- packages/shared-core/package.json | 10 ---------- packages/types/package.json | 1 - 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/packages/client/package.json b/packages/client/package.json index 23d75f5fd1..6b9131dac0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -62,8 +62,7 @@ { "projects": [ "@budibase/shared-core", - "@budibase/string-templates", - "@budibase/types" + "@budibase/string-templates" ], "target": "build" } diff --git a/packages/pro b/packages/pro index bbef2952d5..ef5c39d488 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit bbef2952d51ce5a592cf1d537ab2a7cc433c6c8c +Subproject commit ef5c39d48843cd0c2e8b72b08a89a35ee380a214 diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 7c5c7aabbb..395bf420c4 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -34,16 +34,6 @@ "target": "build" } ] - }, - "dev": { - "dependsOn": [ - { - "projects": [ - "@budibase/types" - ], - "target": "build" - } - ] } } } diff --git a/packages/types/package.json b/packages/types/package.json index ae99d31838..ac01e06da3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -10,7 +10,6 @@ "prebuild": "rimraf dist/", "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", - "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020" }, "jest": {}, From 9f72e285f74de735ffe56a5c40d4a79fbc1f39c6 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 12:43:50 +0100 Subject: [PATCH 05/25] Run dev without building types --- packages/backend-core/package.json | 16 +--------------- packages/client/package.json | 1 - packages/server/package.json | 2 +- packages/shared-core/package.json | 14 -------------- packages/worker/package.json | 2 +- 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b2cb1ba526..d089a166a6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -23,6 +23,7 @@ "prepack": "cp package.json dist", "build": "tsc -p tsconfig.build.json --paths null && node ./scripts/build.js", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", + "build:oss": "node ./scripts/build.js", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", "check:dependencies": "node ../../scripts/depcheck.js", "test": "bash scripts/test.sh", @@ -94,20 +95,5 @@ "testcontainers": "^10.7.2", "timekeeper": "2.2.0", "typescript": "5.5.2" - }, - "nx": { - "targets": { - "build": { - "dependsOn": [ - { - "projects": [ - "@budibase/shared-core", - "@budibase/types" - ], - "target": "build" - } - ] - } - } } } diff --git a/packages/client/package.json b/packages/client/package.json index 6b9131dac0..7c266bba1d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -61,7 +61,6 @@ "dependsOn": [ { "projects": [ - "@budibase/shared-core", "@budibase/string-templates" ], "target": "build" diff --git a/packages/server/package.json b/packages/server/package.json index 0c7afdfe23..f8b8b30488 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -188,7 +188,7 @@ "projects": [ "@budibase/backend-core" ], - "target": "build" + "target": "build:oss" } ] }, diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 395bf420c4..e7b98e469b 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -22,19 +22,5 @@ "devDependencies": { "rimraf": "3.0.2", "typescript": "5.5.2" - }, - "nx": { - "targets": { - "build": { - "dependsOn": [ - { - "projects": [ - "@budibase/types" - ], - "target": "build" - } - ] - } - } } } diff --git a/packages/worker/package.json b/packages/worker/package.json index 9038b0c4f5..68bddd1128 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -109,7 +109,7 @@ "projects": [ "@budibase/backend-core" ], - "target": "build" + "target": "build:oss" } ] } From 7f3dab40bf177bc31fdeb3e3b78a18ac30c1f42b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 12:51:23 +0100 Subject: [PATCH 06/25] Run dev without building shared-core --- packages/shared-core/package.json | 1 - packages/shared-core/tsconfig.build.json | 20 +++----------------- packages/types/tsconfig.build.json | 1 + tsconfig.build.json | 11 ++++++++++- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index e7b98e469b..c532a74b8f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -10,7 +10,6 @@ "prebuild": "rimraf dist/", "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", - "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", "test": "jest", "test:watch": "yarn test --watchAll" diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json index c1d5bc96e8..9598938197 100644 --- a/packages/shared-core/tsconfig.build.json +++ b/packages/shared-core/tsconfig.build.json @@ -1,22 +1,8 @@ { + "extends": "../../tsconfig.build.json", "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": ["es2020"], - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "sourceMap": true, - "declaration": true, - "types": ["node"], - "outDir": "dist", - "skipLibCheck": true, - "paths": { - "@budibase/types": ["../types/src"] - }, - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo" + "rootDir": "src/", + "outDir": "dist" }, "include": ["src/**/*.ts"], "exclude": ["**/*.spec.ts", "**/*.spec.js", "__mocks__", "src/tests"] diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index 3c2699efee..34c2b771c3 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { + "rootDir": "src/", "outDir": "dist" }, "include": ["src/**/*"], diff --git a/tsconfig.build.json b/tsconfig.build.json index 022e0ae76d..3efd5f56b6 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -9,7 +9,16 @@ "resolveJsonModule": true, "skipLibCheck": true, "declaration": true, - "isolatedModules": true + "isolatedModules": true, + "paths": { + "@budibase/types": ["packages/types/src"], + "@budibase/backend-core": ["packages/backend-core/src"], + "@budibase/backend-core/*": ["packages/backend-core/*"], + "@budibase/shared-core": ["packages/shared-core/src"], + "@budibase/pro": ["packages/pro/src"], + "@budibase/string-templates": ["packages/string-templates/src"], + "@budibase/string-templates/*": ["packages/string-templates/*"] + } }, "exclude": [] } From d0b61ebd7dac0d18dae6163f2b4a0e87b25c19fd Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 13:01:47 +0100 Subject: [PATCH 07/25] Reuse tsconfig.json --- packages/string-templates/.npmignore | 2 +- packages/string-templates/rollup.config.js | 4 +++- packages/string-templates/tsconfig.json | 16 +++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/string-templates/.npmignore b/packages/string-templates/.npmignore index fb547825eb..5eb98cf496 100644 --- a/packages/string-templates/.npmignore +++ b/packages/string-templates/.npmignore @@ -1,4 +1,4 @@ * !dist/**/* -dist/tsconfig.build.tsbuildinfo +dist/tsconfig.tsbuildinfo !package.json \ No newline at end of file diff --git a/packages/string-templates/rollup.config.js b/packages/string-templates/rollup.config.js index b745e97d91..5f76376711 100644 --- a/packages/string-templates/rollup.config.js +++ b/packages/string-templates/rollup.config.js @@ -24,7 +24,9 @@ const config = (input, outputFile, format) => ({ warn(warning) }, plugins: [ - typescript(), + typescript({ + moduleResolution: "node", + }), resolve({ preferBuiltins: true, browser: true, diff --git a/packages/string-templates/tsconfig.json b/packages/string-templates/tsconfig.json index 7fc13ace8e..a3d8890deb 100644 --- a/packages/string-templates/tsconfig.json +++ b/packages/string-templates/tsconfig.json @@ -1,15 +1,9 @@ { - "include": ["src/**/*"], + "extends": "../../tsconfig.build.json", "compilerOptions": { - "declaration": true, - "target": "es6", - "moduleResolution": "node", - "noImplicitAny": true, - "incremental": true, "lib": ["dom"], - "outDir": "dist", - "esModuleInterop": true, - "types": ["node", "jest"], - "resolveJsonModule": true - } + "baseUrl": ".", + "outDir": "dist" + }, + "include": ["src/**/*"] } From 0af85d9c89a657eb86cb9b11af78a022384deb4d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 13:10:19 +0100 Subject: [PATCH 08/25] Fix trailing --- tsconfig.build.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tsconfig.build.json b/tsconfig.build.json index 3efd5f56b6..29bad4c5a0 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -11,13 +11,13 @@ "declaration": true, "isolatedModules": true, "paths": { - "@budibase/types": ["packages/types/src"], - "@budibase/backend-core": ["packages/backend-core/src"], - "@budibase/backend-core/*": ["packages/backend-core/*"], - "@budibase/shared-core": ["packages/shared-core/src"], - "@budibase/pro": ["packages/pro/src"], - "@budibase/string-templates": ["packages/string-templates/src"], - "@budibase/string-templates/*": ["packages/string-templates/*"] + "@budibase/types": ["./packages/types/src"], + "@budibase/backend-core": ["./packages/backend-core/src"], + "@budibase/backend-core/*": ["./packages/backend-core/*"], + "@budibase/shared-core": ["./packages/shared-core/src"], + "@budibase/pro": ["./packages/pro/src"], + "@budibase/string-templates": ["./packages/string-templates/src"], + "@budibase/string-templates/*": ["./packages/string-templates/*"] } }, "exclude": [] From 150548461a981ab48df2617b88362fc5e3809e1d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 14:16:45 +0100 Subject: [PATCH 09/25] Fix build --- packages/shared-core/package.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index c532a74b8f..83cc3d0974 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -21,5 +21,19 @@ "devDependencies": { "rimraf": "3.0.2", "typescript": "5.5.2" + }, + "nx": { + "targets": { + "build": { + "dependsOn": [ + { + "projects": [ + "@budibase/types" + ], + "target": "build" + } + ] + } + } } } From 317a6511467209326a6a878a6be22e4da4902143 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 14:25:17 +0100 Subject: [PATCH 10/25] Add types dep to build --- packages/backend-core/package.json | 15 +++++++++++++++ packages/pro | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d089a166a6..85d401de8c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -95,5 +95,20 @@ "testcontainers": "^10.7.2", "timekeeper": "2.2.0", "typescript": "5.5.2" + }, + "nx": { + "targets": { + "build": { + "dependsOn": [ + { + "projects": [ + "@budibase/shared-core", + "@budibase/types" + ], + "target": "build" + } + ] + } + } } } diff --git a/packages/pro b/packages/pro index ef5c39d488..fdcf810756 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit ef5c39d48843cd0c2e8b72b08a89a35ee380a214 +Subproject commit fdcf810756ffdc3d9363cc783bfb827cc65b2715 From 7a119cbd8910f1685eddf05c167349d05c91dc8a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 14:29:16 +0100 Subject: [PATCH 11/25] Use base tsconfig in backend-core --- packages/backend-core/tsconfig.build.json | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/packages/backend-core/tsconfig.build.json b/packages/backend-core/tsconfig.build.json index c714f4d942..a5ffd6956a 100644 --- a/packages/backend-core/tsconfig.build.json +++ b/packages/backend-core/tsconfig.build.json @@ -1,23 +1,5 @@ { - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": ["es2020"], - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "sourceMap": true, - "declaration": true, - "types": ["node", "jest"], - "outDir": "dist", - "skipLibCheck": true, - "paths": { - "@budibase/types": ["../types/src"], - "@budibase/shared-core": ["../shared-core/src"] - } - }, + "extends": "../../tsconfig.build.json", "include": ["**/*.js", "**/*.ts"], "exclude": [ "node_modules", From 7701d2bb59e655eea80c0c40d51f5516c518ab9e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 14:31:53 +0100 Subject: [PATCH 12/25] Use base tsconfig in builder --- packages/builder/tsconfig.build.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/packages/builder/tsconfig.build.json b/packages/builder/tsconfig.build.json index ca1316f83c..506a50fc27 100644 --- a/packages/builder/tsconfig.build.json +++ b/packages/builder/tsconfig.build.json @@ -1,17 +1,5 @@ { - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": ["es2019"], - "allowJs": true, - "outDir": "dist", - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "skipLibCheck": true - }, + "extends": "../../tsconfig.build.json", "include": ["./src/**/*"], "exclude": ["node_modules", "**/*.json", "**/*.spec.ts", "**/*.spec.js"] } From 07570261a2f26d51e60f311c9ea0d06deefabbe4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 14:32:31 +0100 Subject: [PATCH 13/25] Use base tsconfig in cli --- packages/cli/tsconfig.build.json | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json index e52d886194..68ab2d45f9 100644 --- a/packages/cli/tsconfig.build.json +++ b/packages/cli/tsconfig.build.json @@ -1,25 +1,5 @@ { - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": ["es2020"], - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "types": ["node", "jest"], - "outDir": "dist", - "skipLibCheck": true, - "baseUrl": ".", - "paths": { - "@budibase/types": ["../types/src"], - "@budibase/backend-core": ["../backend-core/src"], - "@budibase/backend-core/*": ["../backend-core/*"], - "@budibase/shared-core": ["../shared-core/src"], - "@budibase/string-templates": ["../string-templates/src"] - } - }, + "extends": "../../tsconfig.build.json", "include": ["src/**/*"], "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.js"] } From 3d5f276304db8bf1c5747c5408318e72bb0feffc Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 14:33:39 +0100 Subject: [PATCH 14/25] Use base tsconfig in pro --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index fdcf810756..278179b45e 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit fdcf810756ffdc3d9363cc783bfb827cc65b2715 +Subproject commit 278179b45e303c44c4f496bfaa7b338f19af8b44 From 9bf7098c7de530d37337b60b29df55dde80b6776 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 15:59:43 +0100 Subject: [PATCH 15/25] Fix exports --- packages/backend-core/src/events/processors/types.ts | 2 +- packages/backend-core/src/queue/queue.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/events/processors/types.ts b/packages/backend-core/src/events/processors/types.ts index 5256a1bc62..714bf0ef4e 100644 --- a/packages/backend-core/src/events/processors/types.ts +++ b/packages/backend-core/src/events/processors/types.ts @@ -1 +1 @@ -export { EventProcessor } from "@budibase/types" +export type { EventProcessor } from "@budibase/types" diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts index f5d710f02d..4e1086823b 100644 --- a/packages/backend-core/src/queue/queue.ts +++ b/packages/backend-core/src/queue/queue.ts @@ -7,7 +7,7 @@ import { addListeners, StalledFn } from "./listeners" import { Duration } from "../utils" import * as timers from "../timers" -export { QueueOptions, Queue, JobOptions } from "bull" +export type { QueueOptions, Queue, JobOptions } from "bull" // the queue lock is held for 5 minutes const QUEUE_LOCK_MS = Duration.fromMinutes(5).toMs() From 79b5238d9fa84ec2a80e92f166163b2a443922d3 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 16:04:23 +0100 Subject: [PATCH 16/25] Fix backend-core build --- packages/backend-core/package.json | 2 +- packages/backend-core/tsconfig.build.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 85d401de8c..32eb4c03a3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -21,7 +21,7 @@ "scripts": { "prebuild": "rimraf dist/", "prepack": "cp package.json dist", - "build": "tsc -p tsconfig.build.json --paths null && node ./scripts/build.js", + "build": "node ./scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "build:oss": "node ./scripts/build.js", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", diff --git a/packages/backend-core/tsconfig.build.json b/packages/backend-core/tsconfig.build.json index a5ffd6956a..45652a0354 100644 --- a/packages/backend-core/tsconfig.build.json +++ b/packages/backend-core/tsconfig.build.json @@ -1,6 +1,8 @@ { "extends": "../../tsconfig.build.json", - "include": ["**/*.js", "**/*.ts"], + "compilerOptions": { + "outDir": "dist" + }, "exclude": [ "node_modules", "dist", From bc31be6ef1aa0e94236ec08494d4372f35840226 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 17:09:05 +0100 Subject: [PATCH 17/25] Use base tsconfig in server --- package.json | 1 + packages/server/tsconfig.build.json | 25 +------------------------ packages/server/tsconfig.json | 5 ----- scripts/build.js | 7 +++++-- yarn.lock | 12 ++++++++---- 5 files changed, 15 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 3ccba61a71..24c05fac17 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "husky": "^8.0.3", "kill-port": "^1.6.1", "lerna": "7.4.2", + "load-tsconfig": "^0.2.5", "madge": "^6.0.0", "nx-cloud": "16.0.5", "prettier": "2.8.8", diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index c4b9b8788e..77026b8258 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -1,28 +1,5 @@ { - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": ["es2020"], - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "types": ["node", "jest"], - "outDir": "dist/src", - "skipLibCheck": true, - "baseUrl": ".", - "paths": { - "@budibase/types": ["../types/src"], - "@budibase/backend-core": ["../backend-core/src"], - "@budibase/backend-core/*": ["../backend-core/*"], - "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/src"], - "@budibase/string-templates": ["../string-templates/src"], - "@budibase/string-templates/*": ["../string-templates/*"] - }, - "allowArbitraryExtensions": true - }, + "extends": "../../tsconfig.build.json", "include": ["src/**/*"], "exclude": [ "node_modules", diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 9d633c6455..c962785810 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -1,10 +1,5 @@ { "extends": "./tsconfig.build.json", - "compilerOptions": { - "lib": ["es2020", "dom"], - "composite": true, - "baseUrl": "." - }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true diff --git a/scripts/build.js b/scripts/build.js index 93a2a1e589..8ea6b49023 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -8,6 +8,7 @@ const path = require("path") const { build } = require("esbuild") const { compile } = require("svelte/compiler") +const { loadTsConfig } = require("load-tsconfig") const { default: TsconfigPathsPlugin, @@ -47,8 +48,10 @@ var { argv } = require("yargs") async function runBuild(entry, outfile) { const isDev = process.env.NODE_ENV !== "production" const tsconfig = argv["p"] || `tsconfig.build.json` - const tsconfigPathPluginContent = JSON.parse( - fs.readFileSync(tsconfig, "utf-8") + + const { data: tsconfigPathPluginContent } = loadTsConfig( + process.cwd(), + tsconfig ) const sharedConfig = { diff --git a/yarn.lock b/yarn.lock index acfa2984ca..8a228db081 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2201,8 +2201,8 @@ dependencies: "@budibase/nano" "10.1.5" "@budibase/pouchdb-replication-stream" "1.2.11" - "@budibase/shared-core" "0.0.0" - "@budibase/types" "0.0.0" + "@budibase/shared-core" "*" + "@budibase/types" "*" "@techpass/passport-openidconnect" "0.3.3" aws-cloudfront-sign "3.0.2" aws-sdk "2.1692.0" @@ -2304,7 +2304,7 @@ "@budibase/shared-core@3.2.16": version "0.0.0" dependencies: - "@budibase/types" "0.0.0" + "@budibase/types" "*" cron-validate "1.4.5" "@budibase/string-templates@3.2.16": @@ -2319,7 +2319,6 @@ version "0.0.0" dependencies: scim-patch "^0.8.1" - zod "^3.23.8" "@bull-board/api@5.10.2": version "5.10.2" @@ -14625,6 +14624,11 @@ load-json-file@^4.0.0: pify "^3.0.0" strip-bom "^3.0.0" +load-tsconfig@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.5.tgz#453b8cd8961bfb912dea77eb6c168fe8cca3d3a1" + integrity sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg== + local-pkg@^0.4.2: version "0.4.3" resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963" From 1049127c9b94bc50624dec823659d06813fbf9e1 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 17:11:54 +0100 Subject: [PATCH 18/25] Fix dev --- tsconfig.build.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.build.json b/tsconfig.build.json index 29bad4c5a0..b783612353 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -10,6 +10,7 @@ "skipLibCheck": true, "declaration": true, "isolatedModules": true, + "baseUrl": ".", "paths": { "@budibase/types": ["./packages/types/src"], "@budibase/backend-core": ["./packages/backend-core/src"], From 38b988bb29dc7eced29f85f3bf6010de6e8c0dcd Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 5 Dec 2024 17:41:09 +0100 Subject: [PATCH 19/25] Use base tsconfig in worker --- packages/worker/tsconfig.build.json | 22 +--------------------- packages/worker/tsconfig.json | 4 ---- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json index f38f31fe67..e8e3cb0847 100644 --- a/packages/worker/tsconfig.build.json +++ b/packages/worker/tsconfig.build.json @@ -1,25 +1,5 @@ { - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": ["es2020"], - "strict": true, - "noImplicitAny": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "incremental": true, - "types": ["node", "jest"], - "outDir": "dist", - "skipLibCheck": true, - "paths": { - "@budibase/types": ["../types/src"], - "@budibase/backend-core": ["../backend-core/src"], - "@budibase/backend-core/*": ["../backend-core/*"], - "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/src"], - "@budibase/string-templates": ["../string-templates/src"] - } - }, + "extends": "../../tsconfig.build.json", "include": ["src/**/*"], "exclude": [ "node_modules", diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index a02147aa81..475cf6edda 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -1,9 +1,5 @@ { "extends": "./tsconfig.build.json", - "compilerOptions": { - "composite": true, - "baseUrl": "." - }, "ts-node": { "require": ["tsconfig-paths/register"] }, From 59e406cb827234aed546375749df3dde0cbf3727 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Dec 2024 10:13:04 +0100 Subject: [PATCH 20/25] Add extra paths --- tsconfig.build.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.build.json b/tsconfig.build.json index b783612353..d51625a34f 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -18,7 +18,8 @@ "@budibase/shared-core": ["./packages/shared-core/src"], "@budibase/pro": ["./packages/pro/src"], "@budibase/string-templates": ["./packages/string-templates/src"], - "@budibase/string-templates/*": ["./packages/string-templates/*"] + "@budibase/string-templates/*": ["./packages/string-templates/*"], + "@budibase/frontend-core": ["./packages/frontend-core/src"] } }, "exclude": [] From bea39bc873ce9ff85dae9daf6268067203ec7d0d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Dec 2024 11:25:44 +0100 Subject: [PATCH 21/25] Fix check:types --- packages/builder/tsconfig.build.json | 3 +++ .../server/src/api/routes/tests/queries/generic-sql.spec.ts | 2 +- .../server/src/api/routes/tests/utilities/TestFunctions.ts | 2 +- packages/server/tsconfig.build.json | 4 ++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/builder/tsconfig.build.json b/packages/builder/tsconfig.build.json index 506a50fc27..119fe56c81 100644 --- a/packages/builder/tsconfig.build.json +++ b/packages/builder/tsconfig.build.json @@ -1,5 +1,8 @@ { "extends": "../../tsconfig.build.json", + "compilerOptions": { + "allowJs": true + }, "include": ["./src/**/*"], "exclude": ["node_modules", "**/*.json", "**/*.spec.ts", "**/*.spec.js"] } diff --git a/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts b/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts index e7ddc0df22..13dd1b719b 100644 --- a/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts +++ b/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts @@ -3,7 +3,7 @@ import { DatabaseName, datasourceDescribe, } from "../../../../integrations/tests/utils" -import { Expectations } from "src/tests/utilities/api/base" +import { Expectations } from "../../../../tests/utilities/api/base" import { events } from "@budibase/backend-core" import { Knex } from "knex" import { generator } from "@budibase/backend-core/tests" diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts index 6fa9e054b9..9d5417d041 100644 --- a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts +++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts @@ -4,7 +4,7 @@ import { AppStatus } from "../../../../db/utils" import { roles, tenancy, context, db } from "@budibase/backend-core" import env from "../../../../environment" import Nano from "@budibase/nano" -import TestConfiguration from "src/tests/utilities/TestConfiguration" +import TestConfiguration from "../../../../tests/utilities/TestConfiguration" class Request { appId: any diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index 77026b8258..f4a11a9de9 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.build.json", + "compilerOptions": { + "allowArbitraryExtensions": true, + "isolatedModules": false + }, "include": ["src/**/*"], "exclude": [ "node_modules", From 788831efb033047594acb7c053f6e63571f60597 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Dec 2024 11:27:39 +0100 Subject: [PATCH 22/25] Update pro submodule --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 278179b45e..b13412544d 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 278179b45e303c44c4f496bfaa7b338f19af8b44 +Subproject commit b13412544db0cca6e55bc3ef0079ff88a97b94d6 From 66cd757c2715b1644ef8a40e3360a09c553ad473 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Dec 2024 12:44:49 +0100 Subject: [PATCH 23/25] Unify node types --- examples/nextjs-api-sales/package.json | 2 +- examples/nextjs-api-sales/yarn.lock | 23 +- package.json | 2 +- packages/backend-core/package.json | 3 +- packages/cli/package.json | 2 +- packages/pro | 2 +- packages/server/package.json | 3 +- packages/shared-core/package.json | 2 +- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 3 +- yarn.lock | 478 +++---------------------- 12 files changed, 84 insertions(+), 440 deletions(-) diff --git a/examples/nextjs-api-sales/package.json b/examples/nextjs-api-sales/package.json index 21c548c6cc..1f4335462b 100644 --- a/examples/nextjs-api-sales/package.json +++ b/examples/nextjs-api-sales/package.json @@ -18,7 +18,7 @@ "react-notifications-component": "^3.4.1" }, "devDependencies": { - "@types/node": "17.0.21", + "@types/node": "^20.17.9", "@types/react": "17.0.39", "eslint": "8.10.0", "eslint-config-next": "12.1.0", diff --git a/examples/nextjs-api-sales/yarn.lock b/examples/nextjs-api-sales/yarn.lock index 867835a6b7..d4ba8a29a5 100644 --- a/examples/nextjs-api-sales/yarn.lock +++ b/examples/nextjs-api-sales/yarn.lock @@ -147,10 +147,12 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/node@17.0.21": - version "17.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" - integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== +"@types/node@^20.17.9": + version "20.17.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.9.tgz#5f141d4b7ee125cdee5faefe28de095398865bab" + integrity sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw== + dependencies: + undici-types "~6.19.2" "@types/prop-types@*": version "15.7.4" @@ -1746,10 +1748,10 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -typescript@5.5.2: - version "5.5.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507" - integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew== +typescript@5.7.2: + version "5.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6" + integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg== unbox-primitive@^1.0.1: version "1.0.1" @@ -1761,6 +1763,11 @@ unbox-primitive@^1.0.1: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" diff --git a/package.json b/package.json index 32888cf056..2b23df6ab7 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@babel/eslint-parser": "^7.22.5", "@babel/preset-env": "^7.22.5", "@esbuild-plugins/tsconfig-paths": "^0.1.2", - "@types/node": "20.10.0", + "@types/node": "^20.17.9", "@types/proper-lockfile": "^4.1.4", "@typescript-eslint/parser": "6.9.0", "cross-spawn": "7.0.6", diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b669c885cb..3e1b5f324b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -24,7 +24,7 @@ "build": "node ./scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "build:oss": "node ./scripts/build.js", - "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", + "check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:dependencies": "node ../../scripts/depcheck.js", "test": "bash scripts/test.sh", "test:watch": "jest --watchAll" @@ -77,7 +77,6 @@ "@types/cookies": "0.7.8", "@types/jest": "29.5.5", "@types/lodash": "4.14.200", - "@types/node": "^22.9.0", "@types/node-fetch": "2.6.4", "@types/pouchdb": "6.4.2", "@types/redlock": "4.0.7", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8545ae90a6..927824a522 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -11,7 +11,7 @@ "scripts": { "tsc": "node ../../scripts/build.js", "build": "yarn tsc", - "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", + "check:types": "tsc -p tsconfig.json --noEmit --paths null", "start": "ts-node ./src/index.ts" }, "dependencies": { diff --git a/packages/pro b/packages/pro index b13412544d..c22f82b908 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit b13412544db0cca6e55bc3ef0079ff88a97b94d6 +Subproject commit c22f82b908664a1624b43646547822221bf05bc1 diff --git a/packages/server/package.json b/packages/server/package.json index 67da1aa8b4..1dd3df1d73 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -12,7 +12,7 @@ "prebuild": "rimraf dist/", "build": "node ./scripts/build.js", "postbuild": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client && copyfiles -f ../../yarn.lock ./dist/", - "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", + "check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:dependencies": "node ../../scripts/depcheck.js", "build:isolated-vm-lib:snippets": "esbuild --minify --bundle src/jsRunner/bundles/snippets.ts --outfile=src/jsRunner/bundles/snippets.ivm.bundle.js --platform=node --format=iife --global-name=snippets", "build:isolated-vm-lib:string-templates": "esbuild --minify --bundle src/jsRunner/bundles/index-helpers.ts --outfile=src/jsRunner/bundles/index-helpers.ivm.bundle.js --platform=node --format=iife --external:handlebars --global-name=helpers", @@ -147,7 +147,6 @@ "@types/koa__router": "12.0.4", "@types/lodash": "4.14.200", "@types/mssql": "9.1.5", - "@types/node": "^22.9.0", "@types/node-fetch": "2.6.4", "@types/oracledb": "6.5.1", "@types/pg": "8.6.6", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index b30db9f0d8..d76849c9a2 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -10,7 +10,7 @@ "prebuild": "rimraf dist/", "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", - "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", + "check:types": "tsc -p tsconfig.json --noEmit --paths null", "test": "jest", "test:watch": "yarn test --watchAll" }, diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6891aee490..7256bdde0d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -17,7 +17,7 @@ "scripts": { "build": "tsc --emitDeclarationOnly && rollup -c", "dev": "rollup -cw", - "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", + "check:types": "tsc -p tsconfig.json --noEmit --paths null", "test": "jest", "manifest": "ts-node ./scripts/gen-collection-info.ts" }, diff --git a/packages/types/package.json b/packages/types/package.json index 9fc8ca4953..9be5c8460b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -10,7 +10,7 @@ "prebuild": "rimraf dist/", "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", - "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020" + "check:types": "tsc -p tsconfig.json --noEmit --paths null" }, "jest": {}, "devDependencies": { diff --git a/packages/worker/package.json b/packages/worker/package.json index d1ca44225f..ff21d88ac0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -15,7 +15,7 @@ "prebuild": "rimraf dist/", "build": "node ../../scripts/build.js", "postbuild": "copyfiles -f ../../yarn.lock ./dist/", - "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020", + "check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:dependencies": "node ../../scripts/depcheck.js", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "run:docker": "node dist/index.js", @@ -85,7 +85,6 @@ "@types/koa": "2.13.4", "@types/koa__router": "12.0.4", "@types/lodash": "4.14.200", - "@types/node": "^22.9.0", "@types/node-fetch": "2.6.4", "@types/server-destroy": "1.0.1", "@types/supertest": "2.0.14", diff --git a/yarn.lock b/yarn.lock index dcc26d202a..88691df5a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -706,16 +706,7 @@ dependencies: tslib "^2.6.2" -"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.5.0.tgz#a41848c5c31cb3b7c84c409885267d55a2c92e44" - integrity sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw== - dependencies: - "@azure/abort-controller" "^1.0.0" - "@azure/core-util" "^1.1.0" - tslib "^2.2.0" - -"@azure/core-auth@^1.5.0", "@azure/core-auth@^1.7.2", "@azure/core-auth@^1.8.0": +"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0", "@azure/core-auth@^1.5.0", "@azure/core-auth@^1.7.2", "@azure/core-auth@^1.8.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.9.0.tgz#ac725b03fabe3c892371065ee9e2041bee0fd1ac" integrity sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw== @@ -782,7 +773,7 @@ dependencies: tslib "^2.2.0" -"@azure/core-rest-pipeline@^1.1.0": +"@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.3.0", "@azure/core-rest-pipeline@^1.8.0", "@azure/core-rest-pipeline@^1.9.1": version "1.18.0" resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.18.0.tgz#165f1cd9bb1060be3b6895742db3d1f1106271d3" integrity sha512-QSoGUp4Eq/gohEFNJaUOwTN7BCc2nHTjjbm75JT0aD7W65PWM1H/tItz0GsABn22uaKyGxiMhWQLt2r+FGU89Q== @@ -796,21 +787,6 @@ https-proxy-agent "^7.0.0" tslib "^2.6.2" -"@azure/core-rest-pipeline@^1.3.0", "@azure/core-rest-pipeline@^1.8.0", "@azure/core-rest-pipeline@^1.9.1": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.11.0.tgz#fc0e8f56caac08a9d4ac91c07a6c5a360ea31c82" - integrity sha512-nB4KXl6qAyJmBVLWA7SakT4tzpYZTCk4pvRBeI+Ye0WYSOrlTqlMhc4MSS/8atD3ufeYWdkN380LLoXlUUzThw== - dependencies: - "@azure/abort-controller" "^1.0.0" - "@azure/core-auth" "^1.4.0" - "@azure/core-tracing" "^1.0.1" - "@azure/core-util" "^1.3.0" - "@azure/logger" "^1.0.0" - form-data "^4.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - tslib "^2.2.0" - "@azure/core-tracing@1.0.0-preview.13": version "1.0.0-preview.13" resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644" @@ -826,15 +802,7 @@ dependencies: tslib "^2.2.0" -"@azure/core-util@^1.0.0", "@azure/core-util@^1.1.0", "@azure/core-util@^1.3.0", "@azure/core-util@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.6.1.tgz#fea221c4fa43c26543bccf799beb30c1c7878f5a" - integrity sha512-h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ== - dependencies: - "@azure/abort-controller" "^1.0.0" - tslib "^2.2.0" - -"@azure/core-util@^1.1.1", "@azure/core-util@^1.11.0": +"@azure/core-util@^1.0.0", "@azure/core-util@^1.1.1", "@azure/core-util@^1.11.0", "@azure/core-util@^1.3.0", "@azure/core-util@^1.6.1": version "1.11.0" resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.11.0.tgz#f530fc67e738aea872fbdd1cc8416e70219fada7" integrity sha512-DxOSLua+NdpWoSqULhjDyAZTXFdP/LKkqtYuxxz1SCN289zk3OG8UOpnCQAz/tygyACBtWp/BoO72ptK7msY8g== @@ -921,15 +889,7 @@ events "^3.0.0" tslib "^2.2.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== - dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" - -"@babel/code-frame@^7.25.9": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.25.9": version "7.26.2" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== @@ -973,17 +933,7 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.1" -"@babel/generator@^7.22.5", "@babel/generator@^7.23.6", "@babel/generator@^7.7.2": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" - integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== - dependencies: - "@babel/types" "^7.23.6" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/generator@^7.25.9": +"@babel/generator@^7.22.5", "@babel/generator@^7.25.9", "@babel/generator@^7.7.2": version "7.26.2" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f" integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw== @@ -1067,12 +1017,12 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5": +"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.5": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== -"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0": +"@babel/helper-function-name@^7.22.5": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== @@ -1163,29 +1113,19 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@^7.22.5", "@babel/helper-split-export-declaration@^7.22.6": +"@babel/helper-split-export-declaration@^7.22.5": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== - "@babel/helper-string-parser@^7.25.9": version "7.25.9" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== -"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/helper-validator-identifier@^7.25.9": +"@babel/helper-validator-identifier@^7.22.5", "@babel/helper-validator-identifier@^7.25.9": version "7.25.9" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== @@ -1214,21 +1154,7 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== - dependencies: - "@babel/helper-validator-identifier" "^7.22.20" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.5", "@babel/parser@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" - integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== - -"@babel/parser@^7.23.0", "@babel/parser@^7.25.3", "@babel/parser@^7.25.9", "@babel/parser@^7.26.2": +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5", "@babel/parser@^7.23.0", "@babel/parser@^7.25.3", "@babel/parser@^7.25.9", "@babel/parser@^7.26.2": version "7.26.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11" integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ== @@ -2122,16 +2048,7 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.3.3": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" - integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== - dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/parser" "^7.22.15" - "@babel/types" "^7.22.15" - -"@babel/template@^7.25.9": +"@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.25.9", "@babel/template@^7.3.3": version "7.25.9" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== @@ -2140,23 +2057,7 @@ "@babel/parser" "^7.25.9" "@babel/types" "^7.25.9" -"@babel/traverse@^7.22.5": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" - integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== - dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.6" - "@babel/types" "^7.23.6" - debug "^4.3.1" - globals "^11.1.0" - -"@babel/traverse@^7.23.2": +"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2": version "7.25.9" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84" integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw== @@ -2169,16 +2070,7 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" - integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== - dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" - -"@babel/types@^7.25.9", "@babel/types@^7.26.0": +"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.26.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff" integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA== @@ -3370,7 +3262,7 @@ "@jimp/types" "1.1.4" tinycolor2 "^1.6.0" -"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5": +"@jridgewell/gen-mapping@^0.3.5": version "0.3.5" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== @@ -3410,7 +3302,7 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -5729,7 +5621,7 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node-fetch@^2.5.0": +"@types/node-fetch@^2.5.0", "@types/node-fetch@^2.6.4": version "2.6.12" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.12.tgz#8ab5c3ef8330f13100a7479e2cd56d3386830a03" integrity sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA== @@ -5737,40 +5629,18 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node-fetch@^2.6.4": - version "2.6.11" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" - integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g== - dependencies: - "@types/node" "*" - form-data "^4.0.0" - -"@types/node@*", "@types/node@>=10.0.0", "@types/node@>=13.13.4", "@types/node@>=13.7.0": - version "22.5.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560" - integrity sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw== - dependencies: - undici-types "~6.19.2" - -"@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@20.10.0": - version "20.10.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.0.tgz#16ddf9c0a72b832ec4fcce35b8249cf149214617" - integrity sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ== - dependencies: - undici-types "~5.26.4" - -"@types/node@>=18", "@types/node@^22.9.0": +"@types/node@*", "@types/node@>=10.0.0", "@types/node@>=13.13.4", "@types/node@>=13.7.0", "@types/node@>=18": version "22.9.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.1.tgz#bdf91c36e0e7ecfb7257b2d75bf1b206b308ca71" integrity sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg== dependencies: undici-types "~6.19.8" +"@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@>=8.0.0 <15": version "14.18.37" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.37.tgz#0bfcd173e8e1e328337473a8317e37b3b14fd30d" @@ -5788,12 +5658,12 @@ dependencies: undici-types "~5.26.4" -"@types/node@^20.4.5": - version "20.14.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.5.tgz#fe35e3022ebe58b8f201580eb24e1fcfc0f2487d" - integrity sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA== +"@types/node@^20.17.9", "@types/node@^20.4.5": + version "20.17.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.9.tgz#5f141d4b7ee125cdee5faefe28de095398865bab" + integrity sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw== dependencies: - undici-types "~5.26.4" + undici-types "~6.19.2" "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -7450,12 +7320,7 @@ big-integer@^1.6.43: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85" integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg== -bignumber.js@^9.0.0: - version "9.1.1" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6" - integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig== - -bignumber.js@^9.1.2: +bignumber.js@^9.0.0, bignumber.js@^9.1.2: version "9.1.2" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== @@ -7673,12 +7538,7 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -bson@^6.7.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/bson/-/bson-6.8.0.tgz#5063c41ba2437c2b8ff851b50d9e36cb7aaa7525" - integrity sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ== - -bson@^6.9.0: +bson@^6.7.0, bson@^6.9.0: version "6.10.0" resolved "https://registry.yarnpkg.com/bson/-/bson-6.10.0.tgz#559c767cc8b605c3ab14e5896214c8f2abdd6a12" integrity sha512-ROchNosXMJD2cbQGm84KoP7vOGPO6/bOAW0veMMbzhXLqoZptcaYRVLitwvuhwhjjpU1qP4YZRWLhgETdgqUQw== @@ -8797,7 +8657,7 @@ cron-validate@1.4.5: dependencies: yup "0.32.9" -cross-spawn@7.0.6: +cross-spawn@7.0.6, cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.6" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== @@ -8806,15 +8666,6 @@ cross-spawn@7.0.6: shebang-command "^2.0.0" which "^2.0.1" -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -9083,12 +8934,12 @@ dd-trace@5.26.0: shell-quote "^1.8.1" tlhunter-sorted-set "^0.1.0" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4: - version "4.3.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" - integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== +debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4: + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== dependencies: - ms "2.1.2" + ms "^2.1.3" debug@4.3.4: version "4.3.4" @@ -9104,13 +8955,6 @@ debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.3.5: - version "4.3.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" - integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== - dependencies: - ms "^2.1.3" - debuglog@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -9308,7 +9152,7 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: +define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -9829,17 +9673,7 @@ duplexer@^0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@^4.0.0, duplexify@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0" - integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw== - dependencies: - end-of-stream "^1.4.1" - inherits "^2.0.3" - readable-stream "^3.1.1" - stream-shift "^1.0.0" - -duplexify@^4.1.3: +duplexify@^4.0.0, duplexify@^4.1.2, duplexify@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.3.tgz#a07e1c0d0a2c001158563d32592ba58bddb0236f" integrity sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA== @@ -10067,59 +9901,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0: - version "1.23.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" - integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== - dependencies: - array-buffer-byte-length "^1.0.1" - arraybuffer.prototype.slice "^1.0.3" - available-typed-arrays "^1.0.7" - call-bind "^1.0.7" - data-view-buffer "^1.0.1" - data-view-byte-length "^1.0.1" - data-view-byte-offset "^1.0.0" - es-define-property "^1.0.0" - es-errors "^1.3.0" - es-object-atoms "^1.0.0" - es-set-tostringtag "^2.0.3" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.6" - get-intrinsic "^1.2.4" - get-symbol-description "^1.0.2" - globalthis "^1.0.3" - gopd "^1.0.1" - has-property-descriptors "^1.0.2" - has-proto "^1.0.3" - has-symbols "^1.0.3" - hasown "^2.0.2" - internal-slot "^1.0.7" - is-array-buffer "^3.0.4" - is-callable "^1.2.7" - is-data-view "^1.0.1" - is-negative-zero "^2.0.3" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.3" - is-string "^1.0.7" - is-typed-array "^1.1.13" - is-weakref "^1.0.2" - object-inspect "^1.13.1" - object-keys "^1.1.1" - object.assign "^4.1.5" - regexp.prototype.flags "^1.5.2" - safe-array-concat "^1.1.2" - safe-regex-test "^1.0.3" - string.prototype.trim "^1.2.9" - string.prototype.trimend "^1.0.8" - string.prototype.trimstart "^1.0.8" - typed-array-buffer "^1.0.2" - typed-array-byte-length "^1.0.1" - typed-array-byte-offset "^1.0.2" - typed-array-length "^1.0.6" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.15" - -es-abstract@^1.23.3: +es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.3: version "1.23.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.5.tgz#f4599a4946d57ed467515ed10e4f157289cd52fb" integrity sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ== @@ -11271,18 +11053,7 @@ gaxios@^5.0.0, gaxios@^5.0.1: is-stream "^2.0.0" node-fetch "^2.6.9" -gaxios@^6.0.0, gaxios@^6.1.1: - version "6.7.0" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.0.tgz#37b7c5961cb67d8d4b0ae8110dcd83cc6791eb6d" - integrity sha512-DSrkyMTfAnAm4ks9Go20QGOcXEyW/NmZhvTYBU2rb4afBB393WIMQPWPEDMl/k8xqiNN9HYq2zao3oWXsdl2Tg== - dependencies: - extend "^3.0.2" - https-proxy-agent "^7.0.1" - is-stream "^2.0.0" - node-fetch "^2.6.9" - uuid "^10.0.0" - -gaxios@^6.0.2: +gaxios@^6.0.0, gaxios@^6.0.2, gaxios@^6.1.1: version "6.7.1" resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.1.tgz#ebd9f7093ede3ba502685e73390248bb5b7f71fb" integrity sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ== @@ -11686,14 +11457,7 @@ globals@^13.19.0: dependencies: type-fest "^0.20.2" -globalthis@^1.0.1, globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -globalthis@^1.0.4: +globalthis@^1.0.1, globalthis@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== @@ -11745,19 +11509,7 @@ google-auth-library@^8.0.1: jws "^4.0.0" lru-cache "^6.0.0" -google-auth-library@^9.3.0: - version "9.11.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.11.0.tgz#bd6da364bcde4e0cc4ed70a0e0df5112b6a671dd" - integrity sha512-epX3ww/mNnhl6tL45EQ/oixsY8JLEgUFoT4A5E/5iAR4esld9Kqv6IJGk7EmGuOgDvaarwF95hU2+v7Irql9lw== - dependencies: - base64-js "^1.3.0" - ecdsa-sig-formatter "^1.0.11" - gaxios "^6.1.1" - gcp-metadata "^6.1.0" - gtoken "^7.0.0" - jws "^4.0.0" - -google-auth-library@^9.6.3: +google-auth-library@^9.3.0, google-auth-library@^9.6.3: version "9.15.0" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.15.0.tgz#1b009c08557929c881d72f953f17e839e91b009b" integrity sha512-7ccSEJFDFO7exFbO6NRyC+xH8/mZ1GZGG2xxx9iHxZWcjUjJpjWxIMw3cofAKcueZ6DATiukmmprD7yavQHOyQ== @@ -12644,20 +12396,13 @@ is-class-hotfix@~0.0.6: resolved "https://registry.yarnpkg.com/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz#a527d31fb23279281dde5f385c77b5de70a72435" integrity sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ== -is-core-module@^2.12.0: +is-core-module@^2.12.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-module@^2.8.1: version "2.15.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: hasown "^2.0.2" -is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-module@^2.8.1: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== - dependencies: - hasown "^2.0.0" - is-data-view@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" @@ -13743,11 +13488,6 @@ jsdom@^21.1.1: ws "^8.13.0" xml-name-validator "^4.0.0" -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - jsesc@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" @@ -14915,20 +14655,13 @@ magic-string@^0.26.7: dependencies: sourcemap-codec "^1.4.8" -magic-string@^0.30.11: +magic-string@^0.30.11, magic-string@^0.30.3, magic-string@^0.30.4: version "0.30.13" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.13.tgz#92438e3ff4946cf54f18247c981e5c161c46683c" integrity sha512-8rYBO+MsWkgjDSOvLomYnzhdwEG51olQ4zL5KXnNJWV5MNmrb4rTZdrtkhxjnD/QyZUqR/Z/XDsUs/4ej2nx0g== dependencies: "@jridgewell/sourcemap-codec" "^1.5.0" -magic-string@^0.30.3, magic-string@^0.30.4: - version "0.30.11" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.11.tgz#301a6f93b3e8c2cb13ac1a7a673492c0dfd12954" - integrity sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A== - dependencies: - "@jridgewell/sourcemap-codec" "^1.5.0" - make-dir@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e" @@ -15620,7 +15353,7 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nock@13.5.4, nock@^13.5.4: +nock@13.5.4: version "13.5.4" resolved "https://registry.yarnpkg.com/nock/-/nock-13.5.4.tgz#8918f0addc70a63736170fef7106a9721e0dc479" integrity sha512-yAyTfdeNJGGBFxWdzSKCBYxs5FxLbCg5X5Q4ets974hcQzG1+qCxvIyOo4j2Ry6MUlhWVMX4OoYDefAIIwupjw== @@ -15629,7 +15362,7 @@ nock@13.5.4, nock@^13.5.4: json-stringify-safe "^5.0.1" propagate "^2.0.0" -nock@^13.5.6: +nock@^13.5.4, nock@^13.5.6: version "13.5.6" resolved "https://registry.yarnpkg.com/nock/-/nock-13.5.6.tgz#5e693ec2300bbf603b61dae6df0225673e6c4997" integrity sha512-o2zOYiCpzRqSzPj0Zt/dQ/DqZeYoaQ7TUonc/xUPjCGl9WeHpNbxgVvOquXYAaJzI0M9BXV3HTzG0p8IUAbBTQ== @@ -16092,12 +15825,7 @@ object-hash@^3.0.0: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== -object-inspect@^1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" - integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== - -object-inspect@^1.13.3: +object-inspect@^1.13.1, object-inspect@^1.13.3: version "1.13.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a" integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA== @@ -16914,12 +16642,7 @@ pgpass@1.x: dependencies: split2 "^4.1.0" -picocolors@^1.0.0, picocolors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== - -picocolors@^1.1.1: +picocolors@^1.0.0, picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== @@ -17165,16 +16888,7 @@ postcss-values-parser@^6.0.2: is-url-superb "^4.0.0" quote-unquote "^1.0.0" -postcss@^8.1.7, postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.27, postcss@^8.4.29, postcss@^8.4.5: - version "8.4.41" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" - integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== - dependencies: - nanoid "^3.3.7" - picocolors "^1.0.1" - source-map-js "^1.2.0" - -postcss@^8.4.48: +postcss@^8.1.7, postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.27, postcss@^8.4.29, postcss@^8.4.48, postcss@^8.4.5: version "8.4.49" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19" integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA== @@ -18015,10 +17729,10 @@ readable-stream@1.1.14, readable-stream@^1.0.26-4, readable-stream@^1.0.27-1: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.1.tgz#f9f9b5f536920253b3d26e7660e7da4ccff9bb62" - integrity sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ== +"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0, readable-stream@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -18037,15 +17751,6 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" - integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - readable-stream@^4.0.0, readable-stream@^4.2.0: version "4.5.1" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.1.tgz#3f2e4e66eab45606ac8f31597b9edb80c13b12ab" @@ -18205,17 +17910,7 @@ regenerator-transform@^0.15.1: dependencies: "@babel/runtime" "^7.8.4" -regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" - integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== - dependencies: - call-bind "^1.0.6" - define-properties "^1.2.1" - es-errors "^1.3.0" - set-function-name "^2.0.1" - -regexp.prototype.flags@^1.5.3: +regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42" integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ== @@ -18830,7 +18525,7 @@ set-function-length@^1.2.1: gopd "^1.0.1" has-property-descriptors "^1.0.2" -set-function-name@^2.0.1, set-function-name@^2.0.2: +set-function-name@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== @@ -19122,12 +18817,7 @@ sort-keys@^2.0.0: dependencies: is-plain-obj "^1.0.0" -source-map-js@^1.0.1, source-map-js@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" - integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== - -source-map-js@^1.2.1: +source-map-js@^1.0.1, source-map-js@^1.2.0, source-map-js@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== @@ -19254,12 +18944,7 @@ split@^1.0.1: dependencies: through "2" -sprintf-js@^1.1.1, sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -sprintf-js@^1.1.3: +sprintf-js@^1.1.1, sprintf-js@^1.1.2, sprintf-js@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== @@ -19383,11 +19068,6 @@ stream-events@^1.0.5: dependencies: stubs "^3.0.0" -stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== - stream-shift@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b" @@ -19796,7 +19476,7 @@ svelte-spa-router@^4.0.1: dependencies: regexparam "2.0.2" -svelte@4.2.19: +svelte@4.2.19, svelte@^4.2.10: version "4.2.19" resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.19.tgz#4e6e84a8818e2cd04ae0255fcf395bc211e61d4c" integrity sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw== @@ -19816,26 +19496,6 @@ svelte@4.2.19: magic-string "^0.30.4" periscopic "^3.1.0" -svelte@^4.2.10: - version "4.2.12" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.12.tgz#13d98d2274d24d3ad216c8fdc801511171c70bb1" - integrity sha512-d8+wsh5TfPwqVzbm4/HCXC783/KPHV60NvwitJnyTA5lWn1elhXMNWhXGCJ7PwPa8qFUnyJNIyuIRt2mT0WMug== - dependencies: - "@ampproject/remapping" "^2.2.1" - "@jridgewell/sourcemap-codec" "^1.4.15" - "@jridgewell/trace-mapping" "^0.3.18" - "@types/estree" "^1.0.1" - acorn "^8.9.0" - aria-query "^5.3.0" - axobject-query "^4.0.0" - code-red "^1.0.3" - css-tree "^2.3.1" - estree-walker "^3.0.3" - is-reference "^3.0.1" - locate-character "^3.0.0" - magic-string "^0.30.4" - periscopic "^3.1.0" - svg.draggable.js@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" @@ -20229,11 +19889,6 @@ to-buffer@^1.1.1: resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - to-gfm-code-block@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" @@ -20415,12 +20070,7 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" - integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== - -tslib@^2.5.0: +tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0, tslib@^2.6.2: version "2.8.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== @@ -20612,16 +20262,11 @@ typescript-eslint@^7.3.1: "@typescript-eslint/parser" "7.18.0" "@typescript-eslint/utils" "7.18.0" -typescript@5.7.2: +typescript@5.7.2, "typescript@>=3 < 6": version "5.7.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6" integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg== -"typescript@>=3 < 6": - version "5.5.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" - integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== - typescript@^3.9.10, typescript@^3.9.5, typescript@^3.9.7: version "3.9.10" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" @@ -20926,11 +20571,6 @@ uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.1, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294" - integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ== - uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" From 53c28b5436376a809d265d0cef5ea2ab87939fed Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Dec 2024 12:48:52 +0100 Subject: [PATCH 24/25] Update worker and server es target --- packages/server/tsconfig.build.json | 1 + packages/worker/tsconfig.build.json | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index f4a11a9de9..d8ba3806b9 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { + "target": "es2020", "allowArbitraryExtensions": true, "isolatedModules": false }, diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json index e8e3cb0847..0a65525cfd 100644 --- a/packages/worker/tsconfig.build.json +++ b/packages/worker/tsconfig.build.json @@ -1,5 +1,8 @@ { "extends": "../../tsconfig.build.json", + "compilerOptions": { + "target": "es2020" + }, "include": ["src/**/*"], "exclude": [ "node_modules", From e296cf140fb0cabb5b568ed546cde4dd5ddfc911 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 9 Dec 2024 12:55:49 +0100 Subject: [PATCH 25/25] Fix check types --- packages/backend-core/src/environment.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 56d9cd6e10..954fdd4135 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -134,10 +134,10 @@ const environment = { BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT, JS_BCRYPT: process.env.JS_BCRYPT, JWT_SECRET: process.env.JWT_SECRET - ? createSecretKey(Buffer.from(process.env.JWT_SECRET)) + ? createSecretKey(process.env.JWT_SECRET, "utf8") : undefined, JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK - ? createSecretKey(Buffer.from(process.env.JWT_SECRET_FALLBACK)) + ? createSecretKey(process.env.JWT_SECRET_FALLBACK, "utf8") : undefined, ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, API_ENCRYPTION_KEY: getAPIEncryptionKey(),