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(config): support .config dir #16516

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/vite/src/node/constants.ts
Expand Up @@ -43,6 +43,9 @@ export const DEFAULT_CONFIG_FILES = [
'vite.config.cjs',
'vite.config.mts',
'vite.config.cts',
'.config/vite.js',
'.config/vite.mjs',
'.config/vite.ts',
]

export const JS_TYPES_RE = /\.(?:j|t)sx?$|\.mjs$/
Expand Down
26 changes: 26 additions & 0 deletions playground/config-dir/__tests__/config-dir.spec.ts
@@ -0,0 +1,26 @@
import { resolve } from 'node:path'
import { loadConfigFromFile } from 'vite'
import { expect, it } from 'vitest'

it('loadConfigFromFile', async () => {
const { config } = await loadConfigFromFile(
{} as any,
resolve(__dirname, '../packages/entry/.config/vite.ts'),
resolve(__dirname, '../packages/entry'),
)
expect(config).toMatchInlineSnapshot(`
{
"array": [
[
1,
3,
],
[
2,
4,
],
],
"moduleCondition": "import condition",
}
`)
})
3 changes: 3 additions & 0 deletions playground/config-dir/__tests__/serve.ts
@@ -0,0 +1,3 @@
export function serve() {
return
}
7 changes: 7 additions & 0 deletions playground/config-dir/packages/entry/.config/vite.ts
@@ -0,0 +1,7 @@
import moduleCondition from '@vite/test-config-plugin-module-condition'
import { array } from '../../siblings/foo'

export default {
array,
moduleCondition,
}
7 changes: 7 additions & 0 deletions playground/config-dir/packages/entry/package.json
@@ -0,0 +1,7 @@
{
"name": "@vite/test-config-entry",
"type": "module",
"dependencies": {
"@vite/test-config-plugin-module-condition": "link:../plugin-config-dir-module-condition"
}
}
@@ -0,0 +1 @@
module.exports = 'require condition'
@@ -0,0 +1,2 @@
const str: string
export default str
@@ -0,0 +1 @@
export default 'import condition'
@@ -0,0 +1 @@
export default 'module condition'
@@ -0,0 +1,12 @@
{
"name": "@vite/test-config-dir-plugin-module-condition",
"type": "module",
"exports": {
".": {
"types": "./index.d.ts",
"module": "./module.mjs",
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
3 changes: 3 additions & 0 deletions playground/config-dir/packages/siblings/foo.ts
@@ -0,0 +1,3 @@
import lodash from 'lodash'

export const array = lodash.partition([1, 2, 3, 4], (n) => n % 2)
8 changes: 8 additions & 0 deletions playground/config-dir/packages/siblings/package.json
@@ -0,0 +1,8 @@
{
"name": "@vite/test-config-dir-sibling",
"type": "module",
"devDependencies": {
"@types/lodash": "^4.17.0",
"lodash": "^4.17.21"
}
}
17 changes: 17 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.