Skip to content

Commit dbbc3fc

Browse files
yjaaidiColy010
andauthored
fix(vite): include vite mts config files (#28691)
Add `vite.config.mts` and `vitest.config.mts` to `vitest.workspace.ts` and `tsconfig` files. - Angular generator creates vite.config.mts files. - Users might also use mts files. <!-- Please make sure you have read the submission guidelines before posting an PR --> <!-- https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr --> <!-- Please make sure that your commit message follows our format --> <!-- Example: `fix(nx): must begin with lowercase` --> <!-- If this is a particularly complex change or feature addition, you can request a dedicated Nx release for this pull request branch. Mention someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they will confirm if the PR warrants its own release for testing purposes, and generate it for you if appropriate. --> ## Current Behavior <!-- This is the behavior we have today --> `vite.config.mts` and `vitest.config.mts` were ignored in `vitest.workspace.ts`. They were not included in the tsconfig files neither. ## Expected Behavior <!-- This is the behavior we should expect with the changes in this PR --> The opposite 😊 --------- Co-authored-by: Colum Ferry <[email protected]>
1 parent d8d6d13 commit dbbc3fc

File tree

8 files changed

+20
-2
lines changed

8 files changed

+20
-2
lines changed

packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,9 @@ exports[`app --unit-test-runner vitest should add tsconfig.spec.json 1`] = `
442442
},
443443
"include": [
444444
"vite.config.ts",
445+
"vite.config.mts",
445446
"vitest.config.ts",
447+
"vitest.config.mts",
446448
"src/**/*.test.ts",
447449
"src/**/*.spec.ts",
448450
"src/**/*.test.tsx",

packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ exports[`app generated files content - as-provided - my-app general application
168168
"include": [
169169
".nuxt/nuxt.d.ts",
170170
"vite.config.ts",
171+
"vite.config.mts",
171172
"vitest.config.ts",
173+
"vitest.config.mts",
172174
"src/**/*.test.ts",
173175
"src/**/*.spec.ts",
174176
"src/**/*.test.tsx",
@@ -531,7 +533,9 @@ exports[`app generated files content - as-provided - myApp general application s
531533
"include": [
532534
".nuxt/nuxt.d.ts",
533535
"vite.config.ts",
536+
"vite.config.mts",
534537
"vitest.config.ts",
538+
"vitest.config.mts",
535539
"src/**/*.test.ts",
536540
"src/**/*.spec.ts",
537541
"src/**/*.test.tsx",

packages/vite/src/generators/configuration/__snapshots__/configuration.spec.ts.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ exports[`@nx/vite:configuration js library with --bundler=vite should add build
8787
"include": ["src/**/*.ts"],
8888
"exclude": [
8989
"vite.config.ts",
90+
"vite.config.mts",
9091
"vitest.config.ts",
92+
"vitest.config.mts",
9193
"src/**/*.test.ts",
9294
"src/**/*.spec.ts",
9395
"src/**/*.test.tsx",

packages/vite/src/generators/vitest/__snapshots__/vitest.spec.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default defineConfig({
3535
`;
3636

3737
exports[`vitest generator tsconfig should add vitest.workspace.ts at the root 1`] = `
38-
"export default ['**/*/vite.config.ts', '**/*/vitest.config.ts'];
38+
"export default ['**/*/vite.config.{ts,mts}', '**/*/vitest.config.{ts,mts}'];
3939
"
4040
`;
4141

packages/vite/src/generators/vitest/files/tsconfig.spec.json__tmpl__

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
},
77
"include": [
88
"vite.config.ts",
9+
"vite.config.mts",
910
"vitest.config.ts",
11+
"vitest.config.mts",
1012
"src/**/*.test.ts",
1113
"src/**/*.spec.ts",
1214
"src/**/*.test.tsx",

packages/vite/src/generators/vitest/vitest-generator.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export async function vitestGeneratorInternal(
138138
) {
139139
tree.write(
140140
'vitest.workspace.ts',
141-
`export default ['**/*/vite.config.ts', '**/*/vitest.config.ts'];`
141+
`export default ['**/*/vite.config.{ts,mts}', '**/*/vitest.config.{ts,mts}'];`
142142
);
143143
}
144144

@@ -236,7 +236,9 @@ function updateTsConfig(
236236
const uniqueExclude = new Set([
237237
...(json.exclude || []),
238238
'vite.config.ts',
239+
'vite.config.mts',
239240
'vitest.config.ts',
241+
'vitest.config.mts',
240242
'src/**/*.test.ts',
241243
'src/**/*.spec.ts',
242244
'src/**/*.test.tsx',

packages/vite/src/generators/vitest/vitest.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ describe('vitest generator', () => {
6464
"extends": "./tsconfig.json",
6565
"include": [
6666
"vite.config.ts",
67+
"vite.config.mts",
6768
"vitest.config.ts",
69+
"vitest.config.mts",
6870
"src/**/*.test.ts",
6971
"src/**/*.spec.ts",
7072
"src/**/*.test.tsx",

packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@ exports[`library should add vue, vite and vitest to package.json 2`] = `
205205
"src/**/*.spec.vue",
206206
"src/**/*.test.vue",
207207
"vite.config.ts",
208+
"vite.config.mts",
208209
"vitest.config.ts",
210+
"vitest.config.mts",
209211
"src/**/*.test.ts",
210212
"src/**/*.spec.ts",
211213
"src/**/*.test.tsx",
@@ -261,7 +263,9 @@ exports[`library should ignore test files in tsconfig.lib.json 1`] = `
261263
"src/**/*.spec.vue",
262264
"src/**/*.test.vue",
263265
"vite.config.ts",
266+
"vite.config.mts",
264267
"vitest.config.ts",
268+
"vitest.config.mts",
265269
"src/**/*.test.ts",
266270
"src/**/*.spec.ts",
267271
"src/**/*.test.tsx",

0 commit comments

Comments
 (0)