Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
johnleider committed Apr 16, 2024
2 parents 8633854 + 71d4118 commit f2fb95e
Show file tree
Hide file tree
Showing 109 changed files with 3,891 additions and 3,055 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ yarn create vuetify
Using [npm](https://npmjs.com/)

```bash
npm create vuetify
npm create vuetify@latest
```

Using [pnpm](https://pnpm.io/)
Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@
"yarn": "^1.19"
},
"devDependencies": {
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.7",
"@babel/preset-env": "^7.23.8",
"@babel/preset-typescript": "^7.23.3",
"@babel/cli": "^7.24.1",
"@babel/core": "^7.24.4",
"@babel/preset-env": "^7.24.4",
"@babel/preset-typescript": "^7.24.1",
"@mdi/font": "6.2.95",
"@mdi/js": "6.2.95",
"@mdi/svg": "6.2.95",
"@octokit/core": "^5.0.2",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@unhead/vue": "^1.8.9",
"@vue/compiler-sfc": "^3.4.19",
"@octokit/core": "^5.2.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@unhead/vue": "^1.9.4",
"@vue/compiler-sfc": "^3.4.21",
"@vueuse/head": "^1.3.1",
"babel-eslint": "^10.1.0",
"babel-jest": "^28.1.3",
Expand All @@ -52,39 +52,39 @@
"conventional-github-releaser": "^3.1.5",
"cross-env": "^7.0.3",
"cross-spawn": "^7.0.3",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-standard": "^17.1.0",
"eslint-formatter-codeframe": "^7.32.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-local-rules": "^2.0.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-sonarjs": "^0.23.0",
"eslint-plugin-vue": "^9.19.2",
"eslint-plugin-vuetify": "^2.1.1",
"husky": "^3.0.9",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-sonarjs": "^0.25.1",
"eslint-plugin-vue": "^9.24.1",
"eslint-plugin-vuetify": "^2.3.0",
"husky": "^3.1.0",
"inquirer": "^6.5.2",
"jest": "^28.1.3",
"jest-cli": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"jest-serializer-html": "^7.1.0",
"lerna": "^3.22.1",
"magic-string": "^0.30.5",
"magic-string": "^0.30.9",
"mkdirp": "^3.0.1",
"moment": "^2.29.4",
"moment": "^2.30.1",
"patch-package": "^8.0.0",
"rimraf": "^5.0.5",
"sass": "^1.69.7",
"semver": "^7.5.4",
"sass": "^1.74.1",
"semver": "^7.6.0",
"shelljs": "^0.8.5",
"typescript": "~5.2.2",
"typescript": "~5.3.3",
"upath": "^2.0.1",
"vite-plugin-inspect": "^0.7.42",
"vite-plugin-inspect": "^0.8.3",
"vite-plugin-warmup": "^0.1.0",
"vue": "^3.4.19",
"vue": "^3.4.21",
"vue-analytics": "^5.16.1",
"vue-router": "^4.2.5",
"vue-router": "^4.3.0",
"vue-tsc": "^1.8.27",
"yargs": "^17.7.2"
}
Expand Down
10 changes: 5 additions & 5 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"license": "ISC",
"dependencies": {
"deepmerge": "^4.3.1",
"piscina": "^4.2.1",
"prettier": "^3.1.1",
"ts-morph": "^20.0.0",
"tsx": "^4.6.2",
"vue": "^3.4.19",
"piscina": "^4.4.0",
"prettier": "^3.2.5",
"ts-morph": "^22.0.0",
"tsx": "^4.7.2",
"vue": "^3.4.21",
"vuetify": "^3.6.0-alpha.1"
},
"devDependencies": {
Expand Down
4 changes: 4 additions & 0 deletions packages/api-generator/src/locale/en/VConfirmEdit.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
"props": {
"cancelText": "Text for the cancel button",
"okText": "Text for the ok button"
},
"events": {
"ok": "The event emitted when the user clicks the OK button",
"cancel": "The event emitted when the user clicks the Cancel button"
}
}
2 changes: 2 additions & 0 deletions packages/docs/auto-imports.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ declare global {
// for vue template auto import
import { UnwrapRef } from 'vue'
declare module 'vue' {
interface GlobalComponents {}
interface ComponentCustomProperties {
readonly IN_BROWSER: UnwrapRef<typeof import('./src/utils/globals')['IN_BROWSER']>
readonly IS_DEBUG: UnwrapRef<typeof import('./src/utils/globals')['IS_DEBUG']>
Expand Down Expand Up @@ -186,6 +187,7 @@ declare module 'vue' {
}
}
declare module '@vue/runtime-core' {
interface GlobalComponents {}
interface ComponentCustomProperties {
readonly IN_BROWSER: UnwrapRef<typeof import('./src/utils/globals')['IN_BROWSER']>
readonly IS_DEBUG: UnwrapRef<typeof import('./src/utils/globals')['IS_DEBUG']>
Expand Down
49 changes: 24 additions & 25 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,64 +21,63 @@
},
"dependencies": {
"@cosmicjs/sdk": "^1.0.11",
"@vercel/analytics": "^1.2.2",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"@vuetify/one": "^1.5.5",
"algoliasearch": "^4.20.0",
"fflate": "^0.8.1",
"@vuetify/one": "^1.7.0",
"algoliasearch": "^4.23.2",
"fflate": "^0.8.2",
"isomorphic-fetch": "^3.0.0",
"lodash-es": "^4.17.21",
"pinia": "^2.1.7",
"prism-theme-vars": "^0.2.4",
"prismjs": "^1.29.0",
"roboto-fontface": "^0.10.0",
"vee-validate": "^4.12.4",
"vue": "^3.4.19",
"vee-validate": "^4.12.6",
"vue": "^3.4.21",
"vue-gtag-next": "^1.14.0",
"vue-i18n": "^9.7.1",
"vue-instantsearch": "^4.12.1",
"vue-i18n": "^9.11.0",
"vue-instantsearch": "^4.15.0",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.6.0-alpha.1"
},
"devDependencies": {
"@emailjs/browser": "^3.11.0",
"@intlify/unplugin-vue-i18n": "^1.5.0",
"@emailjs/browser": "^4.3.3",
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@types/lodash-es": "^4.17.12",
"@types/markdown-it": "^13.0.7",
"@types/markdown-it-container": "^2.0.9",
"@types/markdown-it": "^14.0.0",
"@types/markdown-it-container": "^2.0.10",
"@types/prismjs": "^1.26.3",
"@vitejs/plugin-basic-ssl": "^1.0.2",
"@vitejs/plugin-vue": "^4.5.2",
"@vue/compiler-sfc": "^3.4.19",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.21",
"@vuetify/api-generator": "^3.6.0-alpha.1",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^2.30.0",
"date-fns": "^3.6.0",
"emailjs-com": "^3.2.0",
"front-matter": "^4.0.2",
"jest": "^28.1.3",
"jest-runner-eslint": "^1.2.0",
"jest-runner-eslint": "^2.2.0",
"jest-silent-reporter": "^0.5.0",
"markdown-it": "^13.0.2",
"markdown-it": "^14.1.0",
"markdown-it-anchor": "^8.6.7",
"markdown-it-attrs": "^4.1.6",
"markdown-it-container": "^3.0.0",
"markdown-it-container": "^4.0.0",
"markdown-it-emoji": "^2.0.2",
"markdown-it-header-sections": "^1.0.0",
"markdown-it-link-attributes": "^4.0.1",
"markdown-it-meta": "^0.0.1",
"markdown-it-prism": "^2.3.0",
"markdownlint-cli": "^0.37.0",
"unplugin-auto-import": "0.17.3",
"markdownlint-cli": "^0.39.0",
"unplugin-auto-import": "0.17.5",
"unplugin-fonts": "1.0.3",
"unplugin-vue-components": "^0.26.0",
"vite": "^4.5.1",
"vite": "^5.2.8",
"vite-plugin-md": "^0.21.5",
"vite-plugin-pages": "^0.32.0",
"vite-plugin-pages": "^0.32.1",
"vite-plugin-pwa": "^0.17.4",
"vite-plugin-vue-layouts": "^0.8.0",
"vite-plugin-vuetify": "^1.0.2"
"vite-plugin-vue-layouts": "^0.11.0",
"vite-plugin-vuetify": "^2.0.3"
},
"publishConfig": {
"access": "public"
Expand Down
5 changes: 0 additions & 5 deletions packages/docs/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
// Composables
import { useHead } from '@unhead/vue'
// Utilities
import { inject } from '@vercel/analytics'
inject()
const user = useUserStore()
const router = useRouter()
const route = useRoute()
Expand Down
3 changes: 2 additions & 1 deletion packages/docs/src/components/PageFeatures.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="mb-4">
<page-feature-chip
v-if="one.isSubscriber"
v-if="one.isSubscriber && user.pins"
:prepend-icon="`mdi-pin${!pinned ? '-outline' : ''}`"
text="Pin"
@click="onClickPin"
Expand Down Expand Up @@ -82,6 +82,7 @@
const one = useOneStore()
const pins = usePinsStore()
const route = useRoute()
const user = useUserStore()
const { t } = useI18n()
const branch = getBranch()
Expand Down
2 changes: 2 additions & 0 deletions packages/docs/src/components/app/bar/Bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
flat
>
<template #prepend>
<div class="px-1" />

<AppBtn
v-if="route.meta.layout !== 'home' && mdAndDown"
icon="mdi-menu"
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/app/drawer/Append.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<v-divider />

<div class="d-flex align-center text-caption text-medium-emphasis pa-2">
<AppDrawerDrawerToggleRail v-if="auth.isSubscriber" class="me-2" />
<AppDrawerDrawerToggleRail v-if="one.isSubscriber" class="me-2" />

<div class="d-flex ms-auto overflow-hidden">
<AppCommitBtn class="me-2" />
Expand All @@ -13,5 +13,5 @@
</template>

<script setup lang="ts">
const auth = useAuthStore()
const one = useOneStore()
</script>
2 changes: 1 addition & 1 deletion packages/docs/src/components/app/drawer/Drawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
width="300"
@update:rail="onUpdateRail"
>
<AppDrawerPinnedItems />
<AppDrawerPinnedItems :rail="rail" />

<AppListList
v-model:opened="opened"
Expand Down
26 changes: 19 additions & 7 deletions packages/docs/src/components/app/drawer/PinnedItems.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<AppListList
v-if="auth.isSubscriber && user.pins"
v-if="one.isSubscriber && user.pins"
v-model:opened="opened"
:items="pinned"
class="pb-0 mb-n2"
Expand All @@ -22,7 +22,11 @@
class="me-1"
icon="mdi-pin-off"
size="16"
@click.prevent.stop="onClickPinRemove(itemProps)"
@click.prevent.stop="onClickPinRemove({
title: itemProps.title,
to: itemProps.to,
category: '',
})"
/>
</template>
</v-list-item>
Expand All @@ -32,29 +36,37 @@
</AppListList>
</template>

<script setup>
const auth = useAuthStore()
<script lang="ts" setup>
import { Pin } from '@/stores/pins'
const props = defineProps<{ rail: boolean }>()
const one = useOneStore()
const pins = usePinsStore()
const user = useUserStore()
const router = useRouter()
const opened = ref([])
const _opened = ref<string[]>([])
const opened = computed({
get: () => props.rail ? [] : _opened.value,
set: val => _opened.value = val,
})
const pinned = computed(() => ([{
activeIcon: 'mdi-pin',
inactiveIcon: 'mdi-pin-outline',
items: [...pins.pins],
title: 'Pinned',
}]))
async function onClickPin (to) {
async function onClickPin (to: string) {
pins.isPinning = true
await router.replace(to)
pins.isPinning = false
}
function onClickPinRemove (pin) {
function onClickPinRemove (pin: Pin) {
pins.toggle(false, pin)
}
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/components/app/search/Search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
class="flex-grow-0 mb-4"
variant="filled"
autofocus
@focus="$event.target.select()"
>
<template #append-inner>
<AppBtn size="small" border>
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/app/settings/Drawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<v-container class="px-3 py-3">
<AppSettingsOptions />

<AppSettingsOptionsAdOption v-if="auth.isSubscriber" />
<AppSettingsOptionsAdOption v-if="one.isSubscriber" />

<AppSettingsDeveloperMode />
</v-container>
Expand All @@ -36,7 +36,7 @@

<script setup>
const app = useAppStore()
const auth = useAuthStore()
const one = useOneStore()
const { t } = useI18n()
const { isRtl } = useRtl()
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/app/settings/PerksOptions.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<Alert
v-if="!auth.isSubscriber"
v-if="!one.isSubscriber"
type="success"
>
{{ t('dashboard.perks.alert') }}
Expand Down Expand Up @@ -39,6 +39,6 @@
</template>

<script setup lang="ts">
const auth = useAuthStore()
const one = useOneStore()
const { t } = useI18n()
</script>
Loading

0 comments on commit f2fb95e

Please sign in to comment.