diff --git a/packages/create-twenty-app/package.json b/packages/create-twenty-app/package.json index ba75818dc3ff9..8cd41129b1537 100644 --- a/packages/create-twenty-app/package.json +++ b/packages/create-twenty-app/package.json @@ -51,8 +51,7 @@ "twenty-shared": "workspace:*", "typescript": "^5.9.3", "vite": "^8.0.0", - "vite-plugin-dts": "^4.5.4", - "vite-tsconfig-paths": "^4.2.1" + "vite-plugin-dts": "^4.5.4" }, "engines": { "node": "^24.5.0", diff --git a/packages/create-twenty-app/src/constants/template/package.json b/packages/create-twenty-app/src/constants/template/package.json index a41cd81902742..826d228bee623 100644 --- a/packages/create-twenty-app/src/constants/template/package.json +++ b/packages/create-twenty-app/src/constants/template/package.json @@ -26,7 +26,6 @@ "twenty-client-sdk": "TO-BE-GENERATED", "twenty-sdk": "TO-BE-GENERATED", "typescript": "^5.9.3", - "vite-tsconfig-paths": "^4.2.1", "vitest": "^3.1.1" } } diff --git a/packages/create-twenty-app/src/constants/template/vitest.config.ts b/packages/create-twenty-app/src/constants/template/vitest.config.ts index 055af77dbec35..a22f3b6c31072 100644 --- a/packages/create-twenty-app/src/constants/template/vitest.config.ts +++ b/packages/create-twenty-app/src/constants/template/vitest.config.ts @@ -1,4 +1,3 @@ -import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; const TWENTY_API_URL = process.env.TWENTY_API_URL ?? 'http://localhost:2020'; @@ -11,12 +10,9 @@ process.env.TWENTY_API_URL = TWENTY_API_URL; process.env.TWENTY_API_KEY = TWENTY_API_KEY; export default defineConfig({ - plugins: [ - tsconfigPaths({ - projects: ['tsconfig.spec.json'], - ignoreConfigErrors: true, - }), - ], + resolve: { + tsconfigPaths: true, + }, test: { testTimeout: 120_000, hookTimeout: 120_000, diff --git a/packages/create-twenty-app/vite.config.ts b/packages/create-twenty-app/vite.config.ts index a6b53cfaeeac7..0a6174f9fe073 100644 --- a/packages/create-twenty-app/vite.config.ts +++ b/packages/create-twenty-app/vite.config.ts @@ -2,7 +2,6 @@ import fs from 'fs-extra'; import path from 'path'; import { defineConfig } from 'vite'; import dts from 'vite-plugin-dts'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; import type { PackageJson } from 'type-fest'; @@ -55,10 +54,10 @@ export default defineConfig(() => { return { root: __dirname, cacheDir: '../../node_modules/.vite/packages/create-twenty-app', + resolve: { + tsconfigPaths: true, + }, plugins: [ - tsconfigPaths({ - root: __dirname, - }), dts({ entryRoot: './src', tsconfigPath: tsConfigPath }), copyAssetPlugin([ { diff --git a/packages/twenty-apps/examples/hello-world/package.json b/packages/twenty-apps/examples/hello-world/package.json index 91c729e7d78a7..53a9971dee03d 100644 --- a/packages/twenty-apps/examples/hello-world/package.json +++ b/packages/twenty-apps/examples/hello-world/package.json @@ -24,7 +24,6 @@ "twenty-client-sdk": "2.13.0", "twenty-sdk": "2.13.0", "typescript": "^5.9.3", - "vite-tsconfig-paths": "^4.2.1", "vitest": "^4.0.0" } } diff --git a/packages/twenty-apps/examples/hello-world/vitest.config.ts b/packages/twenty-apps/examples/hello-world/vitest.config.ts index 243b9dbc58037..1f844105d125b 100644 --- a/packages/twenty-apps/examples/hello-world/vitest.config.ts +++ b/packages/twenty-apps/examples/hello-world/vitest.config.ts @@ -1,13 +1,9 @@ -import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; export default defineConfig({ - plugins: [ - tsconfigPaths({ - projects: ['tsconfig.spec.json'], - ignoreConfigErrors: true, - }), - ], + resolve: { + tsconfigPaths: true, + }, test: { testTimeout: 120_000, hookTimeout: 120_000, diff --git a/packages/twenty-apps/examples/postcard/package.json b/packages/twenty-apps/examples/postcard/package.json index a19048c702f5f..cecf6aadc3d95 100644 --- a/packages/twenty-apps/examples/postcard/package.json +++ b/packages/twenty-apps/examples/postcard/package.json @@ -32,7 +32,6 @@ "twenty-client-sdk": "2.13.0", "twenty-sdk": "2.13.0", "typescript": "^5.9.3", - "vite-tsconfig-paths": "^4.2.1", "vitest": "^4.0.0" } } diff --git a/packages/twenty-apps/examples/postcard/vitest.config.ts b/packages/twenty-apps/examples/postcard/vitest.config.ts index 055af77dbec35..a22f3b6c31072 100644 --- a/packages/twenty-apps/examples/postcard/vitest.config.ts +++ b/packages/twenty-apps/examples/postcard/vitest.config.ts @@ -1,4 +1,3 @@ -import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; const TWENTY_API_URL = process.env.TWENTY_API_URL ?? 'http://localhost:2020'; @@ -11,12 +10,9 @@ process.env.TWENTY_API_URL = TWENTY_API_URL; process.env.TWENTY_API_KEY = TWENTY_API_KEY; export default defineConfig({ - plugins: [ - tsconfigPaths({ - projects: ['tsconfig.spec.json'], - ignoreConfigErrors: true, - }), - ], + resolve: { + tsconfigPaths: true, + }, test: { testTimeout: 120_000, hookTimeout: 120_000, diff --git a/packages/twenty-client-sdk/package.json b/packages/twenty-client-sdk/package.json index 17294e2cfafdd..bf7f0754c6a8e 100644 --- a/packages/twenty-client-sdk/package.json +++ b/packages/twenty-client-sdk/package.json @@ -62,7 +62,6 @@ "typescript": "^5.9.3", "vite": "^8.0.0", "vite-plugin-dts": "^4.5.4", - "vite-tsconfig-paths": "^4.2.1", "vitest": "^4.1.0" }, "engines": { diff --git a/packages/twenty-client-sdk/vite.config.ts b/packages/twenty-client-sdk/vite.config.ts index 69691dd82db43..b1680c0db46e6 100644 --- a/packages/twenty-client-sdk/vite.config.ts +++ b/packages/twenty-client-sdk/vite.config.ts @@ -1,6 +1,5 @@ import path from 'path'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; const entries = [ @@ -51,15 +50,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-client-sdk', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist', diff --git a/packages/twenty-emails/vite.config.ts b/packages/twenty-emails/vite.config.ts index 93a345185cc96..f2f6a7f322333 100644 --- a/packages/twenty-emails/vite.config.ts +++ b/packages/twenty-emails/vite.config.ts @@ -5,7 +5,6 @@ import react from '@vitejs/plugin-react-swc'; import * as path from 'path'; import { APP_LOCALES } from 'twenty-shared/translations'; import { defineConfig, type Plugin } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; // twenty-emails bundles its deps (the Node server that consumes it doesn't have // @react-email et al.) but runs in Node. A plain client/lib build under Vite 8 @@ -41,6 +40,7 @@ export default defineConfig({ cacheDir: '../../node_modules/.vite/packages/twenty-emails', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', 'src/': path.resolve(__dirname, 'src') + '/', @@ -61,9 +61,6 @@ export default defineConfig({ lingui({ configPath: path.resolve(__dirname, './lingui.config.ts'), }), - tsconfigPaths({ - root: __dirname, - }), ], build: { diff --git a/packages/twenty-front-component-renderer/.storybook/main.ts b/packages/twenty-front-component-renderer/.storybook/main.ts index 8850fe7eeed94..1152f17036585 100644 --- a/packages/twenty-front-component-renderer/.storybook/main.ts +++ b/packages/twenty-front-component-renderer/.storybook/main.ts @@ -1,15 +1,12 @@ import type { StorybookConfig } from '@storybook/react-vite'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; -import tsconfigPaths from 'vite-tsconfig-paths'; const dirname = typeof __dirname !== 'undefined' ? __dirname : path.dirname(fileURLToPath(import.meta.url)); -const packageRoot = path.resolve(dirname, '..'); - const config: StorybookConfig = { stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'], @@ -37,6 +34,7 @@ const config: StorybookConfig = { ...viteConfig, resolve: { ...viteConfig.resolve, + tsconfigPaths: true, alias: { ...viteConfig.resolve?.alias, '@': path.resolve(dirname, '../src'), @@ -55,10 +53,6 @@ const config: StorybookConfig = { ), }, }, - plugins: [ - ...(viteConfig.plugins ?? []), - tsconfigPaths({ root: packageRoot }), - ], optimizeDeps: { ...viteConfig.optimizeDeps, include: [ diff --git a/packages/twenty-front-component-renderer/package.json b/packages/twenty-front-component-renderer/package.json index e15b97d0d971b..b6e3210908177 100644 --- a/packages/twenty-front-component-renderer/package.json +++ b/packages/twenty-front-component-renderer/package.json @@ -50,8 +50,7 @@ "twenty-sdk": "workspace:*", "twenty-shared": "workspace:*", "twenty-ui": "workspace:*", - "vite-plugin-dts": "^4.5.4", - "vite-tsconfig-paths": "^4.2.1" + "vite-plugin-dts": "^4.5.4" }, "engines": { "node": "^24.5.0", diff --git a/packages/twenty-front-component-renderer/vite.config.ts b/packages/twenty-front-component-renderer/vite.config.ts index 51e8c87aaccc6..07ea8fadd25a0 100644 --- a/packages/twenty-front-component-renderer/vite.config.ts +++ b/packages/twenty-front-component-renderer/vite.config.ts @@ -1,7 +1,6 @@ import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -11,15 +10,11 @@ export default defineConfig(() => { cacheDir: '../../node_modules/.vite/packages/twenty-front-component-renderer', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], worker: { format: 'iife', rollupOptions: { diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json index ef7f4ebc46934..d09b431480bad 100644 --- a/packages/twenty-front/package.json +++ b/packages/twenty-front/package.json @@ -204,7 +204,6 @@ "storybook-addon-mock-date": "2.0.0", "storybook-addon-pseudo-states": "^10.3.3", "ts-jest": "^29.1.1", - "vite-plugin-svgr": "^4.3.0", - "vite-tsconfig-paths": "^4.2.1" + "vite-plugin-svgr": "^4.3.0" } } diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts index fcb6bf559be7c..2820581202340 100644 --- a/packages/twenty-front/vite.config.ts +++ b/packages/twenty-front/vite.config.ts @@ -12,7 +12,6 @@ import { searchForWorkspaceRoot, } from 'vite'; import svgr from 'vite-plugin-svgr'; -import tsconfigPaths from 'vite-tsconfig-paths'; import { createWywProfilingPlugin } from 'twenty-shared/vite'; @@ -74,10 +73,6 @@ export default defineConfig(({ mode }) => { react({ plugins: [['@lingui/swc-plugin', {}]], }), - tsconfigPaths({ - root: __dirname, - projects: ['tsconfig.json'], - }), svgr(), lingui({ configPath: path.resolve(__dirname, './lingui.config.ts'), @@ -260,10 +255,11 @@ export default defineConfig(({ mode }) => { }, }, resolve: { + tsconfigPaths: true, alias: [ // wyw-in-js 1.x resolves modules in its CSS evaluator via vite's - // resolve.alias (it no longer picks up vite-tsconfig-paths), so the - // `@/` and `~/` tsconfig path aliases must be mirrored here. + // resolve.alias (not resolve.tsconfigPaths), so the `@/` and `~/` + // tsconfig path aliases must be mirrored here. { find: /^@\//, replacement: path.resolve(__dirname, 'src/modules') + '/' }, { find: /^~\//, replacement: path.resolve(__dirname, 'src') + '/' }, { find: 'path', replacement: 'rollup-plugin-node-polyfills/polyfills/path' }, diff --git a/packages/twenty-sdk/package.json b/packages/twenty-sdk/package.json index 76bc39f907d19..24f40e3d5ab69 100644 --- a/packages/twenty-sdk/package.json +++ b/packages/twenty-sdk/package.json @@ -109,7 +109,6 @@ "twenty-ui": "workspace:*", "vite": "^8.0.0", "vite-plugin-dts": "^4.5.4", - "vite-tsconfig-paths": "^4.2.1", "wait-on": "^9.0.10" }, "engines": { diff --git a/packages/twenty-sdk/vite.config.billing.ts b/packages/twenty-sdk/vite.config.billing.ts index 00d9dea5134ae..e4c86d50d0a56 100644 --- a/packages/twenty-sdk/vite.config.billing.ts +++ b/packages/twenty-sdk/vite.config.billing.ts @@ -1,7 +1,6 @@ import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -10,15 +9,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-sdk-billing', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist/billing', diff --git a/packages/twenty-sdk/vite.config.browser.ts b/packages/twenty-sdk/vite.config.browser.ts index 2890ba13ed2ea..2ac2a53cfe491 100644 --- a/packages/twenty-sdk/vite.config.browser.ts +++ b/packages/twenty-sdk/vite.config.browser.ts @@ -1,7 +1,6 @@ import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -10,15 +9,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-sdk-browser', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist', diff --git a/packages/twenty-sdk/vite.config.define.ts b/packages/twenty-sdk/vite.config.define.ts index 1d501352c995b..d31789f0aa5ea 100644 --- a/packages/twenty-sdk/vite.config.define.ts +++ b/packages/twenty-sdk/vite.config.define.ts @@ -1,7 +1,6 @@ import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -10,15 +9,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-sdk-define', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist/define', diff --git a/packages/twenty-sdk/vite.config.front-component.ts b/packages/twenty-sdk/vite.config.front-component.ts index 777a972d973bc..8473dc6a7c8db 100644 --- a/packages/twenty-sdk/vite.config.front-component.ts +++ b/packages/twenty-sdk/vite.config.front-component.ts @@ -1,7 +1,6 @@ import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -10,15 +9,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-sdk-front-component', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist/front-component', diff --git a/packages/twenty-sdk/vite.config.logic-function.ts b/packages/twenty-sdk/vite.config.logic-function.ts index 2b7e0234165c7..e6800415d02b8 100644 --- a/packages/twenty-sdk/vite.config.logic-function.ts +++ b/packages/twenty-sdk/vite.config.logic-function.ts @@ -1,7 +1,6 @@ import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -10,15 +9,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-sdk-logic-function', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist/logic-function', diff --git a/packages/twenty-sdk/vite.config.node.ts b/packages/twenty-sdk/vite.config.node.ts index 4ebb1f325e9a5..d318d05610444 100644 --- a/packages/twenty-sdk/vite.config.node.ts +++ b/packages/twenty-sdk/vite.config.node.ts @@ -2,7 +2,6 @@ import fs from 'fs'; import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -25,16 +24,12 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-sdk-node', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - copyCoverAssetsPlugin(), - ], + plugins: [copyCoverAssetsPlugin()], build: { emptyOutDir: false, outDir: 'dist', diff --git a/packages/twenty-sdk/vite.config.utils.ts b/packages/twenty-sdk/vite.config.utils.ts index dab60b0228acd..c26f834463489 100644 --- a/packages/twenty-sdk/vite.config.utils.ts +++ b/packages/twenty-sdk/vite.config.utils.ts @@ -1,7 +1,6 @@ import path from 'path'; import { type PackageJson } from 'type-fest'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -10,15 +9,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-sdk-utils', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist/utils', diff --git a/packages/twenty-sdk/vitest.config.ts b/packages/twenty-sdk/vitest.config.ts index f139de1949da3..2d8ef97df94b4 100644 --- a/packages/twenty-sdk/vitest.config.ts +++ b/packages/twenty-sdk/vitest.config.ts @@ -1,13 +1,9 @@ -import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; export default defineConfig({ - plugins: [ - tsconfigPaths({ - root: __dirname, - ignoreConfigErrors: true, - }), - ], + resolve: { + tsconfigPaths: true, + }, test: { name: 'twenty-sdk', environment: 'node', diff --git a/packages/twenty-sdk/vitest.e2e.config.ts b/packages/twenty-sdk/vitest.e2e.config.ts index 3d916df4056f7..dd5e7a98a5f8c 100644 --- a/packages/twenty-sdk/vitest.e2e.config.ts +++ b/packages/twenty-sdk/vitest.e2e.config.ts @@ -1,13 +1,9 @@ -import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; export default defineConfig({ - plugins: [ - tsconfigPaths({ - root: __dirname, - ignoreConfigErrors: true, - }), - ], + resolve: { + tsconfigPaths: true, + }, test: { name: 'twenty-sdk-e2e', environment: 'node', diff --git a/packages/twenty-sdk/vitest.integration.config.ts b/packages/twenty-sdk/vitest.integration.config.ts index ecde4c6d22119..6f62d9adb399d 100644 --- a/packages/twenty-sdk/vitest.integration.config.ts +++ b/packages/twenty-sdk/vitest.integration.config.ts @@ -1,13 +1,9 @@ -import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; export default defineConfig({ - plugins: [ - tsconfigPaths({ - root: __dirname, - ignoreConfigErrors: true, - }), - ], + resolve: { + tsconfigPaths: true, + }, test: { name: 'twenty-sdk-integration', environment: 'node', diff --git a/packages/twenty-sdk/vitest.unit.config.ts b/packages/twenty-sdk/vitest.unit.config.ts index 50d33699034aa..b06e02a0d2286 100644 --- a/packages/twenty-sdk/vitest.unit.config.ts +++ b/packages/twenty-sdk/vitest.unit.config.ts @@ -1,13 +1,9 @@ -import tsconfigPaths from 'vite-tsconfig-paths'; import { defineConfig } from 'vitest/config'; export default defineConfig({ - plugins: [ - tsconfigPaths({ - root: __dirname, - ignoreConfigErrors: true, - }), - ], + resolve: { + tsconfigPaths: true, + }, test: { name: 'twenty-sdk-unit', environment: 'node', diff --git a/packages/twenty-shared/package.json b/packages/twenty-shared/package.json index 62db6afdd0759..451f13482a260 100644 --- a/packages/twenty-shared/package.json +++ b/packages/twenty-shared/package.json @@ -39,8 +39,7 @@ "tsx": "^4.19.3", "typescript": "^5.9.3", "vite": "^8.0.0", - "vite-plugin-dts": "^4.5.4", - "vite-tsconfig-paths": "^4.2.1" + "vite-plugin-dts": "^4.5.4" }, "dependencies": { "@dagrejs/dagre": "^1.1.8", diff --git a/packages/twenty-shared/vite.config.individual.ts b/packages/twenty-shared/vite.config.individual.ts index e30ea55794052..cc67fcd05ceb4 100644 --- a/packages/twenty-shared/vite.config.individual.ts +++ b/packages/twenty-shared/vite.config.individual.ts @@ -1,6 +1,5 @@ import path from 'path'; import { type UserConfig, defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; const submodules = Object.keys((packageJson as any).exports || {}) @@ -32,15 +31,11 @@ export default defineConfig((): UserConfig => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-shared-individual', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { minify: 'esbuild', sourcemap: true, diff --git a/packages/twenty-shared/vite.config.ts b/packages/twenty-shared/vite.config.ts index 5352bbaef1081..9ecad22541c94 100644 --- a/packages/twenty-shared/vite.config.ts +++ b/packages/twenty-shared/vite.config.ts @@ -1,7 +1,6 @@ // @ts-expect-error: no type declarations for path in this config import path from 'path'; import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; // @ts-expect-error: importing JSON without resolveJsonModule import packageJson from './package.json'; @@ -39,15 +38,11 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-shared', resolve: { + tsconfigPaths: true, alias: { '@/': path.resolve(__dirname, 'src') + '/', }, }, - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], build: { emptyOutDir: false, outDir: 'dist', diff --git a/packages/twenty-ui/package.json b/packages/twenty-ui/package.json index f3ee25529d644..a9703f4f8afd9 100644 --- a/packages/twenty-ui/package.json +++ b/packages/twenty-ui/package.json @@ -67,7 +67,6 @@ "vite-plugin-dts": "^4.5.4", "vite-plugin-sass-dts": "^1.3.31", "vite-plugin-svgr": "^4.3.0", - "vite-tsconfig-paths": "^4.2.1", "vitest": "^4.1.0" }, "dependencies": { diff --git a/packages/twenty-ui/vite.config.individual.ts b/packages/twenty-ui/vite.config.individual.ts index b34f2bbd1a951..6b80d23fda6c7 100644 --- a/packages/twenty-ui/vite.config.individual.ts +++ b/packages/twenty-ui/vite.config.individual.ts @@ -2,7 +2,6 @@ import react from '@vitejs/plugin-react-swc'; import * as path from 'path'; import { defineConfig } from 'vite'; import svgr from 'vite-plugin-svgr'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; @@ -17,6 +16,7 @@ const isExternal = (id: string): boolean => export default defineConfig(() => { return { resolve: { + tsconfigPaths: true, alias: { '@ui/': path.resolve(__dirname, 'src') + '/', '@assets/': path.resolve(__dirname, 'src/assets') + '/', @@ -43,14 +43,7 @@ export default defineConfig(() => { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-ui-individual', assetsInclude: ['src/**/*.svg'], - plugins: [ - react(), - tsconfigPaths({ - root: __dirname, - projects: ['tsconfig.json'], - }), - svgr(), - ], + plugins: [react(), svgr()], build: { cssCodeSplit: false, minify: 'esbuild', diff --git a/packages/twenty-ui/vite.config.ts b/packages/twenty-ui/vite.config.ts index a7f58d46b4a28..c3166af8b1939 100644 --- a/packages/twenty-ui/vite.config.ts +++ b/packages/twenty-ui/vite.config.ts @@ -6,7 +6,6 @@ import checker from 'vite-plugin-checker'; import dts, { type PluginOptions } from 'vite-plugin-dts'; import sassDts from 'vite-plugin-sass-dts'; import svgr from 'vite-plugin-svgr'; -import tsconfigPaths from 'vite-tsconfig-paths'; type Checkers = Parameters[0]; @@ -64,6 +63,7 @@ export default defineConfig(({ command }) => { return { resolve: { + tsconfigPaths: true, alias: { '@ui/': path.resolve(__dirname, 'src') + '/', '@assets/': path.resolve(__dirname, 'src/assets') + '/', @@ -105,10 +105,6 @@ export default defineConfig(({ command }) => { assetsInclude: ['src/**/*.svg'], plugins: [ react(), - tsconfigPaths({ - root: __dirname, - projects: ['tsconfig.json'], - }), svgr(), // Generates typed *.module.scss.d.ts siblings (dev mode only — backed by // sass-embedded). CI/build relies on the ambient src/scss-modules.d.ts. diff --git a/packages/twenty-zapier/package.json b/packages/twenty-zapier/package.json index e637cbaa0b3a6..2ef165ec09ba0 100644 --- a/packages/twenty-zapier/package.json +++ b/packages/twenty-zapier/package.json @@ -28,7 +28,6 @@ "twenty-shared": "workspace:*", "vite": "^8.0.0", "vite-plugin-dts": "^4.5.4", - "vite-tsconfig-paths": "^4.2.1", "zapier-platform-cli": "^19.0.0" } } diff --git a/packages/twenty-zapier/vite.config.ts b/packages/twenty-zapier/vite.config.ts index 045d15641dcce..e99af7fac773a 100644 --- a/packages/twenty-zapier/vite.config.ts +++ b/packages/twenty-zapier/vite.config.ts @@ -1,6 +1,5 @@ import { defineConfig } from 'vite'; -import tsconfigPaths from 'vite-tsconfig-paths'; import packageJson from './package.json'; import type { PackageJson } from 'type-fest'; @@ -29,11 +28,9 @@ export default defineConfig(() => { return { root: __dirname, cacheDir: '../../node_modules/.vite/packages/twenty-zapier', - plugins: [ - tsconfigPaths({ - root: __dirname, - }), - ], + resolve: { + tsconfigPaths: true, + }, build: { emptyOutDir: false, outDir: 'lib', diff --git a/yarn.lock b/yarn.lock index 6f9a235718c28..15827ecf31cac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29277,7 +29277,6 @@ __metadata: uuid: "npm:^13.0.2" vite: "npm:^8.0.0" vite-plugin-dts: "npm:^4.5.4" - vite-tsconfig-paths: "npm:^4.2.1" bin: create-twenty-app: dist/cli.cjs languageName: unknown @@ -34281,13 +34280,6 @@ __metadata: languageName: node linkType: hard -"globrex@npm:^0.1.2": - version: 0.1.2 - resolution: "globrex@npm:0.1.2" - checksum: 10c0/a54c029520cf58bda1d8884f72bd49b4cd74e977883268d931fd83bcbd1a9eb96d57c7dbd4ad80148fb9247467ebfb9b215630b2ed7563b2a8de02e1ff7f89d1 - languageName: node - linkType: hard - "google-auth-library@npm:^10.1.0, google-auth-library@npm:^10.2.0": version: 10.7.0 resolution: "google-auth-library@npm:10.7.0" @@ -52162,20 +52154,6 @@ __metadata: languageName: node linkType: hard -"tsconfck@npm:^3.0.3": - version: 3.1.1 - resolution: "tsconfck@npm:3.1.1" - peerDependencies: - typescript: ^5.0.0 - peerDependenciesMeta: - typescript: - optional: true - bin: - tsconfck: bin/tsconfck.js - checksum: 10c0/e133eb308ba37e8db8dbac1905bddaaf4a62f0e01aa88143e19867e274a877b86b35cf69c9a0172ca3e7d1a4bb32400381ac7f7a1429e34250a8d7ae55aee3e7 - languageName: node - linkType: hard - "tsconfig-paths-webpack-plugin@npm:4.2.0": version: 4.2.0 resolution: "tsconfig-paths-webpack-plugin@npm:4.2.0" @@ -52304,7 +52282,6 @@ __metadata: typescript: "npm:^5.9.3" vite: "npm:^8.0.0" vite-plugin-dts: "npm:^4.5.4" - vite-tsconfig-paths: "npm:^4.2.1" vitest: "npm:^4.1.0" languageName: unknown linkType: soft @@ -52430,7 +52407,6 @@ __metadata: twenty-shared: "workspace:*" twenty-ui: "workspace:*" vite-plugin-dts: "npm:^4.5.4" - vite-tsconfig-paths: "npm:^4.2.1" zod: "npm:^4.1.11" languageName: unknown linkType: soft @@ -52611,7 +52587,6 @@ __metadata: use-debounce: "npm:^10.0.0" uuid: "npm:^11.1.1" vite-plugin-svgr: "npm:^4.3.0" - vite-tsconfig-paths: "npm:^4.2.1" xlsx-ugnis: "npm:^0.19.3" zod: "npm:^4.1.11" languageName: unknown @@ -52665,7 +52640,6 @@ __metadata: uuid: "npm:^13.0.2" vite: "npm:^8.0.0" vite-plugin-dts: "npm:^4.5.4" - vite-tsconfig-paths: "npm:^4.2.1" wait-on: "npm:^9.0.10" bin: twenty: dist/cli.cjs @@ -52932,7 +52906,6 @@ __metadata: uuid: "npm:^11.1.1" vite: "npm:^8.0.0" vite-plugin-dts: "npm:^4.5.4" - vite-tsconfig-paths: "npm:^4.2.1" zod: "npm:^4.1.11" languageName: unknown linkType: soft @@ -52988,7 +52961,6 @@ __metadata: vite-plugin-dts: "npm:^4.5.4" vite-plugin-sass-dts: "npm:^1.3.31" vite-plugin-svgr: "npm:^4.3.0" - vite-tsconfig-paths: "npm:^4.2.1" vitest: "npm:^4.1.0" zod: "npm:^4.1.11" peerDependencies: @@ -53068,7 +53040,6 @@ __metadata: twenty-shared: "workspace:*" vite: "npm:^8.0.0" vite-plugin-dts: "npm:^4.5.4" - vite-tsconfig-paths: "npm:^4.2.1" zapier-platform-cli: "npm:^19.0.0" zapier-platform-core: "npm:19.0.0" zod: "npm:^4.1.11" @@ -54725,22 +54696,6 @@ __metadata: languageName: node linkType: hard -"vite-tsconfig-paths@npm:^4.2.1": - version: 4.3.2 - resolution: "vite-tsconfig-paths@npm:4.3.2" - dependencies: - debug: "npm:^4.1.1" - globrex: "npm:^0.1.2" - tsconfck: "npm:^3.0.3" - peerDependencies: - vite: "*" - peerDependenciesMeta: - vite: - optional: true - checksum: 10c0/f390ac1d1c3992fc5ac50f9274c1090f8b55ab34a89ea88893db9a6924a3b26c9f64bc1163615150ad100749db73b6b2cf1d57f6cd60df6e762ceb5b8ad30024 - languageName: node - linkType: hard - "vite@npm:^6.0.0 || ^7.0.0 || ^8.0.0, vite@npm:^8.0.0": version: 8.0.16 resolution: "vite@npm:8.0.16"