Skip to content

Commit 2f57524

Browse files
committed
fix(module): update transformers
1 parent c13407d commit 2f57524

File tree

3 files changed

+75
-77
lines changed

3 files changed

+75
-77
lines changed

playground/pinceau.config.ts

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,75 @@ import { defineTheme } from 'pinceau'
22

33
export default defineTheme({
44
colors: {
5-
"white": {
6-
"value": "#ffffff"
5+
white: {
6+
value: '#ffffff'
77
},
8-
"black": {
9-
"value": "#0c0c0d"
8+
black: {
9+
value: '#0c0c0d'
1010
},
11-
"gray": {
12-
"50": {
13-
"value": "#fafafa"
11+
gray: {
12+
50: {
13+
value: '#fafafa'
1414
},
15-
"100": {
16-
"value": "#f4f4f5"
15+
100: {
16+
value: '#f4f4f5'
1717
},
18-
"200": {
19-
"value": "#e4e4e7"
18+
200: {
19+
value: '#e4e4e7'
2020
},
21-
"300": {
22-
"value": "#D4d4d8"
21+
300: {
22+
value: '#D4d4d8'
2323
},
24-
"400": {
25-
"value": "#a1a1aa"
24+
400: {
25+
value: '#a1a1aa'
2626
},
27-
"500": {
28-
"value": "#71717A"
27+
500: {
28+
value: '#71717A'
2929
},
30-
"600": {
31-
"value": "#52525B"
30+
600: {
31+
value: '#52525B'
3232
},
33-
"700": {
34-
"value": "#3f3f46"
33+
700: {
34+
value: '#3f3f46'
3535
},
36-
"800": {
37-
"value": "#27272A"
36+
800: {
37+
value: '#27272A'
3838
},
39-
"900": {
40-
"value": "#18181B"
39+
900: {
40+
value: '#18181B'
4141
}
4242
},
43-
"green": {
44-
"50": {
45-
"value": "#d6ffee"
43+
green: {
44+
50: {
45+
value: '#d6ffee'
4646
},
47-
"100": {
48-
"value": "#acffdd"
47+
100: {
48+
value: '#acffdd'
4949
},
50-
"200": {
51-
"value": "#83ffcc"
50+
200: {
51+
value: '#83ffcc'
5252
},
53-
"300": {
54-
"value": "#30ffaa"
53+
300: {
54+
value: '#30ffaa'
5555
},
56-
"400": {
57-
"value": "#00dc82"
56+
400: {
57+
value: '#00dc82'
5858
},
59-
"500": {
60-
"value": "#00bd6f"
59+
500: {
60+
value: '#00bd6f'
6161
},
62-
"600": {
63-
"value": "#009d5d"
62+
600: {
63+
value: '#009d5d'
6464
},
65-
"700": {
66-
"value": "#007e4a"
65+
700: {
66+
value: '#007e4a'
6767
},
68-
"800": {
69-
"value": "#005e38"
68+
800: {
69+
value: '#005e38'
7070
},
71-
"900": {
72-
"value": "#003f25"
71+
900: {
72+
value: '#003f25'
7373
}
74-
},
74+
}
7575
}
7676
})

src/module.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,19 @@ export default defineNuxtModule<ModuleOptions>({
4444
// Normalize
4545
(component, code) => {
4646
if (!code.includes('<script')) {
47-
code += `\n<script setup>defineProps()</script>`
47+
code += '\n<script setup>defineProps()</script>'
4848
}
4949
return { code, component }
5050
},
5151
// @nuxt/content support
5252
(component, code) => {
53-
if (component.fullPath.includes('TestContent')) {
54-
code = code.replace(
55-
/<ContentSlot(.*)?:use="\$slots\.([a-z]+)"(.*)\/>/gm,
56-
(_, before, slotName, rest) => {
57-
return `<slot${before}${slotName === 'default' ? '' : `name="${slotName}"`}${rest}/>`
58-
}
59-
)
60-
}
53+
code = code.replace(
54+
/<ContentSlot(.*)?:use="\$slots\.([a-z]+)"(.*)\/>/gm,
55+
(_, before, slotName, rest) => {
56+
return `<slot${before}${slotName === 'default' ? '' : `name="${slotName}"`}${rest}/>`
57+
}
58+
)
59+
6160
return { component, code }
6261
}
6362
],
@@ -66,10 +65,9 @@ export default defineNuxtModule<ModuleOptions>({
6665
schema: {}
6766
}
6867
}),
69-
async setup(options, nuxt) {
68+
async setup (options, nuxt) {
7069
// Regex to match colors.primary.100 in {colors.primary.100}
7170

72-
7371
const resolver = createResolver(import.meta.url)
7472

7573
// Retrieve transformers

src/unplugin.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -119,25 +119,25 @@ export const metaPlugin = createUnplugin<any>(
119119
component.meta.props = [
120120
...component.meta.props,
121121
...props
122-
.filter(prop => !prop.global)
123-
.sort((a, b) => {
124-
// sort required properties first
125-
if (!a.required && b.required) {
126-
return 1
127-
}
128-
if (a.required && !b.required) {
129-
return -1
130-
}
131-
// then ensure boolean properties are sorted last
132-
if (a.type === 'boolean' && b.type !== 'boolean') {
133-
return 1
134-
}
135-
if (a.type !== 'boolean' && b.type === 'boolean') {
136-
return -1
137-
}
138-
139-
return 0
140-
})
122+
.filter(prop => !prop.global)
123+
.sort((a, b) => {
124+
// sort required properties first
125+
if (!a.required && b.required) {
126+
return 1
127+
}
128+
if (a.required && !b.required) {
129+
return -1
130+
}
131+
// then ensure boolean properties are sorted last
132+
if (a.type === 'boolean' && b.type !== 'boolean') {
133+
return 1
134+
}
135+
if (a.type !== 'boolean' && b.type === 'boolean') {
136+
return -1
137+
}
138+
139+
return 0
140+
})
141141
]
142142

143143
components[component.pascalName] = component

0 commit comments

Comments
 (0)