@studio-fes/layer-strapi 0.4.7 → 0.4.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @studio-fes/layer-strapi
 
+## 0.4.9
+
+### Patch Changes
+
+- typescript should be correct now
+
+## 0.4.8
+
+### Patch Changes
+
+- fix: refactored types
+
 ## 0.4.7
 
 ### Patch Changes

package/app/components/StrapiImage.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { NuxtImgProps } from '@studio-fes/layer-base/app/components/Image.vue'
-import type { StrapiFileFragment } from '~/types/graphql-operations'
+import type { StrapiFileFragment } from '../types/graphql-operations'
 
 export interface StrapiImageProps extends NuxtImgProps {
   image?: StrapiFileFragment

package/app/components/StrapiMedia.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { StrapiImageProps } from '@studio-fes/layer-strapi/app/components/StrapiImage.vue'
 import type { StrapiVideoProps } from '@studio-fes/layer-strapi/app/components/StrapiVideo.vue'
-import type { StrapiFileFragment } from '~/types/graphql-operations'
+import type { StrapiFileFragment } from '../types/graphql-operations'
 
 const props = defineProps<{
   media: StrapiFileFragment

package/app/components/StrapiVideo.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { VideoProps } from '@studio-fes/layer-base/app/components/Video.vue'
-import type { StrapiFileFragment } from '~/types/graphql-operations'
+import type { StrapiFileFragment } from '../types/graphql-operations'
 import Video from '@studio-fes/layer-base/app/components/Video.vue'
 
 export interface StrapiVideoProps extends VideoProps {

package/app/composables/useStrapiPage.ts

@@ -1,7 +1,6 @@
 export async function useStrapiPage<T>(queryName: never, variables?: Record<string, unknown>): Promise<T> {
   const nuxtApp = useNuxtApp()
 
-  // @ts-expect-error i18n is not used yet
   const locale = '$i18n' in nuxtApp ? nuxtApp.$i18n?.locale?.value : undefined
 
   // @ts-expect-error queryName is not used yet

package/app/composables/useStrapiSEO.ts

@@ -1,4 +1,4 @@
-import type { SeoMetaFragment } from '~/types/graphql-operations'
+import type { SeoMetaFragment } from '../types/graphql-operations'
 
 function getFallbackImage(): string | null {
   const runtimeConfig = useRuntimeConfig()
@@ -31,6 +31,11 @@ export function useStrapiSEO(seoData?: MaybeRefOrGetter<SeoMetaFragment>) {
     ogImageAlt: ogImageData?.alternativeText || metaTitle,
     twitterCard: 'summary_large_image',
     robots: metaRobots,
-    keywords,
   })
+
+  if (keywords) {
+    useHead({
+      meta: [{ name: 'keywords', content: keywords }],
+    })
+  }
 }

package/app/utils/check-page-data.ts

@@ -1,7 +1,7 @@
+import type { NuxtError } from 'nuxt/app'
 // import type { EntryQuery } from '#graphql-operations'
 import type { GraphqlResponse } from '#nuxt-graphql-middleware/response'
-import type { NuxtError } from 'nuxt/app'
-import type { EntryInterfaceTypeFragment } from '~/types/graphql-operations'
+import type { EntryInterfaceTypeFragment } from '../types/graphql-operations'
 
 import { createError } from 'nuxt/app'
 

package/app/utils/media-is-image.ts

@@ -1,4 +1,4 @@
-import type { StrapiFileFragment } from '~/types/graphql-operations'
+import type { StrapiFileFragment } from '../types/graphql-operations'
 
 export function mediaIsImage(media: StrapiFileFragment | null | undefined): boolean {
   if (!media)

package/app/utils/parse-strapi-image.ts

@@ -1,5 +1,5 @@
 import type { NuxtImgProps } from '@studio-fes/layer-base/app/components/Image.vue'
-import type { StrapiFileFragment } from '~/types/graphql-operations'
+import type { StrapiFileFragment } from '../types/graphql-operations'
 
 export function parseStrapiImage(image: StrapiFileFragment | undefined): NuxtImgProps | null {
   if (!image)

package/app/utils/parse-strapi-video.ts

@@ -1,5 +1,5 @@
 import type { VideoProps } from '@studio-fes/layer-base/app/components/Video.vue'
-import type { StrapiFileFragment } from '~/types/graphql-operations'
+import type { StrapiFileFragment } from '../types/graphql-operations'
 
 export function parseStrapiVideo(video: StrapiFileFragment | null | undefined): VideoProps {
   if (!video)

package/eslint.config.js

@@ -4,12 +4,13 @@ import graphqlPlugin from '@graphql-eslint/eslint-plugin'
 import { globalIgnores } from 'eslint/config'
 
 export default antfu(
-    {
-      formatters: true,
-      vue: true,
-      pnpm: false,
-      unocss: true,
-    },
+  {
+    formatters: true,
+    vue: true,
+    pnpm: false,
+    unocss: true,
+    antislop: true,
+  },
   globalIgnores([
     'dist',
     'node_modules',
@@ -43,7 +44,6 @@ export default antfu(
       'unocss/order': 'error', // or "error",
     },
   },
-  // @ts-expect-error
   {
     files: ['**/*.graphql', '**/*.gql'],
     languageOptions: {

package/nuxt.config.ts

@@ -2,7 +2,11 @@ import { parseEnv } from './parse-env'
 
 const { graphqlEndpoint, hostname } = parseEnv()
 
-export default defineNuxtConfig({
+// Assigning the config to a variable before passing it to `defineNuxtConfig` sidesteps
+// TypeScript's excess-property check on `graphqlMiddleware`, whose type comes from
+// nuxt-graphql-middleware's `nuxt/schema` augmentation and doesn't reliably merge into
+// `NuxtConfig` when this file is type-checked from a consuming app's own `nuxt` instance.
+const config = {
   extends: ['@studio-fes/layer-base'],
 
   modules: [
@@ -30,4 +34,6 @@ export default defineNuxtConfig({
   image: {
     domains: [hostname],
   },
-})
+}
+
+export default defineNuxtConfig(config)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@studio-fes/layer-strapi",
   "type": "module",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev",
@@ -11,7 +11,8 @@
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
+    "lint:fix": "eslint . --fix",
+    "typecheck": "nuxi typecheck"
   },
   "dependencies": {
     "@nuxt/eslint": "latest",
@@ -24,8 +25,9 @@
     "@types/node": "^26.6.1",
     "eslint": "^10.10.0",
     "nuxt": "^4.5.2",
-    "typescript": "^7.0.2",
-    "vue": "latest"
+    "typescript": "^5.9.3",
+    "vue": "latest",
+    "vue-tsc": "^3.0.0"
   },
   "description": "Create Nuxt extendable layer with this GitHub template.",
   "repository": {

package/.nuxtrc

@@ -1 +0,0 @@
-typescript.includeWorkspace = true