Small clean-ups and dependency updates (#131)

* Correctly group fallback values Fixes warning: > The "??" operator here will always return the left operand * Remove unused 'sitemap' dep * Move all deps to devDependencies * Bump pnpm to 8.15.0 * Update links * Update all deps * Define model type to fix warn * Add missing deps * Update GitHub actions
directus · Feb 17, 2024 · a3f4663 · a3f4663
1 parent a6d9fbd
commit a3f4663
Show file tree

Hide file tree

Showing 6 changed files with 1,462 additions and 736 deletions.
diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
@@ -14,7 +14,7 @@ runs:
         node-version: 20
         registry-url: ${{ inputs.registry }}
 
-    - uses: pnpm/action-setup@v2
+    - uses: pnpm/action-setup@v3
       name: Install pnpm
       id: pnpm-install
       with:
@@ -26,7 +26,7 @@ runs:
       run: |
         echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       name: Setup pnpm cache
       with:
         path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}

diff --git a/components/Base/SlideIndicator.vue b/components/Base/SlideIndicator.vue
@@ -3,7 +3,7 @@ defineProps<{
 	length: number;
 }>();
 
-const modelValue = defineModel();
+const modelValue = defineModel<number>();
 </script>
 
 <template>

diff --git a/components/Block/CardGroupDynamic.vue b/components/Block/CardGroupDynamic.vue
@@ -45,7 +45,7 @@ const filter = computed(() => {
 });
 
 const { data: cards, pending } = await useAsyncData(
-	'cards-' + props.uuid + unref(block)?.collection ?? '' + unref(block)?.filter ?? '',
+	'cards-' + props.uuid + (unref(block)?.collection ?? '') + (unref(block)?.filter ?? ''),
 	async () => {
 		const context = unref(block);
 
@@ -138,7 +138,7 @@ const { data: cards, pending } = await useAsyncData(
 );
 
 const { data: count } = await useAsyncData(
-	'count-' + props.uuid + unref(block)?.collection ?? '' + unref(block)?.filter ?? '',
+	'count-' + props.uuid + (unref(block)?.collection ?? '') + (unref(block)?.filter ?? ''),
 	() => {
 		const context = unref(block);
 

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -51,7 +51,7 @@ export default defineNuxtConfig({
 	modules: [
 		'@vueuse/nuxt',
 		'@nuxt/image',
-		'@nuxtjs/sitemap', // https://nuxtseo.com/sitemap/getting-started/how-it-works
+		'@nuxtjs/sitemap', // https://sitemap.nuxtjs.org/usage/sitemap
 		'nuxt-og-image',
 		'floating-vue/nuxt',
 		'@zadigetvoltaire/nuxt-gtm',
@@ -69,7 +69,7 @@ export default defineNuxtConfig({
 		fonts: ['Inter:400', 'Inter:700', 'Poppins:400', 'Poppins:600', 'Poppins:700'],
 	},
 
-	// Nuxt Image Configuration - https://image.nuxtjs.org/getting-started/installation
+	// Nuxt Image Configuration - https://image.nuxt.com/get-started/installation
 	image: {
 		provider: 'directus',
 		directus: {

diff --git a/package.json b/package.json
@@ -13,43 +13,42 @@
 	"devDependencies": {
 		"@directus/sdk": "12.0.1",
 		"@nuxt/devtools": "1.0.8",
+		"@nuxt/image": "1.3.0",
+		"@nuxt/kit": "3.10.2",
 		"@nuxtjs/eslint-module": "4.1.0",
 		"@nuxtjs/fontaine": "0.4.1",
 		"@nuxtjs/sitemap": "^5.1.0",
-		"@types/node": "20.9.0",
-		"@typescript-eslint/eslint-plugin": "6.10.0",
-		"@typescript-eslint/parser": "6.10.0",
+		"@types/node": "20.11.19",
+		"@typescript-eslint/eslint-plugin": "7.0.1",
+		"@typescript-eslint/parser": "7.0.1",
 		"@vueuse/core": "10.7.2",
 		"@vueuse/nuxt": "10.7.2",
 		"@zadigetvoltaire/nuxt-gtm": "0.0.13",
-		"eslint": "8.53.0",
-		"eslint-config-prettier": "9.0.0",
-		"eslint-plugin-prettier": "5.0.1",
-		"eslint-plugin-vue": "9.18.1",
+		"eslint": "8.56.0",
+		"eslint-config-prettier": "9.1.0",
+		"eslint-plugin-prettier": "5.1.3",
+		"eslint-plugin-vue": "9.21.1",
 		"feed": "4.2.2",
+		"floating-vue": "5.2.2",
+		"iconify-icon": "2.0.0",
 		"micromark": "4.0.0",
 		"micromark-extension-gfm": "3.0.0",
+		"nuxt": "3.10.2",
 		"nuxt-og-image": "3.0.0-rc.38",
 		"nuxt-schema-org": "3.3.4",
-		"prettier": "3.0.3",
-		"sass": "1.64.1",
-		"shiki": "1.1.2",
-		"sitemap": "7.1.1",
-		"typescript": "5.2.2",
-		"vue-tsc": "1.8.22"
+		"p-queue": "8.0.1",
+		"prettier": "3.1.0",
+		"sass": "1.71.0",
+		"shiki": "1.1.3",
+		"typescript": "5.3.3",
+		"ufo": "1.4.0",
+		"vue": "3.4.19",
+		"vue-router": "4.2.5",
+		"vue-tsc": "1.8.27"
 	},
-	"packageManager": "pnpm@8.10.2",
+	"packageManager": "pnpm@8.15.3",
 	"engines": {
 		"node": ">=18.0.0",
-		"pnpm": ">=8.6.0"
-	},
-	"dependencies": {
-		"@nuxt/image": "1.3.0",
-		"floating-vue": "2.0.0-beta.24",
-		"iconify-icon": "2.0.0",
-		"nuxt": "3.10.1",
-		"p-queue": "7.4.1",
-		"vue": "3.4.19",
-		"vue-router": "4.2.5"
+		"pnpm": ">=8.15.0"
 	}
 }