From 04075c34fb7998e8472bc243e290c30252168887 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Tue, 27 Aug 2024 13:43:58 +0200 Subject: [PATCH 1/3] Test build front without checkers --- packages/twenty-front/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json index 4caecd12b4e6..936e929c4490 100644 --- a/packages/twenty-front/package.json +++ b/packages/twenty-front/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "scripts": { - "build": "npx vite build && sh ./scripts/inject-runtime-env.sh", + "build": "VITE_DISABLE_TYPESCRIPT_CHECKER=true VITE_DISABLE_ESLINT_CHECKER=true npx vite build && sh ./scripts/inject-runtime-env.sh", "build:sourcemaps": "VITE_BUILD_SOURCEMAP=true VITE_DISABLE_TYPESCRIPT_CHECKER=true VITE_DISABLE_ESLINT_CHECKER=true NODE_OPTIONS=--max-old-space-size=6000 npx nx build", "start:prod": "NODE_ENV=production npx vite --host", "tsup": "npx tsup" From cfdd37b49590a15ab9d15e11344f7090dcf57628 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Tue, 27 Aug 2024 14:11:08 +0200 Subject: [PATCH 2/3] Fix website build CD --- package.json | 1 - packages/twenty-front/vite.config.ts | 2 ++ packages/twenty-server/package.json | 1 + yarn.lock | 6 +++--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c4b1db5696f3..5f47c7150210 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,6 @@ "tslib": "^2.3.0", "tsup": "^8.2.4", "type-fest": "4.10.1", - "typeorm": "patch:typeorm@0.3.20#./packages/twenty-server/patches/typeorm+0.3.20.patch", "typescript": "5.3.3", "use-context-selector": "^2.0.0", "use-debounce": "^10.0.0", diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts index a9059b4d71f1..4de13c1a81d4 100644 --- a/packages/twenty-front/vite.config.ts +++ b/packages/twenty-front/vite.config.ts @@ -32,6 +32,8 @@ export default defineConfig(({ command, mode }) => { overlay: false, }; + console.log(VITE_DISABLE_TYPESCRIPT_CHECKER === 'true'); + if (VITE_DISABLE_TYPESCRIPT_CHECKER !== 'true') { checkers['typescript'] = { tsconfigPath: tsConfigPath, diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json index e6cd012e0ffc..cd7b89bb74f6 100644 --- a/packages/twenty-server/package.json +++ b/packages/twenty-server/package.json @@ -41,6 +41,7 @@ "passport": "^0.7.0", "psl": "^1.9.0", "tsconfig-paths": "^4.2.0", + "typeorm": "patch:typeorm@0.3.20#./patches/typeorm+0.3.20.patch", "zod-to-json-schema": "^3.23.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index e31171346f8d..6c70e31c1a3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -47108,6 +47108,7 @@ __metadata: psl: "npm:^1.9.0" rimraf: "npm:^5.0.5" tsconfig-paths: "npm:^4.2.0" + typeorm: "patch:typeorm@0.3.20#./patches/typeorm+0.3.20.patch" typescript: "npm:5.3.3" zod-to-json-schema: "npm:^3.23.1" languageName: unknown @@ -47468,7 +47469,6 @@ __metadata: tsup: "npm:^8.2.4" tsx: "npm:^4.17.0" type-fest: "npm:4.10.1" - typeorm: "patch:typeorm@0.3.20#./packages/twenty-server/patches/typeorm+0.3.20.patch" typescript: "npm:5.3.3" use-context-selector: "npm:^2.0.0" use-debounce: "npm:^10.0.0" @@ -47679,9 +47679,9 @@ __metadata: languageName: node linkType: hard -"typeorm@patch:typeorm@0.3.20#./packages/twenty-server/patches/typeorm+0.3.20.patch::locator=twenty%40workspace%3A.": +"typeorm@patch:typeorm@0.3.20#./patches/typeorm+0.3.20.patch::locator=twenty-server%40workspace%3Apackages%2Ftwenty-server": version: 0.3.20 - resolution: "typeorm@patch:typeorm@npm%3A0.3.20#./packages/twenty-server/patches/typeorm+0.3.20.patch::version=0.3.20&hash=d5f43a&locator=twenty%40workspace%3A." + resolution: "typeorm@patch:typeorm@npm%3A0.3.20#./patches/typeorm+0.3.20.patch::version=0.3.20&hash=d5f43a&locator=twenty-server%40workspace%3Apackages%2Ftwenty-server" dependencies: "@sqltools/formatter": "npm:^1.2.5" app-root-path: "npm:^3.1.0" From 61c548feb889f076b951a195028b2fa0c814467e Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Tue, 27 Aug 2024 14:12:02 +0200 Subject: [PATCH 3/3] Fix --- packages/twenty-front/vite.config.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts index 4de13c1a81d4..919f22a29658 100644 --- a/packages/twenty-front/vite.config.ts +++ b/packages/twenty-front/vite.config.ts @@ -32,7 +32,11 @@ export default defineConfig(({ command, mode }) => { overlay: false, }; - console.log(VITE_DISABLE_TYPESCRIPT_CHECKER === 'true'); + console.log( + `VITE_DISABLE_TYPESCRIPT_CHECKER: ${VITE_DISABLE_TYPESCRIPT_CHECKER}`, + ); + console.log(`VITE_DISABLE_ESLINT_CHECKER: ${VITE_DISABLE_ESLINT_CHECKER}`); + console.log(`VITE_BUILD_SOURCEMAP: ${VITE_BUILD_SOURCEMAP}`); if (VITE_DISABLE_TYPESCRIPT_CHECKER !== 'true') { checkers['typescript'] = {