Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add css key to vite config #518

Merged
merged 9 commits into from
Feb 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ Useful for configuring custom source alias paths during imports
- `Array<{ find: string | RegExp, replacement: string, customResolver?: ResolverFunction | ResolverObject }>`
- [Vite documentation: resolve.alias](https://vite.dev/config/shared-options#resolve-alias)

### `vite.css `

Config object for managing CSS behavior and integration with preprocessors (e.g., Sass, Less, etc.)

- Type: `CSSOptions`
- [Vite documentation: css](https://vite.dev/config/shared-options#css-modules)

### `vite.optimizeDeps`

Vite's dependency optimizer used only during dev
Expand Down
2 changes: 1 addition & 1 deletion packages/tuono-fs-router-vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@babel/core": "^7.24.4",
"@babel/types": "^7.24.0",
"prettier": "^3.2.4",
"vite": "^5.2.12"
"vite": "^5.4.14"
},
"devDependencies": {
"@tanstack/config": "0.7.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/tuono-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@vitejs/plugin-react-swc": "3.7.2",
"happy-dom": "16.8.1",
"react": "19.0.0",
"vite": "5.4.12",
"vite": "5.4.14",
"vitest": "2.1.9"
}
}
2 changes: 1 addition & 1 deletion packages/tuono/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"fast-text-encoding": "^1.0.6",
"tuono-fs-router-vite-plugin": "workspace:*",
"tuono-router": "workspace:*",
"vite": "^5.2.12",
"vite": "^5.4.14",
"web-streams-polyfill": "^4.0.0"
},
"devDependencies": {
Expand Down
56 changes: 42 additions & 14 deletions packages/tuono/src/build/config/normalize-config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,25 @@ describe('normalizeConfig', () => {

expect(normalizeConfig(config)).toStrictEqual({
server: { host: 'localhost', port: 3000 },
vite: { alias: undefined, optimizeDeps: undefined, plugins: [] },
vite: {
alias: undefined,
css: undefined,
optimizeDeps: undefined,
plugins: [],
},
})
})

it('should return an empty config if invalid values are provided', () => {
// @ts-expect-error testing invalid config
expect(normalizeConfig({ invalid: true })).toStrictEqual({
server: { host: 'localhost', port: 3000 },
vite: { alias: undefined, optimizeDeps: undefined, plugins: [] },
vite: {
alias: undefined,
css: undefined,
optimizeDeps: undefined,
plugins: [],
},
})
})

Expand Down Expand Up @@ -114,22 +124,40 @@ describe('normalizeConfig', () => {
expect.objectContaining({
vite: expect.objectContaining({
alias: [
{
find: '1',
replacement: '@tabler/icons-react-fun',
},
{
find: '2',
replacement: path.join(PROCESS_CWD_MOCK, 'src'),
},
{
find: '3',
replacement: 'file://pluto',
},
{ find: '1', replacement: '@tabler/icons-react-fun' },
{ find: '2', replacement: path.join(PROCESS_CWD_MOCK, 'src') },
{ find: '3', replacement: 'file://pluto' },
],
}) as unknown,
}),
)
})
})

describe('vite - css config', () => {
it('should have css undefined if not provided', () => {
const config: TuonoConfig = {}

expect(normalizeConfig(config).vite).toHaveProperty('css', undefined)
})

it('should preserve the css configuration as provided by the user', () => {
const cssConfig = {
preprocessorOptions: {
scss: { additionalData: '$color: red;' },
},
}
const config: TuonoConfig = {
vite: { css: cssConfig },
}

expect(normalizeConfig(config)).toStrictEqual(
expect.objectContaining({
vite: expect.objectContaining({
css: cssConfig,
}) as unknown,
}),
)
})
})
})
1 change: 1 addition & 0 deletions packages/tuono/src/build/config/normalize-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export const normalizeConfig = (config: TuonoConfig): InternalTuonoConfig => {
},
vite: {
alias: normalizeViteAlias(config.vite?.alias),
css: config.vite?.css,
optimizeDeps: config.vite?.optimizeDeps,
plugins: config.vite?.plugins ?? [],
},
Expand Down
2 changes: 2 additions & 0 deletions packages/tuono/src/build/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ function createBaseViteConfigFromTuonoConfig(
alias: tuonoConfig.vite?.alias ?? {},
},

css: tuonoConfig.vite?.css,

optimizeDeps: tuonoConfig.vite?.optimizeDeps,

plugins: [
Expand Down
8 changes: 7 additions & 1 deletion packages/tuono/src/config/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import type { AliasOptions, DepOptimizationOptions, PluginOption } from 'vite'
import type {
AliasOptions,
DepOptimizationOptions,
PluginOption,
CSSOptions,
} from 'vite'

/**
* @see http://tuono.dev/documentation/configuration
Expand All @@ -10,6 +15,7 @@ export interface TuonoConfig {
}
vite?: {
alias?: AliasOptions
css?: CSSOptions
optimizeDeps?: DepOptimizationOptions
plugins?: Array<PluginOption>
}
Expand Down
Loading
Loading