Skip to content

Commit d276b31

Browse files
arashsheydaTheAlexLichterantfu
authoredJun 21, 2024··
fix: color mode (#679)
Co-authored-by: Alexander Lichter <github@lichter.io> Co-authored-by: Anthony Fu <anthonyfu117@hotmail.com>
1 parent 5d1b7c9 commit d276b31

File tree

10 files changed

+48
-58
lines changed

10 files changed

+48
-58
lines changed
 

‎packages/devtools-ui-kit/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"@iconify-json/tabler": "^1.1.111",
4545
"@nuxt/devtools-kit": "workspace:*",
4646
"@nuxt/kit": "^3.11.2",
47-
"@nuxtjs/color-mode": "^3.4.1",
4847
"@unocss/core": "^0.60.0",
4948
"@unocss/nuxt": "^0.60.0",
5049
"@unocss/preset-attributify": "^0.60.0",

‎packages/devtools-ui-kit/src/components/NDarkToggle.vue

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import { computed, nextTick } from 'vue'
33
44
import { useColorMode } from '@vueuse/core'
55
6-
const mode = useColorMode()
6+
const mode = useColorMode({
7+
storageKey: 'nuxt-devtools-color-mode',
8+
})
79
const isDark = computed<boolean>({
810
get() {
911
return mode.value === 'dark'
@@ -69,7 +71,7 @@ const context = {
6971
</script>
7072

7173
<template>
72-
<ColorScheme tag="span">
74+
<ClientOnly placeholder-tag="span">
7375
<slot v-bind="context" />
74-
</ColorScheme>
76+
</ClientOnly>
7577
</template>

‎packages/devtools-ui-kit/src/module.ts

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export default defineNuxtModule<ModuleOptions>({
4545
const resolver = createResolver(import.meta.url)
4646
await installModule(await resolver.resolvePath('@unocss/nuxt'))
4747
await installModule(await resolver.resolvePath('@vueuse/nuxt'))
48-
await installModule(await resolver.resolvePath('@nuxtjs/color-mode'))
4948
await installModule(await resolver.resolvePath('v-lazy-show/nuxt'))
5049
},
5150
})

‎packages/devtools/client/components/ServerRouteDetails.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const emit = defineEmits<{
1414
1515
const [DefineDefaultInputs, UseDefaultInputs] = createReusableTemplate()
1616
17+
const colorMode = useColorMode()
1718
const config = useServerConfig()
1819
const client = useClient()
1920
@@ -544,7 +545,7 @@ const copy = useCopy()
544545
<JsonEditorVue
545546
v-else-if="selectedTabInput === 'json'"
546547
v-model="routeInputBodyJSON"
547-
:class="[$colorMode.value === 'dark' ? 'jse-theme-dark' : 'light']"
548+
:class="colorMode === 'dark' ? 'jse-theme-dark' : 'light'"
548549
class="json-editor-vue of-auto text-sm outline-none"
549550
v-bind="$attrs"
550551
:mode="('text' as any)"

‎packages/devtools/client/components/ServerTaskDetails.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const routeInputBodyJSON = ref<any>({ payload: {} })
1616
const { inputDefaults } = useDevToolsOptions('serverRoutes')
1717
const [DefineDefaultInputs, UseDefaultInputs] = createReusableTemplate()
1818
19+
const colorMode = useColorMode()
1920
const config = useServerConfig()
2021
2122
const response = reactive({
@@ -310,7 +311,7 @@ const copy = useCopy()
310311
<JsonEditorVue
311312
v-else-if="selectedTabInput === 'json'"
312313
v-model="routeInputBodyJSON"
313-
:class="[$colorMode.value === 'dark' ? 'jse-theme-dark' : 'light']"
314+
:class="colorMode === 'dark' ? 'jse-theme-dark' : 'light'"
314315
class="json-editor-vue of-auto text-sm outline-none"
315316
v-bind="$attrs"
316317
:mode="('text' as any)"

‎packages/devtools/client/components/StateEditor.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ async function refresh() {
8686
v-bind="$attrs"
8787
class="json-editor-vue"
8888
:class="[
89-
colorMode.value === 'dark' ? 'jse-theme-dark' : '',
89+
colorMode === 'dark' ? 'jse-theme-dark' : '',
9090
name ? '' : '',
9191
]"
9292
:main-menu-bar="false"

‎packages/devtools/client/components/StorageDetails.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import JsonEditorVue from 'json-editor-vue'
33
4+
const colorMode = useColorMode()
45
const nuxtApp = useNuxtApp()
56
const router = useRouter()
67
const searchString = ref('')
@@ -169,7 +170,7 @@ async function renameCurrentItem() {
169170
<JsonEditorVue
170171
v-if="typeof currentItem.content === 'object'"
171172
v-model="currentItem.updatedContent"
172-
:class="[$colorMode.value === 'dark' ? 'jse-theme-dark' : 'light']"
173+
:class="[colorMode === 'dark' ? 'jse-theme-dark' : 'light']"
173174
class="json-editor-vue h-full of-auto text-sm outline-none"
174175
v-bind="$attrs"
175176
:mode="('text' as any)"

‎packages/devtools/client/components/TimelineArgumentView.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const OnSetup = defineComponent({
2626
},
2727
})
2828
29+
const colorMode = useColorMode()
2930
const copy = useCopy()
3031
</script>
3132

@@ -69,7 +70,7 @@ const copy = useCopy()
6970
v-bind="$attrs"
7071
class="json-editor-vue"
7172
:class="[
72-
$colorMode.value === 'dark' ? 'jse-theme-dark' : '',
73+
colorMode === 'dark' ? 'jse-theme-dark' : '',
7374
]"
7475
:main-menu-bar="false"
7576
:navigation-bar="false"

‎packages/devtools/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"@nuxt/content": "^2.12.1",
9292
"@nuxt/devtools": "workspace:*",
9393
"@nuxt/test-utils": "3.9.0",
94-
"@nuxtjs/color-mode": "^3.4.1",
9594
"@parcel/watcher": "^2.4.1",
9695
"@types/markdown-it-link-attributes": "^3.0.5",
9796
"@types/ua-parser-js": "^0.7.39",

‎pnpm-lock.yaml

+34-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.