Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmyersdev committed Oct 5, 2023
1 parent 344717c commit f73e122
Show file tree
Hide file tree
Showing 15 changed files with 5,237 additions and 3,233 deletions.
2 changes: 1 addition & 1 deletion app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ hr {
overflow: hidden !important;
}
[data-overlayscrollbars=host] .os-viewport {
[data-overlayscrollbars=host] [data-overlayscrollbars-viewport] {
display: flex;
flex-direction: column;
flex-grow: 1;
Expand Down
11 changes: 8 additions & 3 deletions components/AppLayout.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts">
import { type LayoutKey } from '#build/types/layouts'
import Dashboard from '#root/layouts/dashboard.vue'
export default defineComponent({
Expand All @@ -7,7 +8,7 @@ export default defineComponent({
},
props: {
name: {
type: String,
type: String as PropType<LayoutKey>,
},
},
setup() {
Expand All @@ -24,7 +25,11 @@ export default defineComponent({
</script>

<template>
<NuxtLayout v-if="isNuxt" :name="name"><slot /></NuxtLayout>
<Dashboard v-else-if="isDashboard"><slot /></Dashboard>
<NuxtLayout v-if="isNuxt" :name="name">
<slot />
</NuxtLayout>
<Dashboard v-else-if="isDashboard">
<slot />
</Dashboard>
<slot v-else />
</template>
File renamed without changes.
40 changes: 25 additions & 15 deletions components/DevRoute.vue
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
<script lang="ts" setup>
import { computed } from 'vue'
import { type RouteRecordRaw } from 'vue-router'
import DevRoute from '#root/components/DevRoute.vue'
const props = defineProps<{ parent: string, route: RouteRecordRaw }>()
const path = computed(() => `${props.parent} -> ${props.route.path}`)
const children = computed(() => Array.from(props.route.children || []).sort((a, b) => a.path < b.path ? -1 : 1))
</script>

<template>
<tr>
<td class="py-1 px-2">
<CoreLink :to="route.path">{{ path }}</CoreLink>
<CoreLink :to="route.path">
{{ path }}
</CoreLink>
</td>
<td class="py-1 px-2">
<CoreLink :to="route.path">{{ route.name }}</CoreLink>
<CoreLink :to="route.path">
{{ route.name }}
</CoreLink>
</td>
<td class="py-1 px-2">
<CoreLink :to="route.path">{{ route.redirect }}</CoreLink>
<CoreLink :to="route.path">
{{ route.redirect }}
</CoreLink>
</td>
<td class="py-1 px-2">
<CoreLink :to="route.path">{{ route.component }}</CoreLink>
<CoreLink :to="route.path">
{{ route.component }}
</CoreLink>
</td>
</tr>
<DevRoute v-if="children" v-for="child in children" :parent="path" :route="child" />
<template v-if="children.length">
<DevRoute v-for="child in children" :key="JSON.stringify(child)" :parent="path" :route="child" />
</template>
</template>

<script lang="ts" setup>
import { computed } from 'vue'
import { type RouteRecordRaw } from 'vue-router'
import DevRoute from '#root/components/DevRoute.vue'
const props = defineProps<{ parent: string, route: RouteRecordRaw }>()
const path = computed(() => `${props.parent} -> ${props.route.path}`)
const children = computed(() => props.route.children?.sort((a, b) => a.path < b.path ? -1 : 1))
</script>
36 changes: 23 additions & 13 deletions components/DevRoutes.vue
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
<template>
<table>
<tr>
<td class="font-bold py-1 px-2">Path</td>
<td class="font-bold py-1 px-2">Name</td>
<td class="font-bold py-1 px-2">Redirect</td>
<td class="font-bold py-1 px-2">Component</td>
</tr>
<DevRoute v-for="route in routes" parent="/" :route="route" />
</table>
</template>

<script lang="ts" setup>
import { computed } from 'vue'
import { type RouteRecordRaw } from 'vue-router'
import DevRoute from '#root/components/DevRoute.vue'
const props = defineProps<{ routes: RouteRecordRaw[] }>()
const routes = computed(() => props.routes.sort((a, b) => a.path < b.path ? -1 : 1))
const sortedRoutes = computed(() => [...props.routes].sort((a, b) => a.path < b.path ? -1 : 1))
</script>

<template>
<table>
<tr>
<td class="font-bold py-1 px-2">
Path
</td>
<td class="font-bold py-1 px-2">
Name
</td>
<td class="font-bold py-1 px-2">
Redirect
</td>
<td class="font-bold py-1 px-2">
Component
</td>
</tr>
<template v-if="sortedRoutes">
<DevRoute v-for="route in sortedRoutes" :key="JSON.stringify(route)" :route="route" parent="/" />
</template>
</table>
</template>
1 change: 1 addition & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ export default defineConfig({
runMode: 1,
},
screenshotsFolder: 'test/cypress/screenshots',
video: true,
videosFolder: 'test/cypress/videos',
})
10 changes: 4 additions & 6 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
import { defineNuxtConfig } from 'nuxt/config'
import { config as pwaConfig } from './pwa.config'
import { config as viteConfig } from './vite.config'
import postCssConfig from './postcss.config.cjs'

const root = dirname(fileURLToPath(import.meta.url))

Expand Down Expand Up @@ -98,12 +100,7 @@ export default defineNuxtConfig({
],
},
},
postcss: {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
},
postcss: postCssConfig,
pwa: {
...pwaConfig,
base: '/',
Expand Down Expand Up @@ -168,4 +165,5 @@ export default defineNuxtConfig({
tailwindcss: {
configPath: '~/tailwind.config.cjs',
},
vite: viteConfig,
})
74 changes: 37 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,73 +22,73 @@
"dependencies": {
"@headlessui/tailwindcss": "^0.2.0",
"@headlessui/vue": "^1.7.16",
"@mermaid-js/mermaid-mindmap": "^9.2.2",
"codemirror-lang-mermaid": "^0.2.1",
"deepmerge": "^4.2.2",
"@mermaid-js/mermaid-mindmap": "^9.3.0",
"codemirror-lang-mermaid": "^0.2.2",
"deepmerge": "^4.3.1",
"dexie": "^3.2.4",
"file-saver": "^2.0.5",
"firebase": "^9.17.1",
"force-graph": "^1.43.0",
"firebase": "^9.23.0",
"force-graph": "^1.43.4",
"fuse.js": "^6.6.2",
"ink-mde": "^0.29.1",
"jszip": "^3.10.1",
"khroma": "^2.0.0",
"localforage": "^1.10.0",
"mermaid": "^9.2.2",
"micromark": "^3.1.0",
"micromark-extension-gfm": "^2.0.1",
"mermaid": "^9.4.3",
"micromark": "^3.2.0",
"micromark-extension-gfm": "^2.0.3",
"mime-types": "^2.1.35",
"moment": "^2.29.4",
"mousetrap": "^1.6.5",
"nanoid": "^3.3.4",
"overlayscrollbars": "^2.0.1",
"pinia": "^2.1.4",
"nanoid": "^3.3.6",
"overlayscrollbars": "^2.3.2",
"pinia": "^2.1.6",
"remarkable": "^2.0.1",
"vellma": "^0.7.0",
"vue3-mq": "^3.1.3",
"vuex": "^4.1.0"
},
"devDependencies": {
"@heroicons/vue": "^2.0.12",
"@nuxtjs/tailwindcss": "^6.7.2",
"@heroicons/vue": "^2.0.18",
"@nuxtjs/tailwindcss": "^6.8.0",
"@pinia/nuxt": "^0.4.11",
"@tailwindcss/typography": "^0.5.9",
"@tailwindcss/typography": "^0.5.10",
"@types/file-saver": "^2.0.5",
"@types/mime-types": "^2.1.1",
"@types/node": "^18.16.18",
"@types/remarkable": "^2.0.3",
"@types/mime-types": "^2.1.2",
"@types/node": "^18.18.3",
"@types/remarkable": "^2.0.4",
"@vite-pwa/nuxt": "^0.0.4",
"@vue/test-utils": "^2.4.1",
"@vueuse/core": "^10.2.0",
"@vueuse/head": "^1.1.26",
"@vueuse/core": "^10.4.1",
"@vueuse/head": "^1.3.1",
"@vueuse/nuxt": "^9.13.0",
"@vueuse/rxjs": "^10.2.0",
"autoprefixer": "^10.4.13",
"@vueuse/rxjs": "^10.4.1",
"autoprefixer": "^10.4.16",
"cypress": "^13.3.0",
"cypress-network-idle": "^1.11.2",
"deepmerge-ts": "^4.2.1",
"eslint": "^8.48.0",
"cypress-network-idle": "^1.14.2",
"deepmerge-ts": "^4.3.0",
"eslint": "^8.50.0",
"eslint-config-artisan": "^0.2.1",
"eslint-generate-todo": "^0.2.0",
"happy-dom": "^12.6.0",
"micromark": "^3.1.0",
"npm-run-all": "^4.1.5",
"nuxt": "^3.5.3",
"postcss": "^8.4.21",
"nuxt": "^3.7.4",
"postcss": "^8.4.31",
"remarkable-front-matter": "1.0.1-beta.1",
"rimraf": "^4.1.2",
"serve": "^14.2.0",
"tailwindcss": "^3.2.6",
"tsx": "^3.12.3",
"typescript": "^5.1.3",
"vercel": "^28.10.1",
"vite-plugin-node-polyfills": "^0.14.0",
"vite-plugin-pwa": "^0.14.1",
"rimraf": "^4.4.1",
"serve": "^14.2.1",
"tailwindcss": "^3.3.3",
"tsx": "^3.13.0",
"typescript": "^5.2.2",
"vercel": "^28.20.0",
"vite-plugin-node-polyfills": "^0.14.1",
"vite-plugin-pwa": "^0.14.7",
"vite-svg-loader": "^3.6.0",
"vitest": "^0.34.6",
"vue-tsc": "^1.8.0",
"workbox-build": "^6.5.4",
"workbox-window": "^6.5.4"
"vue-tsc": "^1.8.15",
"workbox-build": "^6.6.0",
"workbox-window": "^6.6.0"
},
"imports": {
"#composables/*": {
Expand Down
16 changes: 9 additions & 7 deletions pages/_routes.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<template>
<div class="flex flex-col">
<h1 class="text-lg">There are {{ routes.length }} top-level routes.</h1>
<DevRoutes :routes="routes" class="whitespace-nowrap" />
</div>
</template>

<script lang="ts" setup>
import DevRoutes from '#root/components/DevRoutes.vue'
const routes = computed(() => [...useRouter().options.routes])
</script>

<template>
<div class="flex flex-col">
<h1 class="text-lg">
There are {{ routes.length }} top-level routes.
</h1>
<DevRoutes :routes="routes" class="whitespace-nowrap" />
</div>
</template>
3 changes: 0 additions & 3 deletions pages/assistant.vue

This file was deleted.

3 changes: 0 additions & 3 deletions pages/assistant/conversations.vue

This file was deleted.

6 changes: 3 additions & 3 deletions pages/assistant/conversations/[id].vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<script lang="ts">
export { default } from '#root/pages/_assistant/index.vue'
</script>
<template>
<AssistantContainer />
</template>
6 changes: 3 additions & 3 deletions pages/assistant/index.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<script lang="ts">
export { default } from '#root/pages/_assistant/index.vue'
</script>
<template>
<AssistantContainer />
</template>
Loading

0 comments on commit f73e122

Please sign in to comment.