diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 970a4aab8d..4267425b84 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -4,6 +4,13 @@ "description": "Budibase backend core libraries used in server and worker", "main": "dist/index.js", "types": "dist/src/index.d.ts", + "typesVersions": { + "*": { + "tests": [ + "./dist/tests/index.d.ts" + ] + } + }, "exports": { ".": "./dist/index.js", "./tests": "./dist/tests/index.js", diff --git a/packages/backend-core/scripts/build.js b/packages/backend-core/scripts/build.js index 8a15d09708..b40404aade 100644 --- a/packages/backend-core/scripts/build.js +++ b/packages/backend-core/scripts/build.js @@ -17,5 +17,6 @@ for (const file of inputFiles) { skipMeta: true, bundle: false, forcedFormat: "cjs", + silent: true, }) } diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 81bfa0abbd..4c6d0701f3 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -10,7 +10,6 @@ mocks.licenses.useUnlimited() import { init as dbInit } from "../../db" dbInit() import env from "../../environment" -import { env as coreEnv } from "@budibase/backend-core" import { basicTable, basicRow, @@ -33,6 +32,7 @@ import { encryption, auth, roles, + env as coreEnv, } from "@budibase/backend-core" import * as controllers from "./controllers" import { cleanup } from "../../utilities/fileSystem" @@ -51,7 +51,6 @@ import { UserRoles, Automation, } from "@budibase/types" -import { BUILTIN_ROLE_IDS } from "@budibase/backend-core/src/security/roles" import API from "./api" @@ -317,7 +316,7 @@ class TestConfiguration { } } - async createGroup(roleId: string = BUILTIN_ROLE_IDS.BASIC) { + async createGroup(roleId: string = roles.BUILTIN_ROLE_IDS.BASIC) { return context.doInTenant(this.tenantId!, async () => { const baseGroup = structures.userGroups.userGroup() baseGroup.roles = { diff --git a/scripts/build.js b/scripts/build.js index 8356f2e035..a3a377593a 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -15,7 +15,11 @@ const { nodeExternalsPlugin } = require("esbuild-node-externals") var argv = require("minimist")(process.argv.slice(2)) -function runBuild(entry, outfile, opts = { skipMeta: false, bundle: true }) { +function runBuild( + entry, + outfile, + opts = { skipMeta: false, bundle: true, silent: false } +) { const isDev = process.env.NODE_ENV !== "production" const tsconfig = argv["p"] || `tsconfig.build.json` const tsconfigPathPluginContent = JSON.parse( @@ -70,10 +74,11 @@ function runBuild(entry, outfile, opts = { skipMeta: false, bundle: true }) { fs.copyFileSync(file, `${process.cwd()}/dist/${path.basename(file)}`) } - console.log( - "\x1b[32m%s\x1b[0m", - `Build successfully in ${(Date.now() - start) / 1000} seconds` - ) + !opts.silent && + console.log( + "\x1b[32m%s\x1b[0m", + `Build successfully in ${(Date.now() - start) / 1000} seconds` + ) }) if (metafile) {