diff --git a/.vscode/launch.json b/.vscode/launch.json index 34951b6310..8cb49d5825 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -22,9 +22,16 @@ "name": "Budibase Worker", "type": "node", "request": "launch", - "program": "${workspaceFolder}/packages/worker/src/index.js", + "runtimeArgs": [ + "--nolazy", + "-r", + "ts-node/register/transpile-only" + ], + "args": [ + "${workspaceFolder}/packages/worker/src/index.ts" + ], "cwd": "${workspaceFolder}/packages/worker" - } + }, ], "compounds": [ { diff --git a/lerna.json b/lerna.json index 0a7c854275..de7de252e3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4b761b7d42..dcdd433e7b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index da87791608..52ce12f6c4 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.98-alpha.1", + "@budibase/string-templates": "^1.0.98-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 7b9f2fde9e..c0b649a959 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.98-alpha.1", - "@budibase/client": "^1.0.98-alpha.1", - "@budibase/frontend-core": "^1.0.98-alpha.1", - "@budibase/string-templates": "^1.0.98-alpha.1", + "@budibase/bbui": "^1.0.98-alpha.2", + "@budibase/client": "^1.0.98-alpha.2", + "@budibase/frontend-core": "^1.0.98-alpha.2", + "@budibase/string-templates": "^1.0.98-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a4648460ca..d9aec51ef4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index f557f45410..c7411e2668 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.98-alpha.1", - "@budibase/frontend-core": "^1.0.98-alpha.1", - "@budibase/string-templates": "^1.0.98-alpha.1", + "@budibase/bbui": "^1.0.98-alpha.2", + "@budibase/frontend-core": "^1.0.98-alpha.2", + "@budibase/string-templates": "^1.0.98-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 0825a6ebec..6d2e354e45 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.98-alpha.1", + "@budibase/bbui": "^1.0.98-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index a0e82a48f9..0fe12ca874 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,9 +68,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.98-alpha.1", - "@budibase/client": "^1.0.98-alpha.1", - "@budibase/string-templates": "^1.0.98-alpha.1", + "@budibase/backend-core": "^1.0.98-alpha.2", + "@budibase/client": "^1.0.98-alpha.2", + "@budibase/string-templates": "^1.0.98-alpha.2", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f73aa588ee..3d4e79b54e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/.vscode/launch.json b/packages/worker/.vscode/launch.json index 7417938376..a07cf96b80 100644 --- a/packages/worker/.vscode/launch.json +++ b/packages/worker/.vscode/launch.json @@ -5,10 +5,13 @@ "version": "0.2.0", "configurations": [ { + "name": "Start Server", "type": "node", "request": "launch", - "name": "Start Server", - "program": "${workspaceFolder}/src/index.js" + "runtimeExecutable": "node", + "runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"], + "args": ["src/index.ts"], + "cwd": "${workspaceRoot}", }, { "type": "node", diff --git a/packages/worker/package.json b/packages/worker/package.json index c4340d6335..c3ef2232c9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.98-alpha.1", + "version": "1.0.98-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,8 +31,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.98-alpha.1", - "@budibase/string-templates": "^1.0.98-alpha.1", + "@budibase/backend-core": "^1.0.98-alpha.2", + "@budibase/string-templates": "^1.0.98-alpha.2", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",