diff --git a/.github/workflows/check_code_quality.yml b/.github/workflows/check_code_quality.yml index df156f2117..424e304135 100644 --- a/.github/workflows/check_code_quality.yml +++ b/.github/workflows/check_code_quality.yml @@ -37,6 +37,12 @@ jobs: - name: Generate Prisma client run: npm run db:generate + env: + # prisma.config.ts resolves datasource.url from this variable when the Prisma CLI + # loads, and there is no .env on the runner. `prisma generate` never opens a + # connection, so any syntactically valid URI works. + DATABASE_PROVIDER: postgresql + DATABASE_CONNECTION_URI: postgresql://user:pass@localhost:5432/evolution?schema=public - name: Check build run: npm run build \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 25d5270818..55bf83fe04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "evolution-api", - "version": "2.3.7", + "version": "2.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "evolution-api", - "version": "2.3.7", + "version": "2.4.0", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/src/api/integrations/channel/evohub/evohub.controlplane.router.ts b/src/api/integrations/channel/evohub/evohub.controlplane.router.ts index f87b335259..022a821a6a 100644 --- a/src/api/integrations/channel/evohub/evohub.controlplane.router.ts +++ b/src/api/integrations/channel/evohub/evohub.controlplane.router.ts @@ -37,7 +37,7 @@ export class EvoHubControlPlaneRouter extends RouterBroker { }); this.router.get('/evohub/channels/:id', guard, async (req, res) => { - res.json(await evoHubClient.getChannel(req.params.id)); + res.json(await evoHubClient.getChannel(req.params.id as string)); }); this.router.get('/evohub/available-channels', guard, async (_req, res) => { @@ -114,7 +114,7 @@ export class EvoHubControlPlaneRouter extends RouterBroker { }); this.router.post('/evohub/channels/:id/meta-connect', guard, async (req, res) => { - res.json(await evoHubClient.connectToMeta(req.params.id, req.body)); + res.json(await evoHubClient.connectToMeta(req.params.id as string, req.body)); }); } } diff --git a/tsup.config.ts b/tsup.config.ts index 23e9208362..655d8f2fbf 100644 --- a/tsup.config.ts +++ b/tsup.config.ts @@ -33,6 +33,7 @@ export default defineConfig({ ...(options.alias ?? {}), '@prisma/client': path.resolve(process.cwd(), 'prisma/generated/client/client.ts'), }; + }, define: { __LICENSE_ENDPOINT_ENCODED__: licenseEndpointEncoded, __LICENSE_ENDPOINT_XOR_KEY__: licenseEndpointXorKey,