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.

Sign up for GitHub

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

Jump to bottom

fix(vite): include vite mts config files #28691

Merged
merged 2 commits into from
Oct 30, 2024
+20 −2
Merged

fix(vite): include vite mts config files #28691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc983da
fix(vite): include vite mts config files
yjaaidi Oct 30, 2024
ea78091
chore(vite): update snapshots
Coly010 Oct 30, 2024
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
2 changes: 2 additions & 0 deletions packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,9 @@ exports[`app --unit-test-runner vitest should add tsconfig.spec.json 1`] = `
},
"include": [
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down
4 changes: 4 additions & 0 deletions packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ exports[`app generated files content - as-provided - my-app general application
"include": [
".nuxt/nuxt.d.ts",
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down Expand Up @@ -531,7 +533,9 @@ exports[`app generated files content - as-provided - myApp general application s
"include": [
".nuxt/nuxt.d.ts",
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down
2 changes: 2 additions & 0 deletions packages/vite/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ exports[`@nx/vite:configuration js library with --bundler=vite should add build
"include": ["src/**/*.ts"],
"exclude": [
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/generators/vitest/__snapshots__/vitest.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default defineConfig({
`;

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

Expand Down
2 changes: 2 additions & 0 deletions packages/vite/src/generators/vitest/files/tsconfig.spec.json__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
},
"include": [
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down
4 changes: 3 additions & 1 deletion packages/vite/src/generators/vitest/vitest-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export async function vitestGeneratorInternal(
) {
tree.write(
'vitest.workspace.ts',
`export default ['**/*/vite.config.ts', '**/*/vitest.config.ts'];`
`export default ['**/*/vite.config.{ts,mts}', '**/*/vitest.config.{ts,mts}'];`
);
}

Expand Down Expand Up @@ -236,7 +236,9 @@ function updateTsConfig(
const uniqueExclude = new Set([
...(json.exclude || []),
'vite.config.ts',
'vite.config.mts',
'vitest.config.ts',
'vitest.config.mts',
'src/**/*.test.ts',
'src/**/*.spec.ts',
'src/**/*.test.tsx',
Expand Down
2 changes: 2 additions & 0 deletions packages/vite/src/generators/vitest/vitest.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ describe('vitest generator', () => {
"extends": "./tsconfig.json",
"include": [
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down
4 changes: 4 additions & 0 deletions packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ exports[`library should add vue, vite and vitest to package.json 2`] = `
"src/**/*.spec.vue",
"src/**/*.test.vue",
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down Expand Up @@ -261,7 +263,9 @@ exports[`library should ignore test files in tsconfig.lib.json 1`] = `
"src/**/*.spec.vue",
"src/**/*.test.vue",
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
Expand Down