chore: cleanup

vitest-dev · Sep 4, 2022 · 58a777f · 58a777f
1 parent acb209a
commit 58a777f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/docs/config/index.md b/docs/config/index.md
@@ -724,10 +724,10 @@ RegExp pattern for files that will return an empty CSS file.
 
 #### css.modules
 
-- **Type**: `{ classNamesStrategy? }`
+- **Type**: `{ classNameStrategy? }`
 - **Default**: `{}`
 
-#### css.modules.classNamesStrategy
+#### css.modules.classNameStrategy
 
 - **Type**: `'stable' | 'scoped' | 'non-scoped'`
 - **Default**: `'stable'`

diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts
@@ -184,7 +184,7 @@ export function resolveConfig(
   resolved.css ??= {}
   if (typeof resolved.css === 'object') {
     resolved.css.modules ??= {}
-    resolved.css.modules.classNamesStrategy ??= 'stable'
+    resolved.css.modules.classNameStrategy ??= 'stable'
   }
 
   resolved.cache ??= { dir: '' }

diff --git a/packages/vitest/src/node/plugins/cssEnabler.ts b/packages/vitest/src/node/plugins/cssEnabler.ts
@@ -60,7 +60,7 @@ export function CSSEnablerPlugin(ctx: Vitest): VitePlugin[] {
           // return proxy for css modules, so that imported module has names:
           // styles.foo returns a "foo" instead of "undefined"
           // we don't use code content to generate hash for "scoped", because it's empty
-          const scopeStrategy = (typeof ctx.config.css !== 'boolean' && ctx.config.css.modules?.classNamesStrategy) || 'stable'
+          const scopeStrategy = (typeof ctx.config.css !== 'boolean' && ctx.config.css.modules?.classNameStrategy) || 'stable'
           const proxyReturn = getCSSModuleProxyReturn(scopeStrategy, relative(ctx.config.root, id))
           const code = `export default new Proxy(Object.create(null), {
             get(_, style) {

diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
@@ -102,14 +102,14 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest())
           },
         }
 
-        const classNamesStrategy = preOptions.css && preOptions.css?.modules?.classNamesStrategy
+        const classNameStrategy = preOptions.css && preOptions.css?.modules?.classNameStrategy
 
-        if (classNamesStrategy !== 'scoped') {
+        if (classNameStrategy !== 'scoped') {
           config.css ??= {}
           config.css.modules ??= {}
           config.css.modules.generateScopedName = (name: string, filename: string) => {
             const root = getRoot()
-            return generateScopedClassName(classNamesStrategy, name, relative(root, filename))!
+            return generateScopedClassName(classNameStrategy, name, relative(root, filename))!
           }
         }
 

diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
@@ -376,13 +376,13 @@ export interface InlineConfig {
    *
    * When excluded, the CSS files will be replaced with empty strings to bypass the subsequent processing.
    *
-   * @default { include: [], modules: { classNamesStrategy: false } }
+   * @default { include: [], modules: { classNameStrategy: false } }
    */
   css?: boolean | {
     include?: RegExp | RegExp[]
     exclude?: RegExp | RegExp[]
     modules?: {
-      classNamesStrategy?: CSSModuleScopeStrategy
+      classNameStrategy?: CSSModuleScopeStrategy
     }
   }
   /**

diff --git a/test/css/testing.mjs b/test/css/testing.mjs
@@ -4,8 +4,8 @@ const configs = [
   ['test/default-css', {}],
   ['test/process-css', { include: [/App\.css/] }],
   ['test/process-module', { include: [/App\.module\.css/] }],
-  ['test/scope-module', { include: [/App\.module\.css/], modules: { classNamesStrategy: 'scoped' } }],
-  ['test/non-scope-module', { include: [/App\.module\.css/], modules: { classNamesStrategy: 'non-scoped' } }],
+  ['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() {