Skip to content

Commit 5b1a615

Browse files
committed
refactor(infra): remove hack moncomptepro imports
1 parent dfcb9db commit 5b1a615

File tree

4 files changed

+21
-45
lines changed

4 files changed

+21
-45
lines changed

build.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//
22

3+
import { $ } from "bun";
4+
35
const minify = true;
46

57
{
@@ -41,4 +43,19 @@ const minify = true;
4143
console.log({ logs, outputs, success });
4244
}
4345

46+
{
47+
console.log("> @numerique-gouv/moncomptepro install");
48+
const { stdout } = await $`npm i`.cwd(
49+
"node_modules/@numerique-gouv/moncomptepro",
50+
);
51+
console.log(stdout.toString());
52+
}
53+
{
54+
console.log("> @numerique-gouv/moncomptepro build");
55+
const { stdout } = await $`npm exec tsc`.cwd(
56+
"node_modules/@numerique-gouv/moncomptepro",
57+
);
58+
console.log(stdout.toString());
59+
}
60+
4461
export {};

bun.lockb

-1.77 KB
Binary file not shown.

packages/~/infra/moncomptepro/lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
},
1717
"dependencies": {
18-
"@numerique-gouv/moncomptepro": "numerique-gouv/moncomptepro#f26af544c636f071bf6efc4343bfe4f9e98fddb5",
18+
"@numerique-gouv/moncomptepro": "numerique-gouv/moncomptepro#be03264c4ee54cb005ef838f32b1c566ef185852",
1919
"@~/app.core": "workspace:*",
2020
"consola": "3.2.3",
2121
"zod": "3.23.8"
Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,9 @@
11
//
22

3-
import type Pg from "pg";
4-
import type { MCP_EmailDomain_Type } from "./moncomptepro";
5-
6-
//
7-
//
8-
//
9-
10-
// HACK(douglasduteil): disable typescript check on @numerique-gouv/moncomptepro
11-
//
12-
// As the @numerique-gouv/moncomptepro/database is not yet published as a standalone package
13-
// we need to disable the typescript check on it to avoid many typescript errors
14-
//
15-
16-
const MONCOMPTEPRO_MODULE = "@numerique-gouv/moncomptepro";
17-
18-
// import "@numerique-gouv/moncomptepro/src/connectors/postgres";
19-
const POSTGRES_CONNECTOR_MODULE: {
20-
setDatabaseConnection(newPool: Pg.Pool): void;
21-
} = await import(`${MONCOMPTEPRO_MODULE}/src/connectors/postgres`);
22-
23-
// import "@numerique-gouv/moncomptepro/src/managers/organization/main";
24-
const MAIN_ORGANIZATION_MANAGER_MODULE: {
25-
markDomainAsVerified(options: {
26-
organization_id: number;
27-
domain: string;
28-
domain_verification_type: MCP_EmailDomain_Type;
29-
}): Promise<void>;
30-
} = await import(`${MONCOMPTEPRO_MODULE}/src/managers/organization/main`);
31-
32-
// import "@numerique-gouv/moncomptepro/src/managers/organization/join";
33-
const JOIN_ORGANIZATION_MANAGER_MODULE: {
34-
forceJoinOrganization(options: {
35-
organization_id: number;
36-
user_id: number;
37-
is_external?: boolean;
38-
}): Promise<UserOrganizationLink>;
39-
} = await import(`${MONCOMPTEPRO_MODULE}/src/managers/organization/join`);
40-
413
//
424
//
435
//
446

45-
export const setDatabaseConnection =
46-
POSTGRES_CONNECTOR_MODULE.setDatabaseConnection;
47-
export const markDomainAsVerified =
48-
MAIN_ORGANIZATION_MANAGER_MODULE.markDomainAsVerified;
49-
export const forceJoinOrganization =
50-
JOIN_ORGANIZATION_MANAGER_MODULE.forceJoinOrganization;
7+
export { setDatabaseConnection } from "@numerique-gouv/moncomptepro/connectors/postgres";
8+
export { forceJoinOrganization } from "@numerique-gouv/moncomptepro/managers/organization/join";
9+
export { markDomainAsVerified } from "@numerique-gouv/moncomptepro/managers/organization/markDomainAsVerified";

0 commit comments

Comments
 (0)