From b488dd3747629e34b6f535002b967c1e18f0d7fa Mon Sep 17 00:00:00 2001 From: Adam Hines Date: Tue, 15 Aug 2023 09:10:17 -0600 Subject: [PATCH] chore: applying review feedback --- packages/vitest/src/node/plugins/cssEnabler.ts | 8 ++------ test/css/testing.mjs | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/vitest/src/node/plugins/cssEnabler.ts b/packages/vitest/src/node/plugins/cssEnabler.ts index a45fea4b9bd9..ad190f4af383 100644 --- a/packages/vitest/src/node/plugins/cssEnabler.ts +++ b/packages/vitest/src/node/plugins/cssEnabler.ts @@ -7,6 +7,7 @@ import { toArray } from '../../utils' const cssLangs = '\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)' const cssLangRE = new RegExp(cssLangs) const cssModuleRE = new RegExp(`\\.module${cssLangs}`) +const cssInlineRE = /[?&]inline(&|$)/ function isCSS(id: string) { return cssLangRE.test(id) @@ -19,12 +20,7 @@ function isCSSModule(id: string) { // inline css requests are expected to just return the // string content directly and not the proxy module function isInline(id: string) { - const queryStart = id.indexOf('?'); - if (queryStart === -1) { - return false; - } - const queryParts = id.substring(queryStart + 1).split('&'); - return queryParts.some(part => part === 'inline'); + return cssInlineRE.test(id); } function getCSSModuleProxyReturn(strategy: CSSModuleScopeStrategy, filename: string) { diff --git a/test/css/testing.mjs b/test/css/testing.mjs index 32512292036b..0a1872737ce6 100644 --- a/test/css/testing.mjs +++ b/test/css/testing.mjs @@ -3,15 +3,15 @@ import { startVitest } from 'vitest/node' const configs = [ ['test/default-css', {}], ['test/process-css', { include: [/App\.css/] }], - ['test/process-module', { include: [/App\.module\.css/] }], - ['test/process-inline', { include: [/App\.module\.css/] }], + [['test/process-module', 'test/process-inline'], { include: [/App\.module\.css/] }], ['test/scope-module', { include: [/App\.module\.css/], modules: { classNameStrategy: 'scoped' } }], ['test/non-scope-module', { include: [/App\.module\.css/], modules: { classNameStrategy: 'non-scoped' } }], ] async function runTests() { for (const [name, config] of configs) { - await startVitest('test', [name], { + const names = Array.isArray(name) ? name : [name]; + await startVitest('test', names, { run: true, css: config, update: false,