Skip to content

Commit 02be986

Browse files
woldtwerkwoldtwerk
committed
style: 🎨 💄 linting
1 parent c42b998 commit 02be986

File tree

13 files changed

+45
-46
lines changed

13 files changed

+45
-46
lines changed

‎packages/vite-plugin-drupal/src/importResolver.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type { ComponentResolver } from 'unplugin-vue-components'
12
import { parse } from 'node:path'
23
import { globSync } from 'tinyglobby'
3-
import type { ComponentResolver } from 'unplugin-vue-components'
44

55
export default (): ComponentResolver => {
66
const components = new Map()

‎packages/vite-plugin-drupal/src/index.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import type { Plugin } from 'vite'
2+
import type { Context, UserOptions } from './plugins/context'
23
import vue from '@vitejs/plugin-vue'
3-
import Icons from 'unplugin-icons/vite'
44
import Unimport from 'unimport/unplugin'
5+
import Icons from 'unplugin-icons/vite'
56
import Components from 'unplugin-vue-components/vite'
6-
import context from './plugins/context'
7-
import type { Context, UserOptions } from './plugins/context'
7+
import breakpoints from './plugins/breakpoints'
88
import config from './plugins/config'
9+
import context from './plugins/context'
910
import css from './plugins/css'
11+
import vuePlugin from './plugins/custom-elements'
1012
import libraries from './plugins/libraries'
13+
import restart from './plugins/restart'
14+
import tailwindConfig from './plugins/tailwind-config'
15+
import tailwindHMR from './plugins/tailwind-hmr'
1116
import themeInfo from './plugins/theme'
1217
import twig from './plugins/twig'
1318
import virtual from './plugins/virtual'
14-
import vuePlugin from './plugins/custom-elements'
15-
import breakpoints from './plugins/breakpoints'
16-
import tailwindHMR from './plugins/tailwind-hmr'
17-
import tailwindConfig from './plugins/tailwind-config'
1819
import vueCustomElement from './plugins/vue-custom-element'
19-
import restart from './plugins/restart'
2020
// import copyStatic from './plugins/copy-static'
2121

2222
export default (options: UserOptions = {}): Plugin[] => {

‎packages/vite-plugin-drupal/src/plugins/breakpoints.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import type { Plugin, ResolvedConfig } from 'vite'
2+
import type { Context } from './context'
13
import process from 'node:process'
24
import fse from 'fs-extra'
3-
import type { Plugin, ResolvedConfig } from 'vite'
4-
import YAML from 'yaml'
55
import resolveConfig from 'tailwindcss/resolveConfig.js'
6-
import type { Context } from './context'
6+
import YAML from 'yaml'
77

88
/**
99
*

‎packages/vite-plugin-drupal/src/plugins/config.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { basename, dirname, relative, resolve } from 'node:path'
2-
import fs from 'node:fs'
31
import type { Plugin } from 'vite'
4-
import { mergeConfig } from 'vite'
5-
import { glob } from 'tinyglobby'
62
import type { Context } from './context'
3+
import fs from 'node:fs'
4+
import { basename, dirname, relative, resolve } from 'node:path'
5+
import { glob } from 'tinyglobby'
6+
import { mergeConfig } from 'vite'
77

88
function postCssConfig() {
99
return fs.promises.access('postcss.config.js', fs.constants.F_OK)

‎packages/vite-plugin-drupal/src/plugins/css.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export default (ctx: Context): Plugin[] => {
1313
transform(src, id) {
1414
if (fileRegex.test(id)) {
1515
const s = new MagicString(src)
16-
console.log(src)
1716
s.replace(/@(tailwind) (.*);/g, (_, _$1, $2) => `/*>tailwind-${$2}*/\n@tailwind ${$2};\n/*<tailwind-${$2}*/`)
1817

1918
return {
@@ -28,7 +27,6 @@ export default (ctx: Context): Plugin[] => {
2827
transform(src, id) {
2928
if (fileRegex.test(id)) {
3029
const s = new MagicString(src)
31-
console.log('post', src)
3230
s.replace(/\/\*>(tailwind-.*)\*\//g, (_, $1) => `@layer ${$1} {`)
3331
s.replace(/\/\*<(tailwind-.*)\*\//g, '}')
3432

‎packages/vite-plugin-drupal/src/plugins/custom-elements.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { Plugin } from 'vite'
2+
import type { Context } from './context'
3+
import { camelize, hyphenate } from '@vue/shared'
24
import fse from 'fs-extra'
35
import { glob } from 'tinyglobby'
46
import { analyzeText, transformAnalyzerResult } from 'web-component-analyzer'
5-
import { camelize, hyphenate } from '@vue/shared'
67
import { common, eagerLoader, idleLoader, lazyLoader, visibleLoader } from '../ce/ceLoader'
7-
import type { Context } from './context'
88

99
const virtualModuleId = 'virtual:vue-ce-loader'
1010
const resolvedVirtualModuleId = `\0${virtualModuleId}`
@@ -19,7 +19,7 @@ export default (ctx: Context): Plugin => {
1919
lazy: lazyLoader,
2020
}
2121

22-
function cacheStringFunction(fn: Function) {
22+
function cacheStringFunction(fn: (str: string) => Promise<string>) {
2323
const cache = Object.create(null)
2424
return (str: string) => {
2525
const hit = cache[str]
@@ -74,7 +74,7 @@ export default (ctx: Context): Plugin => {
7474
})
7575

7676
function extractVueDocs(fileName: string, fileContent: string) {
77-
const docsBlock = fileContent.match(/<docs.*>([\s\S]*?)<\/docs>/g)
77+
const docsBlock = fileContent.match(/<docs[^>]*>([\s\S]*?)<\/docs>/g)
7878
const tagName = getTagName(fileName)
7979

8080
tagNameMap.add(tagName)

‎packages/vite-plugin-drupal/src/plugins/restart.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import type { Plugin } from 'vite'
2+
import type { Context } from './context'
13
import { spawn } from 'node:child_process'
24
import path from 'node:path'
3-
import type { Plugin } from 'vite'
45
import { createLogger } from 'vite'
5-
import type { Context } from './context'
66

77
export default (ctx: Context): Plugin => {
88
let timer: ReturnType<typeof setTimeout> | undefined

‎packages/vite-plugin-drupal/src/plugins/tailwind-config.ts‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import process from 'node:process'
21
import type { Plugin, ResolvedConfig } from 'vite'
2+
import type { Context } from './context'
3+
import process from 'node:process'
34
import fse from 'fs-extra'
4-
import YAML from 'yaml'
55
import resolveConfig from 'tailwindcss/resolveConfig.js'
6-
import type { Context } from './context'
6+
import YAML from 'yaml'
77

88
export default (ctx: Context): Plugin => {
99
let config: ResolvedConfig
@@ -43,34 +43,35 @@ async function buildTailwindConfig() {
4343
const tailwindConfigFile = await import(`${process.cwd()}/tailwind.config.js`)
4444
const tailwindConfig = resolveConfig(tailwindConfigFile.default)
4545

46-
const resolveThemeValue = (key: any) => (key in tailwindConfig.theme ? tailwindConfig.theme[key] : undefined);
46+
const resolveThemeValue = (key: any) => (key in tailwindConfig.theme ? tailwindConfig.theme[key] : undefined)
4747
const evaluateAndSerializeConfig = (obj: any): any => {
4848
if (typeof obj === 'function') {
4949
try {
5050
// Try evaluating the function with the theme resolver context
51-
return obj({ theme: resolveThemeValue });
52-
} catch (error) {
53-
console.error(`Error resolving function: ${error}`);
54-
return '[Unresolvable Function]'; // Fallback if evaluation fails
51+
return obj({ theme: resolveThemeValue })
52+
}
53+
catch (error) {
54+
console.error(`Error resolving function: ${error}`)
55+
return '[Unresolvable Function]' // Fallback if evaluation fails
5556
}
5657
}
5758

5859
if (Array.isArray(obj)) {
59-
return obj.map(evaluateAndSerializeConfig); // Recursively handle arrays
60+
return obj.map(evaluateAndSerializeConfig) // Recursively handle arrays
6061
}
6162

6263
if (typeof obj === 'object' && obj !== null) {
6364
return Object.keys(obj).reduce((acc: Record<string, any>, key) => {
64-
acc[key] = evaluateAndSerializeConfig(obj[key]); // Recursively handle objects
65-
return acc;
66-
}, {});
65+
acc[key] = evaluateAndSerializeConfig(obj[key]) // Recursively handle objects
66+
return acc
67+
}, {})
6768
}
6869

69-
return obj; // Return the value if it's not a function or an object
70+
return obj // Return the value if it's not a function or an object
7071
}
7172

7273
// Evaluate and serialize the resolved config
73-
const evaluatedConfig = evaluateAndSerializeConfig(tailwindConfig.theme);
74+
const evaluatedConfig = evaluateAndSerializeConfig(tailwindConfig.theme)
7475

7576
return YAML.stringify(evaluatedConfig)
7677
}

‎packages/vite-plugin-drupal/src/plugins/tailwind-hmr.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import MagicString from 'magic-string'
21
import type { Plugin } from 'vite'
2+
import MagicString from 'magic-string'
33

44
export default (): Plugin => {
55
return {

‎packages/vite-plugin-drupal/src/plugins/theme.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import fs from 'node:fs/promises'
2-
import { constants } from 'node:fs'
31
import type { Plugin, ResolvedConfig } from 'vite'
4-
import YAML from 'yaml'
52
import type { Context } from './context'
3+
import { constants } from 'node:fs'
4+
import fs from 'node:fs/promises'
5+
import YAML from 'yaml'
66

77
export default (ctx: Context): Plugin => {
88
let config: ResolvedConfig

0 commit comments

Comments
 (0)