chore(vite): update vite version (#16198)

This commit is contained in:
Katerina Skroumpelou 2023-05-04 20:06:15 +03:00 committed by GitHub
parent 80464ac8af
commit 6c46ad8b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 344 additions and 405 deletions

View File

@ -220,44 +220,43 @@ describe('Vite Plugin', () => {
updateFile(`libs/${lib}/vite.config.ts`, () => { updateFile(`libs/${lib}/vite.config.ts`, () => {
return `/// <reference types="vitest" /> return `/// <reference types="vitest" />
import { defineConfig } from 'vite'; import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react'; import react from '@vitejs/plugin-react';
import viteTsConfigPaths from 'vite-tsconfig-paths'; import viteTsConfigPaths from 'vite-tsconfig-paths';
export default defineConfig({ export default defineConfig({
server: { server: {
port: 4200, port: 4200,
host: 'localhost', host: 'localhost',
}, },
plugins: [ plugins: [
react(), react(),
viteTsConfigPaths({ viteTsConfigPaths({
root: './', root: './',
}), }),
], ],
test: { test: {
globals: true, globals: true,
cache: { cache: {
dir: './node_modules/.vitest', dir: './node_modules/.vitest',
}, },
environment: 'jsdom', environment: 'jsdom',
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
coverage: { coverage: {
provider: "c8", provider: "c8",
enabled: true, enabled: true,
lines: 100, lines: 100,
statements: 100, statements: 100,
functions: 100, functions: 100,
branches: 1000, branches: 1000,
} }
}, },
}); });
`; `;
}); });
const coverageDir = `${tmpProjPath()}/coverage/libs/${lib}`; const coverageDir = `${tmpProjPath()}/coverage/libs/${lib}`;
const results = runCLI(`test ${lib} --coverage`, { silenceError: true }); const results = runCLI(`test ${lib} --coverage`, { silenceError: true });
expect(results).toContain( expect(results).toContain(
`Running target test for project ${lib} failed` `Running target test for project ${lib} failed`
); );

View File

@ -63,7 +63,16 @@
"@ngrx/router-store": "~15.3.0", "@ngrx/router-store": "~15.3.0",
"@ngrx/store": "~15.3.0", "@ngrx/store": "~15.3.0",
"@nguniversal/builders": "~16.0.0", "@nguniversal/builders": "~16.0.0",
"nx-cloud": "16.0.5", "@nx/cypress": "16.1.0-rc.0",
"@nx/devkit": "16.1.0-rc.0",
"@nx/eslint-plugin": "16.1.0-rc.0",
"@nx/jest": "16.1.0-rc.0",
"@nx/js": "16.1.0-rc.0",
"@nx/linter": "16.1.0-rc.0",
"@nx/next": "16.1.0-rc.0",
"@nx/react": "16.1.0-rc.0",
"@nx/storybook": "16.1.0-rc.0",
"@nx/web": "16.1.0-rc.0",
"@nx/webpack": "16.1.0-rc.0", "@nx/webpack": "16.1.0-rc.0",
"@parcel/watcher": "2.0.4", "@parcel/watcher": "2.0.4",
"@phenomnomnominal/tsquery": "~5.0.1", "@phenomnomnominal/tsquery": "~5.0.1",
@ -201,6 +210,7 @@
"ng-packagr": "~16.0.0", "ng-packagr": "~16.0.0",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
"nx": "16.1.0-rc.0", "nx": "16.1.0-rc.0",
"nx-cloud": "16.0.5",
"octokit": "^2.0.14", "octokit": "^2.0.14",
"open": "^8.4.0", "open": "^8.4.0",
"ora": "5.3.0", "ora": "5.3.0",
@ -256,7 +266,7 @@
"url-loader": "^4.1.1", "url-loader": "^4.1.1",
"use-sync-external-store": "^1.2.0", "use-sync-external-store": "^1.2.0",
"verdaccio": "^5.0.4", "verdaccio": "^5.0.4",
"vite": "^4.0.1", "vite": "^4.3.4",
"webpack": "^5.80.0", "webpack": "^5.80.0",
"webpack-dev-server": "^4.9.3", "webpack-dev-server": "^4.9.3",
"webpack-merge": "^5.8.0", "webpack-merge": "^5.8.0",
@ -265,17 +275,7 @@
"webpack-subresource-integrity": "^5.1.0", "webpack-subresource-integrity": "^5.1.0",
"xstate": "4.34.0", "xstate": "4.34.0",
"yargs": "^17.6.2", "yargs": "^17.6.2",
"yargs-parser": "21.1.1", "yargs-parser": "21.1.1"
"@nx/devkit": "16.1.0-rc.0",
"@nx/js": "16.1.0-rc.0",
"@nx/linter": "16.1.0-rc.0",
"@nx/cypress": "16.1.0-rc.0",
"@nx/storybook": "16.1.0-rc.0",
"@nx/web": "16.1.0-rc.0",
"@nx/react": "16.1.0-rc.0",
"@nx/jest": "16.1.0-rc.0",
"@nx/next": "16.1.0-rc.0",
"@nx/eslint-plugin": "16.1.0-rc.0"
}, },
"author": "Victor Savkin", "author": "Victor Savkin",
"license": "MIT", "license": "MIT",
@ -327,7 +327,7 @@
"tailwind-merge": "^1.8.1", "tailwind-merge": "^1.8.1",
"tailwindcss": "3.2.4", "tailwindcss": "3.2.4",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"vitest": "^0.25.8", "vitest": "^0.31.0",
"weak-napi": "^2.0.2" "weak-napi": "^2.0.2"
}, },
"resolutions": { "resolutions": {
@ -346,4 +346,3 @@
] ]
} }
} }

View File

@ -5,5 +5,5 @@ export const cypressViteDevServerVersion = '^2.2.1';
export const cypressVersion = '^12.11.0'; export const cypressVersion = '^12.11.0';
export const cypressWebpackVersion = '^2.0.0'; export const cypressWebpackVersion = '^2.0.0';
export const webpackHttpPluginVersion = '^5.5.0'; export const webpackHttpPluginVersion = '^5.5.0';
export const viteVersion = '^4.0.1'; export const viteVersion = '^4.3.4';
export const htmlWebpackPluginVersion = '^5.5.0'; export const htmlWebpackPluginVersion = '^5.5.0';

View File

@ -26,6 +26,35 @@
} }
}, },
"packageJsonUpdates": { "packageJsonUpdates": {
"16.1.0-beta.0": {
"version": "16.1.0-beta.0",
"packages": {
"vite": {
"version": "^4.3.4",
"alwaysAddToPackageJson": false
},
"vite-tsconfig-paths": {
"version": "^4.2.0",
"alwaysAddToPackageJson": false
},
"vitest": {
"version": "^0.31.0",
"alwaysAddToPackageJson": false
},
"@vitest/coverage-c8": {
"version": "^0.31.0",
"alwaysAddToPackageJson": false
},
"@vitest/ui": {
"version": "^0.31.0",
"alwaysAddToPackageJson": false
},
"@vitest/coverage-istanbul": {
"version": "^0.31.0",
"alwaysAddToPackageJson": false
}
}
},
"15.3.1-beta.0": { "15.3.1-beta.0": {
"version": "15.3.1-beta.0", "version": "15.3.1-beta.0",
"packages": { "packages": {

View File

@ -37,8 +37,8 @@
"@nx/js": "file:../js" "@nx/js": "file:../js"
}, },
"peerDependencies": { "peerDependencies": {
"vite": "^4.0.1", "vite": "^4.3.4",
"vitest": ">=0.25.8 <1.0.0" "vitest": ">=0.31.0 <1.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

View File

@ -94,14 +94,15 @@ async function getSettings(
) { ) {
const projectRoot = context.projectGraph.nodes[context.projectName].data.root; const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
const offset = relative(workspaceRoot, context.cwd); const offset = relative(workspaceRoot, context.cwd);
// if reportsDirectory is not provides vitest will remove all files in the project root // if reportsDirectory is not provided vitest will remove all files in the project root
// when coverage is enabled in the vite.config.ts // when coverage is enabled in the vite.config.ts
const coverage: CoverageOptions = options.reportsDirectory const coverage: CoverageOptions = options.reportsDirectory
? { ? {
enabled: options.coverage, enabled: options.coverage,
reportsDirectory: options.reportsDirectory, reportsDirectory: options.reportsDirectory,
provider: 'c8',
} }
: {}; : ({} as CoverageOptions);
const viteConfigPath = options.config const viteConfigPath = options.config
? join(context.root, options.config) ? join(context.root, options.config)
@ -115,7 +116,7 @@ async function getSettings(
viteConfigPath viteConfigPath
); );
if (!viteConfigPath || !resolved?.config?.test) { if (!viteConfigPath || !resolved?.config?.['test']) {
logger.warn(stripIndents`Unable to load test config from config file ${ logger.warn(stripIndents`Unable to load test config from config file ${
resolved?.path ?? viteConfigPath resolved?.path ?? viteConfigPath
} }
@ -134,10 +135,10 @@ You can manually set the config in the project, ${
root: offset === '' ? projectRoot : '', root: offset === '' ? projectRoot : '',
reporters: [ reporters: [
...(options.reporters ?? []), ...(options.reporters ?? []),
...((resolved?.config?.test?.reporters as string[]) ?? []), ...((resolved?.config?.['test']?.reporters as string[]) ?? []),
'default', 'default',
] as (string | Reporter)[], ] as (string | Reporter)[],
coverage: { ...resolved?.config?.test?.coverage, ...coverage }, coverage: { ...coverage, ...resolved?.config?.['test']?.coverage },
}; };
return settings; return settings;

View File

@ -9,15 +9,15 @@ exports[`@nx/vite:init dependencies for package.json should add vite packages an
"@nx/js": "0.0.1", "@nx/js": "0.0.1",
"@nx/vite": "0.0.1", "@nx/vite": "0.0.1",
"@vitejs/plugin-react": "^3.0.0", "@vitejs/plugin-react": "^3.0.0",
"@vitest/ui": "^0.25.8", "@vitest/ui": "^0.31.0",
"existing": "1.0.0", "existing": "1.0.0",
"jsdom": "~20.0.3", "jsdom": "~20.0.3",
"prettier": "^2.6.2", "prettier": "^2.6.2",
"typescript": "~5.0.2", "typescript": "~5.0.2",
"vite": "^4.0.1", "vite": "^4.3.4",
"vite-plugin-eslint": "^1.8.1", "vite-plugin-eslint": "^1.8.1",
"vite-tsconfig-paths": "^4.0.2", "vite-tsconfig-paths": "^4.0.2",
"vitest": "^0.25.8", "vitest": "^0.31.0",
}, },
"name": "test-name", "name": "test-name",
} }

View File

@ -1,8 +1,8 @@
export const nxVersion = require('../../package.json').version; export const nxVersion = require('../../package.json').version;
export const viteVersion = '^4.0.1'; export const viteVersion = '^4.3.4';
export const vitePluginEslintVersion = '^1.8.1'; export const vitePluginEslintVersion = '^1.8.1';
export const vitestVersion = '^0.25.8'; export const vitestVersion = '^0.31.0';
export const vitestUiVersion = '^0.25.8'; export const vitestUiVersion = '^0.31.0';
export const vitePluginReactVersion = '^3.0.0'; export const vitePluginReactVersion = '^3.0.0';
export const vitePluginVueVersion = '^3.2.0'; export const vitePluginVueVersion = '^3.2.0';
export const vitePluginVueJsxVersion = '^2.1.1'; export const vitePluginVueJsxVersion = '^2.1.1';
@ -11,5 +11,5 @@ export const jsdomVersion = '~20.0.3';
export const vitePluginDtsVersion = '~1.7.1'; export const vitePluginDtsVersion = '~1.7.1';
// Coverage providers // Coverage providers
export const vitestCoverageC8Version = '~0.25.8'; export const vitestCoverageC8Version = '^0.31.0';
export const vitestCoverageIstanbulVersion = '~0.25.8'; export const vitestCoverageIstanbulVersion = '^0.31.0';

595
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff