admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix import twenty-shared (#9754)

Browse Source 
In this PR:
- removing rootDir / baseUrl from any tsconfig.json
- we need to keep it in tsconfig.spec.json and also specify rootDir in
jest.config.ts moduleMapper because of the way nx jest executor works
(automatically moving back to root)
- we need to explictly specify the depencies to twenty-shared /
twenty-emails (built packages) in packages package.json to help nx
understand dependencies
This commit is contained in:
Charles Bochet
2025-01-20 23:10:39 +01:00
committed by GitHub
parent 3838fef812
commit e3f7cec82f
16 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-chrome-extension/tsconfig.json
View File

@ -9,8 +9,8 @@
"skipLibCheck": true,
"esModuleInterop": true,
"paths": {
"@/*": ["packages/twenty-chrome-extension/src/options/modules/*"],
"~/*": ["packages/twenty-chrome-extension/src/*"]
"@/*": ["./src/options/modules/*"],
"~/*": ["./src/*"]
},
/* Bundler mode */

4
packages/twenty-front/jest.config.ts
View File

@ -27,7 +27,9 @@ const jestConfig: JestConfigWithTsJest = {
'\\.(jpg|jpeg|png|gif|webp|svg|svg\\?react)$':
'<rootDir>/__mocks__/imageMock.js',
'\\.css$': '<rootDir>/__mocks__/styleMock.js',
...pathsToModuleNameMapper(tsConfig.compilerOptions.paths),
...pathsToModuleNameMapper(tsConfig.compilerOptions.paths, {
prefix: '<rootDir>/../../',
}),
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
extensionsToTreatAsEsm: ['.ts', '.tsx'],

3
packages/twenty-front/package.json
View File

@ -49,7 +49,8 @@
"docx": "^9.1.0",
"file-saver": "^2.0.5",
"recoil-sync": "^0.2.0",
"transliteration": "^2.3.5"
"transliteration": "^2.3.5",
"twenty-shared": "workspace:*"
},
"devDependencies": {
"@types/file-saver": "^2"

1
packages/twenty-front/src/modules/action-menu/actions/record-actions/workflow-run-record-actions/hooks/useWorkflowRunRecordActions.tsx
View File

@ -13,7 +13,6 @@ import { useRunWorkflowVersion } from '@/workflow/hooks/useRunWorkflowVersion';
import { useRecoilValue } from 'recoil';
import { capitalize } from 'twenty-shared';
import { IconSettingsAutomation, isDefined } from 'twenty-ui';
export const useWorkflowRunRecordActions = ({
objectMetadataItem,
}: {

2
packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepHeader.tsx
View File

@ -1,8 +1,8 @@
import { TextInput } from '@/ui/field/input/components/TextInput';
import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { IconComponent } from 'packages/twenty-ui';
import { useState } from 'react';
import { IconComponent } from 'twenty-ui';
import { useDebouncedCallback } from 'use-debounce';
const StyledHeader = styled.div`

8
packages/twenty-front/tsconfig.json
View File

@ -21,10 +21,10 @@
"forceConsistentCasingInFileNames": true,
"outDir": "../../.cache/tsc",
"paths": {
"@/*": ["packages/twenty-front/src/modules/*"],
"~/*": ["packages/twenty-front/src/*"],
"twenty-ui": ["packages/twenty-ui/src/index.ts"],
"@ui/*": ["packages/twenty-ui/src/*"]
"@/*": ["./src/modules/*"],
"~/*": ["./src/*"],
"twenty-ui": ["../twenty-ui/src/index.ts"],
"@ui/*": ["../twenty-ui/src/*"]
}
},
"files": [],

9
packages/twenty-front/tsconfig.spec.json
View File

@ -2,11 +2,12 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"types": ["jest", "node"],
"baseUrl": "../..",
"paths": {
"@/*": ["packages/twenty-front/src/modules/*"],
"~/*": ["packages/twenty-front/src/*"],
"twenty-ui": ["packages/twenty-ui/src/index.ts"],
"@ui/*": ["packages/twenty-ui/src/*"]
"@/*": ["./packages/twenty-front/src/modules/*"],
"~/*": ["./packages/twenty-front/src/*"],
"twenty-ui": ["./packages/twenty-ui/src/index.ts"],
"@ui/*": ["./packages/twenty-ui/src/*"]
}
},
"include": [

2
packages/twenty-server/package.json
View File

@ -74,6 +74,8 @@
"@types/react": "^18.2.39",
"@types/unzipper": "^0",
"rimraf": "^5.0.5",
"twenty-emails": "workspace:*",
"twenty-shared": "workspace:*",
"typescript": "5.3.3"
},
"engines": {

6
packages/twenty-server/tsconfig.json
View File

@ -25,9 +25,9 @@
"resolveJsonModule": true,
"types": ["jest", "node"],
"paths": {
"src/*": ["packages/twenty-server/src/*"],
"test/*": ["packages/twenty-server/test/*"],
"twenty-emails": ["packages/twenty-emails/dist"]
"src/*": ["./src/*"],
"test/*": ["./test/*"],
"twenty-emails": ["../twenty-emails/dist"]
}
},
"ts-node": {

4
packages/twenty-ui/jest.config.ts
View File

@ -23,7 +23,9 @@ const jestConfig: JestConfigWithTsJest = {
moduleNameMapper: {
'\\.(jpg|jpeg|png|gif|webp|svg|svg\\?react)$':
'<rootDir>/__mocks__/imageMock.js',
...pathsToModuleNameMapper(tsConfig.compilerOptions.paths),
...pathsToModuleNameMapper(tsConfig.compilerOptions.paths, {
prefix: '<rootDir>/',
}),
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
extensionsToTreatAsEsm: ['.ts', '.tsx'],

3
packages/twenty-ui/package.json
View File

@ -10,6 +10,9 @@
"require": "./dist/index.cjs"
}
},
"dependencies": {
"twenty-shared": "workspace:*"
},
"scripts": {
"build": "npx vite build"
}

2
packages/twenty-ui/src/theme/provider/ThemeProvider.tsx
View File

@ -1,5 +1,5 @@
import { ReactNode } from 'react';
import { ThemeProvider as EmotionThemeProvider } from '@emotion/react';
import { ReactNode } from 'react';
import { ThemeContextProvider } from '@ui/theme/provider/ThemeContextProvider';

2
packages/twenty-ui/tsconfig.json
View File

@ -10,7 +10,7 @@
"types": ["node"],
"outDir": "../../.cache/tsc",
"paths": {
"@ui/*": ["packages/twenty-ui/src/*"]
"@ui/*": ["./src/*"]
}
},
"files": [],

6
packages/twenty-ui/tsconfig.spec.json
View File

@ -2,7 +2,11 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"module": "commonjs",
"types": ["jest", "node"]
"types": ["jest", "node"],
"baseUrl": "../..",
"paths": {
"@ui/*": ["./packages/twenty-ui/src/*"]
}
},
"include": [
"vite.config.ts",

8
tsconfig.base.json
View File

@ -13,13 +13,7 @@
"lib": ["es2020", "dom"],
"skipLibCheck": true,
"skipDefaultLibCheck": true,
"resolveJsonModule": true,
"baseUrl": ".",
"paths": {
"twenty-emails": ["packages/twenty-emails/src/index.ts"],
"twenty-ui": ["packages/twenty-ui/src/index.ts"],
"twenty-shared": ["packages/twenty-shared/dist"]
}
"resolveJsonModule": true
},
"exclude": ["node_modules", "tmp"]
}

9
yarn.lock
View File

@ -45581,7 +45581,7 @@ __metadata:
languageName: unknown
linkType: soft
"twenty-emails@workspace:packages/twenty-emails":
"twenty-emails@workspace:*, twenty-emails@workspace:packages/twenty-emails":
version: 0.0.0-use.local
resolution: "twenty-emails@workspace:packages/twenty-emails"
languageName: unknown
@ -45612,6 +45612,7 @@ __metadata:
file-saver: "npm:^2.0.5"
recoil-sync: "npm:^0.2.0"
transliteration: "npm:^2.3.5"
twenty-shared: "workspace:*"
languageName: unknown
linkType: soft
@ -45673,6 +45674,8 @@ __metadata:
rimraf: "npm:^5.0.5"
ts-morph: "npm:^24.0.0"
tsconfig-paths: "npm:^4.2.0"
twenty-emails: "workspace:*"
twenty-shared: "workspace:*"
typeorm: "patch:typeorm@0.3.20#./patches/typeorm+0.3.20.patch"
typescript: "npm:5.3.3"
unzipper: "npm:^0.12.3"
@ -45680,7 +45683,7 @@ __metadata:
languageName: unknown
linkType: soft
"twenty-shared@workspace:packages/twenty-shared":
"twenty-shared@workspace:*, twenty-shared@workspace:packages/twenty-shared":
version: 0.0.0-use.local
resolution: "twenty-shared@workspace:packages/twenty-shared"
languageName: unknown
@ -45689,6 +45692,8 @@ __metadata:
"twenty-ui@workspace:packages/twenty-ui":
version: 0.0.0-use.local
resolution: "twenty-ui@workspace:packages/twenty-ui"
dependencies:
twenty-shared: "workspace:*"
languageName: unknown
linkType: soft