Skip to content

Commit

Permalink
Fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasbordeau committed Aug 19, 2024
1 parent 18680a8 commit 952640f
Show file tree
Hide file tree
Showing 11 changed files with 119 additions and 57 deletions.
6 changes: 6 additions & 0 deletions packages/twenty-front/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
"outputPath": "{projectRoot}/build"
}
},
"serve": {
"executor": "nx:run-commands",
"options": {
"command": "npx serve -s {projectRoot}/build"
}
},
"start": {
"executor": "@nx/vite:dev-server",
"options": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const meta: Meta<typeof Status> = {
component: Status,
args: {
text: 'Urgent',
weight: 'medium',
},
};

Expand Down
22 changes: 22 additions & 0 deletions packages/twenty-front/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"types": ["node"]
},
"exclude": [
"**/__mocks__/**/*",
"**/*.spec.ts",
"**/*.spec.tsx",
"**/*.stories.ts",
"**/*.stories.tsx",
"**/*.test.ts",
"**/*.test.tsx"
],
"include": [
"src/**/*.js",
"src/**/*.jsx",
"src/**/*.d.ts",
"src/**/*.ts",
"src/**/*.tsx"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"compilerOptions": {
"types": ["node"]
},
"exclude": ["**/__mocks__/**/*"],
"include": [
"src/**/*.js",
"src/**/*.jsx",
Expand Down
5 changes: 4 additions & 1 deletion packages/twenty-front/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
"path": "./tsconfig.dev.json"
},
{
"path": "./tsconfig.build.json"
},
{
"path": "./tsconfig.spec.json"
Expand Down
6 changes: 5 additions & 1 deletion packages/twenty-front/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ export default defineConfig(({ command, mode }) => {

const isBuildCommand = command === 'build';

const tsConfigPath = isBuildCommand
? path.resolve(__dirname, './tsconfig.build.json')
: path.resolve(__dirname, './tsconfig.dev.json');

const checkers: Checkers = {
typescript: {
tsconfigPath: path.resolve(__dirname, './tsconfig.app.json'),
tsconfigPath: tsConfigPath,
},
overlay: false,
};
Expand Down
4 changes: 1 addition & 3 deletions packages/twenty-ui/src/utilities/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,4 @@ const getDefaultUrl = () => {
};

export const REACT_APP_SERVER_BASE_URL =
window._env_?.REACT_APP_SERVER_BASE_URL ||
process.env.REACT_APP_SERVER_BASE_URL ||
getDefaultUrl();
window._env_?.REACT_APP_SERVER_BASE_URL || getDefaultUrl();
File renamed without changes.
12 changes: 12 additions & 0 deletions packages/twenty-ui/tsconfig.dev.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "./tsconfig.json",
"exclude": [
"**/*.spec.ts",
"**/*.spec.tsx",
"**/*.stories.ts",
"**/*.stories.tsx",
"**/*.test.ts",
"**/*.test.tsx"
],
"include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.tsx"]
}
5 changes: 4 additions & 1 deletion packages/twenty-ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"include": [],
"references": [
{
"path": "./tsconfig.lib.json"
"path": "./tsconfig.build.json"
},
{
"path": "./tsconfig.dev.json"
},
{
"path": "./tsconfig.spec.json"
Expand Down
114 changes: 64 additions & 50 deletions packages/twenty-ui/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,64 +4,78 @@ import wyw from '@wyw-in-js/vite';
import * as path from 'path';
import { defineConfig } from 'vite';
import checker from 'vite-plugin-checker';
import dts from 'vite-plugin-dts';
import dts, { PluginOptions } from 'vite-plugin-dts';
import svgr from 'vite-plugin-svgr';
import tsconfigPaths from 'vite-tsconfig-paths';

import { UserPluginConfig } from 'vite-plugin-checker/dist/esm/types';

// eslint-disable-next-line @nx/enforce-module-boundaries, import/no-relative-packages
import packageJson from '../../package.json';

export default defineConfig({
root: __dirname,
cacheDir: '../../node_modules/.vite/packages/twenty-ui',
export default defineConfig(({ command, mode }) => {
const isBuildCommand = command === 'build';

plugins: [
react({ jsxImportSource: '@emotion/react' }),
tsconfigPaths(),
svgr(),
dts({
entryRoot: 'src',
tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
}),
checker({
typescript: {
tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
},
}),
wyw({
include: [
'**/OverflowingTextWithTooltip.tsx',
'**/Chip.tsx',
'**/Tag.tsx',
'**/Avatar.tsx',
'**/AvatarChip.tsx',
],
babelOptions: {
presets: ['@babel/preset-typescript', '@babel/preset-react'],
},
}),
],
const tsConfigPath = isBuildCommand
? path.resolve(__dirname, './tsconfig.build.json')
: path.resolve(__dirname, './tsconfig.dev.json');

// Configuration for building your library.
// See: https://vitejs.dev/guide/build.html#library-mode
build: {
outDir: './dist',
reportCompressedSize: true,
commonjsOptions: {
transformMixedEsModules: true,
const checkersConfig: UserPluginConfig = {
typescript: {
tsconfigPath: tsConfigPath,
},
lib: {
// Could also be a dictionary or array of multiple entry points.
entry: 'src/index.ts',
name: 'twenty-ui',
fileName: 'index',
// Change this to the formats you want to support.
// Don't forget to update your package.json as well.
formats: ['es', 'cjs'],
},
rollupOptions: {
// External packages that should not be bundled into your library.
external: Object.keys(packageJson.dependencies || {}),
};

const dtsConfig: PluginOptions = {
entryRoot: 'src',
tsconfigPath: tsConfigPath,
};

return {
root: __dirname,
cacheDir: '../../node_modules/.vite/packages/twenty-ui',

plugins: [
react({ jsxImportSource: '@emotion/react' }),
tsconfigPaths(),
svgr(),
dts(dtsConfig),
checker(checkersConfig),
wyw({
include: [
'**/OverflowingTextWithTooltip.tsx',
'**/Chip.tsx',
'**/Tag.tsx',
'**/Avatar.tsx',
'**/AvatarChip.tsx',
],
babelOptions: {
presets: ['@babel/preset-typescript', '@babel/preset-react'],
},
}),
],

// Configuration for building your library.
// See: https://vitejs.dev/guide/build.html#library-mode
build: {
outDir: './dist',
reportCompressedSize: true,
commonjsOptions: {
transformMixedEsModules: true,
},
lib: {
// Could also be a dictionary or array of multiple entry points.
entry: 'src/index.ts',
name: 'twenty-ui',
fileName: 'index',
// Change this to the formats you want to support.
// Don't forget to update your package.json as well.
formats: ['es', 'cjs'],
},
rollupOptions: {
// External packages that should not be bundled into your library.
external: Object.keys(packageJson.dependencies || {}),
},
},
},
};
});

0 comments on commit 952640f

Please sign in to comment.