diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json index bb7077518fe..99272e757d1 100644 --- a/packages/lib/package-lock.json +++ b/packages/lib/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "@joplin/lib", - "version": "2.6.0", + "version": "2.6.2", "license": "ISC", "dependencies": { "async-mutex": "^0.1.3", diff --git a/packages/renderer/package-lock.json b/packages/renderer/package-lock.json index cdd85e37518..54c5fce86d5 100644 --- a/packages/renderer/package-lock.json +++ b/packages/renderer/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "@joplin/renderer", - "version": "2.6.0", + "version": "2.6.2", "license": "MIT", "dependencies": { "font-awesome-filetypes": "^2.1.0", diff --git a/packages/server/src/utils/testing/testUtils.ts b/packages/server/src/utils/testing/testUtils.ts index 94c5ff3a181..62ec7b3884a 100644 --- a/packages/server/src/utils/testing/testUtils.ts +++ b/packages/server/src/utils/testing/testUtils.ts @@ -23,6 +23,7 @@ import MustacheService from '../../services/MustacheService'; import uuidgen from '../uuidgen'; import { createCsrfToken } from '../csrf'; import { cookieSet } from '../cookies'; +import { parseEnv } from '../../env'; // Takes into account the fact that this file will be inside the /dist directory // when it runs. @@ -73,20 +74,20 @@ export async function beforeAllDb(unitName: string, createDbOptions: CreateDbOpt // // sudo docker compose -f docker-compose.db-dev.yml up - // await initConfig(Env.Dev, { + // await initConfig(Env.Dev, parseEnv({ // DB_CLIENT: 'pg', // POSTGRES_DATABASE: unitName, // POSTGRES_USER: 'joplin', // POSTGRES_PASSWORD: 'joplin', // SUPPORT_EMAIL: 'testing@localhost', - // }, { + // }), { // tempDir: tempDir, // }); - await initConfig(Env.Dev, { + await initConfig(Env.Dev, parseEnv({ SQLITE_DATABASE: createdDbPath_, SUPPORT_EMAIL: 'testing@localhost', - } as any, { + }), { tempDir: tempDir, });