diff --git a/e2e/vite/src/vite.test.ts b/e2e/vite/src/vite.test.ts index 4e8c65110d..8bb0fffa6e 100644 --- a/e2e/vite/src/vite.test.ts +++ b/e2e/vite/src/vite.test.ts @@ -305,8 +305,7 @@ describe('Vite Plugin', () => { expect(result.combinedOutput).toContain( `Successfully ran target test for project ${lib}` ); - }), - 100_000; + }, 100_000); it('should be able to run tests with inSourceTests set to true', async () => { runCLI( diff --git a/packages/vite/src/generators/vitest/vitest.spec.ts b/packages/vite/src/generators/vitest/vitest.spec.ts index d093a723a3..f5953ddd07 100644 --- a/packages/vite/src/generators/vitest/vitest.spec.ts +++ b/packages/vite/src/generators/vitest/vitest.spec.ts @@ -105,14 +105,14 @@ describe('vitest generator', () => { /// import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; - import ViteTsConfigPathsPlugin from 'vite-tsconfig-paths'; + import tsconfigPaths from 'vite-tsconfig-paths'; export default defineConfig({ plugins: [ react(), - ViteTsConfigPathsPlugin({ + tsconfigPaths({ root: '../../', projects: ['tsconfig.base.json'], }), @@ -141,14 +141,14 @@ describe('vitest generator', () => { /// import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; - import ViteTsConfigPathsPlugin from 'vite-tsconfig-paths'; + import tsconfigPaths from 'vite-tsconfig-paths'; export default defineConfig({ plugins: [ react(), - ViteTsConfigPathsPlugin({ + tsconfigPaths({ root: '../../', projects: ['tsconfig.base.json'], }), diff --git a/packages/vite/src/utils/generator-utils.ts b/packages/vite/src/utils/generator-utils.ts index da22271796..d83e4f7386 100644 --- a/packages/vite/src/utils/generator-utils.ts +++ b/packages/vite/src/utils/generator-utils.ts @@ -414,7 +414,7 @@ export function writeViteConfig(tree: Tree, options: Schema) { ${options.includeVitest ? '/// ' : ''} import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; - import ViteTsConfigPathsPlugin from 'vite-tsconfig-paths'; + import tsconfigPaths from 'vite-tsconfig-paths'; ${ options.includeLib ? `import dts from 'vite-plugin-dts';\nimport { join } from 'path';` @@ -425,7 +425,7 @@ ${options.includeVitest ? '/// ' : ''} plugins: [ ${options.includeLib ? dtsPlugin : ''} react(), - ViteTsConfigPathsPlugin({ + tsconfigPaths({ root: '${offsetFromRoot(projectConfig.root)}', projects: ['tsconfig.base.json'], }), @@ -439,7 +439,7 @@ ${options.includeVitest ? '/// ' : ''} viteConfigContent = ` ${options.includeVitest ? '/// ' : ''} import { defineConfig } from 'vite'; - import ViteTsConfigPathsPlugin from 'vite-tsconfig-paths'; + import tsconfigPaths from 'vite-tsconfig-paths'; ${ options.includeLib ? `import dts from 'vite-plugin-dts';\nimport { join } from 'path';` @@ -449,7 +449,7 @@ ${options.includeVitest ? '/// ' : ''} export default defineConfig({ plugins: [ ${options.includeLib ? dtsPlugin : ''} - ViteTsConfigPathsPlugin({ + tsconfigPaths({ root: '${offsetFromRoot(projectConfig.root)}', projects: ['tsconfig.base.json'], }),