Skip to content

Commit a422a42

Browse files
trydofortrydofor
committed
⬆️ update unocss, wind4, nuxt 3.17.6, vuetify 3.9 #275 
1 parent 747ed68 commit a422a42

File tree

10 files changed

+2157
-2012
lines changed

10 files changed

+2157
-2012
lines changed

‎layers/common/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@unocss/eslint-config": "catalog:commonDev",
3939
"@unocss/nuxt": "catalog:commonDev",
4040
"@unocss/preset-icons": "catalog:commonDev",
41-
"@unocss/preset-wind": "catalog:commonDev",
41+
"@unocss/preset-wind4": "catalog:commonDev",
4242
"@unocss/transformer-directives": "catalog:commonDev",
4343
"@unocss/transformer-variant-group": "catalog:commonDev",
4444
"@vitest/coverage-v8": "catalog:commonDev",

‎layers/common/uno.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { defineConfig } from 'unocss';
22
import presetIcons from '@unocss/preset-icons';
3-
import presetWind from '@unocss/preset-wind';
3+
import presetWind4 from '@unocss/preset-wind4';
44
import transformerDirectives from '@unocss/transformer-directives';
55
import transformerVariantGroup from '@unocss/transformer-variant-group';
66

77
export default defineConfig({
8-
presets: [presetWind({ prefix: ['_', ''] }), presetIcons()],
8+
presets: [presetWind4({ prefix: ['_', ''] }), presetIcons()],
99
transformers: [
1010
/**
1111
* @apply --at-apply, @screen and theme()

‎layers/desktop/configures/vuetify-utility-classes.mjs‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4233,4 +4233,76 @@ export default [
42334233
'w-xxl-66',
42344234
'w-xxl-75',
42354235
'w-xxl-auto',
4236+
'bg-error',
4237+
'bg-info',
4238+
'bg-success',
4239+
'bg-warning',
4240+
'bg-primary',
4241+
'bg-secondary',
4242+
'bg-tertiary',
4243+
'bg-background',
4244+
'bg-surface',
4245+
'bg-surface-bright',
4246+
'bg-surface-light',
4247+
'bg-surface-variant',
4248+
'bg-primary-darken-1',
4249+
'bg-primary-lighten-1',
4250+
'bg-secondary-darken-1',
4251+
'bg-secondary-lighten-1',
4252+
'bg-tertiary-darken-1',
4253+
'bg-tertiary-lighten-1',
4254+
'border-error',
4255+
'border-info',
4256+
'border-success',
4257+
'border-warning',
4258+
'border-primary',
4259+
'border-secondary',
4260+
'border-tertiary',
4261+
'border-background',
4262+
'border-surface',
4263+
'border-surface-bright',
4264+
'border-surface-light',
4265+
'border-surface-variant',
4266+
'border-primary-darken-1',
4267+
'border-primary-lighten-1',
4268+
'border-secondary-darken-1',
4269+
'border-secondary-lighten-1',
4270+
'border-tertiary-darken-1',
4271+
'border-tertiary-lighten-1',
4272+
'on-error',
4273+
'on-info',
4274+
'on-success',
4275+
'on-warning',
4276+
'on-primary',
4277+
'on-secondary',
4278+
'on-tertiary',
4279+
'on-background',
4280+
'on-surface',
4281+
'on-surface-bright',
4282+
'on-surface-light',
4283+
'on-surface-variant',
4284+
'on-primary-darken-1',
4285+
'on-primary-lighten-1',
4286+
'on-secondary-darken-1',
4287+
'on-secondary-lighten-1',
4288+
'on-tertiary-darken-1',
4289+
'on-tertiary-lighten-1',
4290+
'text-error',
4291+
'text-info',
4292+
'text-success',
4293+
'text-warning',
4294+
'text-primary',
4295+
'text-secondary',
4296+
'text-tertiary',
4297+
'text-background',
4298+
'text-surface',
4299+
'text-surface-bright',
4300+
'text-surface-light',
4301+
'text-surface-variant',
4302+
'text-primary-darken-1',
4303+
'text-primary-lighten-1',
4304+
'text-secondary-darken-1',
4305+
'text-secondary-lighten-1',
4306+
'text-tertiary-darken-1',
4307+
'text-tertiary-lighten-1',
42364308
];

‎plays/2-play-web/pages/00-index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<div>
3-
<div v-for="route in pageRoutes" :key="route.path" class="w-full py-1 hover:bg-indigo-100">
2+
<div class="p-4">
3+
<div v-for="route in pageRoutes" :key="route.path" class="p-2 hover:bg-indigo-100">
44
<NuxtLink :to="route.path">
55
{{ index(route.path) }} - {{ route.name }}
66
</NuxtLink>

‎plays/2-play-web/pages/01-dpi-image.vue‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,54 @@
11
<template>
2-
<div class="flex flex-col gap-2">
3-
<div class="bg-gray-200 p-2">
2+
<div class="flex flex-col gap-4">
3+
<div class="bg-gray-200 p-4">
44
💎 in Chrome Develop, toggle Device Toolbar, set DPR to [1,2,3],
55
the 'DipImg' never change size, keep the same as 'Img 1x'
66
</div>
77
<div>
8-
<div>DipImg</div>
8+
<div class="h-8">
9+
DipImg
10+
</div>
911
<DpiImg alt="storm" :srcset="[storm1, storm2, storm3, storm4]" />
1012
</div>
1113
<div>
12-
<div>Img 1x</div>
13-
<img alt="storm1" :src="storm1">
14+
Img will change size if DPR change
1415
</div>
15-
<div>
16-
<div>Img 2x</div>
17-
<img alt="storm2" :src="storm2">
16+
<div class="flex-row flex gap-4">
17+
<div>
18+
<div>1x</div>
19+
<img alt="storm1" :src="storm1">
20+
</div>
21+
<div>
22+
<div>2x</div>
23+
<img alt="storm2" :src="storm2">
24+
</div>
25+
<div>
26+
<div>3x</div>
27+
<img alt="storm3" :src="storm3">
28+
</div>
29+
<div>
30+
<div>4x</div>
31+
<img alt="storm4" :src="storm4">
32+
</div>
1833
</div>
1934
<div>
20-
<div>Img 3x</div>
21-
<img alt="storm3" :src="storm3">
35+
Svg, imported as component
2236
</div>
23-
<div>
24-
<div>Img 4x</div>
25-
<img alt="storm4" :src="storm4">
37+
<div class="flex-row flex items-center gap-4">
38+
<div>
39+
<div>color</div>
40+
<SvgDota class="text-red text-20" />
41+
</div>
42+
<div class="bg-red">
43+
<div>bg</div>
44+
<SvgDota class="text-white text-20" />
45+
</div>
46+
<div>
47+
<div>cut 4rem</div>
48+
<div class="overflow-hidden size-16 bg-red">
49+
<SvgDota class="text-white -ml-2 -mt-2 text-20" />
50+
</div>
51+
</div>
2652
</div>
2753
</div>
2854
</template>
@@ -32,6 +58,7 @@ import storm1 from '#layers/spa/assets/img/1x/storm.jpg';
3258
import storm2 from '#layers/spa/assets/img/2x/storm.jpg';
3359
import storm3 from '#layers/spa/assets/img/3x/storm.jpg';
3460
import storm4 from '#layers/spa/assets/img/4x/storm.jpg';
61+
import SvgDota from '#layers/spa/assets/svg/dota.svg';
3562
3663
definePageMeta({
3764
name: 'Diff between Img and DpiImg',

‎plays/2-play-web/pages/05-error-sentry.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
22
<div class="flex flex-col gap-2">
3-
<button id="captureClientBtn" @click="captureClientError">
3+
<VBtn id="captureClientBtn" @click="captureClientError">
44
Catch Client Error
5-
</button>
6-
<button id="throwClientBtn" @click="throwClientError">
5+
</VBtn>
6+
<VBtn id="throwClientBtn" @click="throwClientError">
77
Throw Client Error
8-
</button>
9-
<button id="spanServerBtn" @click="spanServerError">
8+
</VBtn>
9+
<VBtn id="spanServerBtn" @click="spanServerError">
1010
Span Server Error
11-
</button>
11+
</VBtn>
1212
</div>
1313
</template>
1414

‎plays/3-play-mob/pages/00-index.vue‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<template>
22
<AppTab>
33
<template #title>
4-
<div class="flex flex-row items-center gap-2">
4+
<div class="flex-row flex items-center gap-2">
55
<DpiImg :srcset="[storm1, storm2, storm3, storm4]" alt="movingkite logo" class="p-2" />
66
<div>Index</div>
77
</div>
88
</template>
9-
<div v-for="rt in pageRoutes" :key="rt.path">
10-
<IonButton fill="clear" :router-link="rt.path">
9+
<div class="text-left p-4">
10+
<IonButton
11+
v-for="rt in pageRoutes"
12+
:key="rt.path"
13+
fill="clear"
14+
:router-link="rt.path"
15+
>
1116
{{ index(rt.path) }} - {{ rt.name }}
1217
</IonButton>
1318
</div>
@@ -21,7 +26,7 @@ import storm3 from '#layers/spa/assets/img/3x/storm.jpg';
2126
import storm4 from '#layers/spa/assets/img/4x/storm.jpg';
2227
2328
definePageMeta({
24-
alias: '/',
29+
path: '/',
2530
name: 'Index',
2631
});
2732
const pageRoutes = useRouter().getRoutes().filter(it => it.path !== '/').sort((a, b) => a.path.localeCompare(b.path));

‎plays/3-play-mob/pages/01-dpi-image.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div>
1515
Img will change size if DPR change
1616
</div>
17-
<div class="flex flex-row gap-4">
17+
<div class="flex-row flex gap-4">
1818
<div>
1919
<div>1x</div>
2020
<img alt="storm1" :src="storm1">
@@ -35,19 +35,19 @@
3535
<div>
3636
Svg, imported as component
3737
</div>
38-
<div class="flex flex-row items-center gap-4">
38+
<div class="flex-row flex items-center gap-4">
3939
<div>
4040
<div>color</div>
41-
<SvgDota class="text-20 text-red" />
41+
<SvgDota class="text-red text-20" />
4242
</div>
4343
<div class="bg-red">
4444
<div>bg</div>
45-
<SvgDota class="text-20 text-white" />
45+
<SvgDota class="text-white text-20" />
4646
</div>
4747
<div>
4848
<div>cut 4rem</div>
49-
<div class="size-16 overflow-hidden bg-red">
50-
<SvgDota class="text-20 text-white -ml-2 -mt-2" />
49+
<div class="overflow-hidden size-16 bg-red">
50+
<SvgDota class="text-white -ml-2 -mt-2 text-20" />
5151
</div>
5252
</div>
5353
</div>

0 commit comments

Comments
 (0)