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

chore(deps): bump vitest to v3 #6842

Merged
merged 2 commits into from
Feb 18, 2025
Merged

chore(deps): bump vitest to v3 #6842

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
d2cdab5
chore: bump vitest
9aoy Feb 18, 2025
a5c9068
fix: cross-env
9aoy Feb 18, 2025
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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test": "npm run test:ut",
"test:rspack": "cd tests && pnpm run test:rspack",
"test:jest": "cd tests && pnpm run test:ut",
"test:vitest": "node scripts/vitest-config/vitestRunAll.js",
"test:vitest": "cross-env VITE_CJS_IGNORE_WARNING=true node scripts/vitest-config/vitestRunAll.js",
"test:ut": "pnpm run test:jest && pnpm run test:vitest",
"test:ut:update": "pnpm run test:jest -u && pnpm run test:vitest -u",
"test:e2e": "cd tests && npm run test",
Expand Down Expand Up @@ -75,7 +75,7 @@
"@scripts/build": "workspace:*",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.1",
"@vitest/ui": "^0.34.0",
"@vitest/ui": "^3.0.0",
"antd": "^5",
"check-dependency-version-consistency": "4.1.1",
"cross-env": "^7.0.3",
Expand All @@ -84,7 +84,7 @@
"lint-staged": "~13.3.0",
"nx": "^17.0.1",
"rimraf": "^6.0.1",
"vitest": "0.34.6"
"vitest": "^3.0.0"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/uni-builder/src/shared/parseCommonConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export async function parseCommonConfig(
}

if (disableCssExtract) {
output.injectStyles = disableCssExtract;
output.injectStyles ??= disableCssExtract;
}

if (enableInlineStyles) {
Expand Down
36 changes: 18 additions & 18 deletions packages/cli/uni-builder/tests/__snapshots__/default.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,12 +944,12 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
DefinePlugin {
"_args": [
{
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": true,
"import.meta.env.MODE": "\\"development\\"",
"import.meta.env.MODE": ""development"",
"import.meta.env.PROD": false,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
],
Expand Down Expand Up @@ -1773,12 +1773,12 @@ exports[`uni-builder rspack > should generator rspack config correctly when node
DefinePlugin {
"_args": [
{
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"production\\"",
"import.meta.env.MODE": ""production"",
"import.meta.env.PROD": true,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
],
Expand Down Expand Up @@ -2827,12 +2827,12 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
DefinePlugin {
"_args": [
{
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"production\\"",
"import.meta.env.MODE": ""production"",
"import.meta.env.PROD": true,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
],
Expand Down Expand Up @@ -3596,12 +3596,12 @@ exports[`uni-builder rspack > should generator rspack config correctly when serv
DefinePlugin {
"_args": [
{
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"production\\"",
"import.meta.env.MODE": ""production"",
"import.meta.env.PROD": true,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
],
Expand Down Expand Up @@ -4823,12 +4823,12 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
},
DefinePlugin {
"definitions": {
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": true,
"import.meta.env.MODE": "\\"development\\"",
"import.meta.env.MODE": ""development"",
"import.meta.env.PROD": false,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
},
Expand Down Expand Up @@ -6194,12 +6194,12 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
},
DefinePlugin {
"definitions": {
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"production\\"",
"import.meta.env.MODE": ""production"",
"import.meta.env.PROD": true,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
},
Expand Down
18 changes: 9 additions & 9 deletions packages/cli/uni-builder/tests/__snapshots__/environment.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,12 +945,12 @@ exports[`uni-builder environment compat > should generator environment config co
DefinePlugin {
"_args": [
{
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": true,
"import.meta.env.MODE": "\\"development\\"",
"import.meta.env.MODE": ""development"",
"import.meta.env.PROD": false,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
],
Expand Down Expand Up @@ -1691,12 +1691,12 @@ exports[`uni-builder environment compat > should generator environment config co
DefinePlugin {
"_args": [
{
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": true,
"import.meta.env.MODE": "\\"development\\"",
"import.meta.env.MODE": ""development"",
"import.meta.env.PROD": false,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
],
Expand Down Expand Up @@ -2419,12 +2419,12 @@ exports[`uni-builder environment compat > should generator environment config co
DefinePlugin {
"_args": [
{
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": true,
"import.meta.env.MODE": "\\"development\\"",
"import.meta.env.MODE": ""development"",
"import.meta.env.PROD": false,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
],
Expand Down
22 changes: 11 additions & 11 deletions packages/cli/uni-builder/tests/__snapshots__/globalVars.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ exports[`plugin-global-vars > 'globalVars function' 1`] = `
[
DefinePlugin {
"definitions": {
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"none\\"",
"import.meta.env.MODE": ""none"",
"import.meta.env.PROD": false,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
},
DefinePlugin {
"definitions": {
"ENV": "\\"test\\"",
"TARGET": "\\"web\\"",
"ENV": ""test"",
"TARGET": ""web"",
},
},
]
Expand All @@ -26,20 +26,20 @@ exports[`plugin-global-vars > 'globalVars' 1`] = `
[
DefinePlugin {
"definitions": {
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"none\\"",
"import.meta.env.MODE": ""none"",
"import.meta.env.PROD": false,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
},
DefinePlugin {
"definitions": {
"import.meta.bar": "{\\"a\\":\\"bar\\",\\"b\\":false,\\"c\\":{\\"d\\":42}}",
"process.env.foo": "\\"foo\\"",
"window.baz": "[null,\\"baz\\"]",
"import.meta.bar": "{"a":"bar","b":false,"c":{"d":42}}",
"process.env.foo": ""foo"",
"window.baz": "[null,"baz"]",
},
},
]
Expand Down
18 changes: 9 additions & 9 deletions packages/cli/uni-builder/tests/__snapshots__/minimize.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ exports[`html minify > should not apply html minify in production when disableMi
},
DefinePlugin {
"definitions": {
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"production\\"",
"import.meta.env.MODE": ""production"",
"import.meta.env.PROD": true,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
},
Expand Down Expand Up @@ -218,12 +218,12 @@ exports[`html minify > should not apply html minify when htmlPlugin.minify false
},
DefinePlugin {
"definitions": {
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"production\\"",
"import.meta.env.MODE": ""production"",
"import.meta.env.PROD": true,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
},
Expand Down Expand Up @@ -288,12 +288,12 @@ exports[`html minify > should not apply html plugin when htmlPlugin false 1`] =
},
DefinePlugin {
"definitions": {
"import.meta.env.ASSET_PREFIX": "\\"\\"",
"import.meta.env.ASSET_PREFIX": """",
"import.meta.env.BASE_URL": "\\"/\\"",
"import.meta.env.DEV": false,
"import.meta.env.MODE": "\\"production\\"",
"import.meta.env.MODE": ""production"",
"import.meta.env.PROD": true,
"process.env.ASSET_PREFIX": "\\"\\"",
"process.env.ASSET_PREFIX": """",
"process.env.BASE_URL": "\\"/\\"",
},
},
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/uni-builder/tests/loaders/__snapshots__/rsc-ssr-loader.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ exports[`rscSsrLoader > should transform server module correctly 1`] = `
'use server';

export const foo = () => {
throw new Error(\\"Server actions must not be called during server-side rendering.\\")
throw new Error("Server actions must not be called during server-side rendering.")
}
export const bar = () => {
throw new Error(\\"Server actions must not be called during server-side rendering.\\")
throw new Error("Server actions must not be called during server-side rendering.")
}
export const b = () => {
throw new Error(\\"Server actions must not be called during server-side rendering.\\")
throw new Error("Server actions must not be called during server-side rendering.")
}
export default () => {throw new Error(\\"Server actions must not be called during server-side rendering.\\")}"
export default () => {throw new Error("Server actions must not be called during server-side rendering.")}"
`;
15 changes: 9 additions & 6 deletions packages/cli/uni-builder/tests/parseConfig.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,11 @@ describe('parseCommonConfig', () => {
});

const injectStylesCases: [UniBuilderConfig['output'], OutputConfig][] = [
[{}, { injectStyles: false }],
[{}, { injectStyles: undefined }],
[{ injectStyles: true }, { injectStyles: true }],
[{ injectStyles: false }, { injectStyles: false }],
[{ disableCssExtract: true }, { injectStyles: true }],
[{ disableCssExtract: false }, { injectStyles: false }],
[{ disableCssExtract: false }, { injectStyles: undefined }],
[{ disableCssExtract: true, injectStyles: true }, { injectStyles: true }],
[{ disableCssExtract: false, injectStyles: true }, { injectStyles: true }],
[{ disableCssExtract: true, injectStyles: false }, { injectStyles: false }],
Expand All @@ -350,12 +350,15 @@ describe('parseCommonConfig', () => {
{ injectStyles: false },
],
];
test('output.injectStyles', () => {
describe('output.injectStyles', () => {
for (const [config, output] of injectStylesCases) {
test(`${JSON.stringify(config)} => ${JSON.stringify(output)}`, async () => {
test(`${JSON.stringify(config)} => ${JSON.stringify(
output,
)}`, async () => {
expect(
(await parseCommonConfig({ output: config })).rsbuildConfig.output,
).toEqual(output);
(await parseCommonConfig({ output: config })).rsbuildConfig.output
?.injectStyles,
).toEqual(output.injectStyles);
});
}
});
Expand Down
Loading
Loading