@dargmuesli/nuxt-vio 3.6.0 → 3.7.1

package/components/vio/_/VioApp.vue

@@ -23,7 +23,6 @@ const siteDescriptionProp = toRef(() => props.siteDescription)
 const { $dayjs } = useNuxtApp()
 const { locale } = useI18n()
 const cookieControl = useCookieControl()
-const siteConfig = useSiteConfig()
 
 const { loadingIds, indicateLoadingDone } = useLoadingDoneIndicator('app')
 
@@ -68,7 +67,6 @@ updateSiteConfig({
 defineOgImage({
   alt: ogImageAltProp.value,
   component: ogImageComponentProp.value,
-  description: siteDescriptionProp.value,
 })
 useAppLayout()
 useFavicons()
@@ -76,10 +74,7 @@ usePolyfills()
 useSchemaOrg([
   defineWebSite({
     description: siteDescriptionProp,
-    inLanguage: locale,
-    name: siteConfig.name,
   }),
-  defineWebPage(),
 ])
 init()
 </script>

package/composables/useHeadDefault.ts

@@ -11,6 +11,7 @@ export const useHeadDefault = ({
   const attrs = useAttrs()
 
   const defaults: Parameters<typeof useServerSeoMeta>[0] = {
+    description: attrs['site-description'] as string, // TODO: remove (https://github.com/harlan-zw/nuxt-site-config/pull/7)
     msapplicationConfig: `/assets/static/favicon/browserconfig.xml?v=${CACHE_VERSION}`,
     title,
     twitterDescription: attrs['site-description'] as string,

package/composables/usePolyfills.ts

@@ -1,7 +1,7 @@
 import { POLYFILLS } from '../utils/constants'
 
 export const usePolyfills = () => {
-  const polyfills = `https://polyfill.io/v3/polyfill.min.js?features=${POLYFILLS.join(
+  const polyfillsUrl = `https://polyfill.io/v3/polyfill.min.js?features=${POLYFILLS.join(
     '%2C',
   )}&flags=gated`
 
@@ -10,7 +10,7 @@ export const usePolyfills = () => {
     link: [
       {
         rel: 'preload',
-        href: polyfills,
+        href: polyfillsUrl,
         crossorigin: 'anonymous',
         as: 'script',
         'data-testid': 'polyfill-preload',
@@ -18,7 +18,7 @@ export const usePolyfills = () => {
     ],
     script: [
       {
-        src: polyfills,
+        src: polyfillsUrl,
         crossorigin: 'anonymous',
         'data-testid': 'polyfill-script',
       },

package/nuxt.config.ts

@@ -37,7 +37,7 @@ export default defineNuxtConfig(
       devtools: {
         enabled:
           process.env.NODE_ENV !== 'production' &&
-          !process.env.NUXT_PUBLIC_IS_TESTING,
+          !process.env.NUXT_PUBLIC_VIO_IS_TESTING,
         timeline: {
           enabled: true,
         },
@@ -58,7 +58,7 @@ export default defineNuxtConfig(
       runtimeConfig: {
         public: {
           vio: {
-            googleAnalyticsId: '', // set via environment variable `NUXT_PUBLIC_GOOGLE_ANALYTICS_ID` only
+            googleAnalyticsId: '',
             isInProduction: process.env.NODE_ENV === 'production',
             isTesting: false,
           },
@@ -143,7 +143,6 @@ export default defineNuxtConfig(
         logLevel: 'warning',
       },
       i18n: {
-        defaultLocale: 'en', // Must be set for the default prefix_except_default prefix strategy.
         detectBrowserLanguage: {
           cookieKey: I18N_COOKIE_NAME,
           cookieSecure: true,
@@ -172,6 +171,7 @@ export default defineNuxtConfig(
     },
     VIO_NUXT_BASE_CONFIG({
       baseUrl: BASE_URL,
+      defaultLocale: 'en',
       siteName: SITE_NAME,
       stagingHost: 'localhost:3000',
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dargmuesli/nuxt-vio",
-  "version": "3.6.0",
+  "version": "3.7.1",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -41,7 +41,7 @@
     "prepare": "nuxt prepare .playground",
     "preview": "nuxt preview .playground",
     "start": "PORT=3001 node .playground/.output/server/index.mjs",
-    "test:e2e:dev": "cross-env NUXT_PUBLIC_IS_TESTING=1 pnpm test:e2e",
+    "test:e2e:dev": "cross-env NUXT_PUBLIC_VIO_IS_TESTING=1 pnpm test:e2e",
     "test:e2e:docker:br": "pnpm test:e2e:docker:build && pnpm test:e2e:docker:run",
     "test:e2e:docker:build": "docker build -t test-e2e_base --build-arg UID=$(id -u) --build-arg GID=$(id -g) --target test-e2e_base ..",
     "test:e2e:docker:dev:update": "pnpm test:e2e:docker:dev --update-snapshots",
@@ -49,7 +49,7 @@
     "test:e2e:docker:prod:update": "pnpm test:e2e:docker:prod --update-snapshots",
     "test:e2e:docker:prod": "pnpm test:e2e:docker:br pnpm --dir src run test:e2e:prod",
     "test:e2e:docker:run": "docker run --rm -v \"$PWD/..:/srv/app\" -v \"$(pnpm store path):/srv/.pnpm-store\" test-e2e_base",
-    "test:e2e:prod": "cross-env NUXT_PUBLIC_IS_TESTING=1 NODE_ENV=production pnpm test:e2e",
+    "test:e2e:prod": "cross-env NUXT_PUBLIC_VIO_IS_TESTING=1 NODE_ENV=production pnpm test:e2e",
     "test:e2e": "playwright test"
   },
   "dependencies": {
@@ -61,7 +61,7 @@
     "@nuxtjs/html-validator": "1.5.2",
     "@nuxtjs/i18n": "8.0.0-rc.4",
     "@nuxtjs/tailwindcss": "6.8.0",
-    "@nuxtseo/module": "2.0.0-beta.26",
+    "@nuxtseo/module": "2.0.0-beta.27",
     "@pinia/nuxt": "0.4.11",
     "@playwright/test": "1.37.1",
     "@tailwindcss/forms": "0.5.6",
@@ -90,7 +90,7 @@
     "@intlify/eslint-plugin-vue-i18n": "3.0.0-next.3",
     "@nuxtjs/eslint-config-typescript": "12.1.0",
     "cross-env": "7.0.3",
-    "eslint": "8.48.0",
+    "eslint": "8.49.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-compat": "4.2.0",
     "eslint-plugin-nuxt": "4.0.0",

package/tailwind.config.ts

@@ -1,6 +1,6 @@
+import type { ModuleOptions } from '@nuxtjs/tailwindcss'
 import formsPlugin from '@tailwindcss/forms'
 import typographyPlugin from '@tailwindcss/typography'
-import type { Config } from 'tailwindcss'
 import colors from 'tailwindcss/colors'
 import type { PluginAPI } from 'tailwindcss/types/config'
 
@@ -41,15 +41,6 @@ const prose = (theme: PluginAPI['theme']) => ({
 })
 
 export default {
-  content: [
-    './components/**/*.{js,vue,ts}',
-    './composables/**/*.{js,vue,ts}',
-    './layouts/**/*.vue',
-    './pages/**/*.vue',
-    './plugins/**/*.{js,ts}',
-    // './nuxt.config.{js,ts}', // Does not work with i18n as of 2022-12-01
-    './app.vue',
-  ],
   darkMode: 'class',
   plugins: [
     formsPlugin,
@@ -257,4 +248,4 @@ export default {
       }),
     },
   },
-} as Config
+} as ModuleOptions['config']

package/utils/constants.ts

@@ -3,9 +3,9 @@ import { helpers } from '@vuelidate/validators'
 export const SITE_NAME = 'Vio'
 
 export const BASE_URL =
-  (process.env.NUXT_PUBLIC_STACK_DOMAIN ? 'https' : 'http') +
+  (process.env.NUXT_PUBLIC_HOST ? 'https' : 'http') +
   '://' +
-  (process.env.NUXT_PUBLIC_STACK_DOMAIN ||
+  (process.env.NUXT_PUBLIC_HOST ||
     `${process.env.HOST || 'localhost'}:${
       !process.env.NODE_ENV || process.env.NODE_ENV === 'development'
         ? '3000'
@@ -33,7 +33,7 @@ export const I18N_MODULE_CONFIG = {
       iso: 'de',
     },
   ],
-} // `langDir`, `lazy` and `locales` must be configured to extend a layer having lazy-loaded translations (https://v8.i18n.nuxtjs.org/guide/layers#locales)
+}
 export const I18N_VUE_CONFIG = {
   fallbackWarn: false, // covered by linting
   missingWarn: false, // covered by linting
@@ -49,10 +49,12 @@ export const VALIDATION_SUGGESTION_TITLE_LENGTH_MAXIMUM = 300
 export const VERIFICATION_FORMAT_UUID = helpers.regex(REGEX_UUID)
 export const VIO_NUXT_BASE_CONFIG = ({
   baseUrl,
+  defaultLocale,
   siteName,
   stagingHost,
 }: {
   baseUrl?: string
+  defaultLocale?: string
   siteName: string
   stagingHost?: string
 }) =>
@@ -72,7 +74,7 @@ export const VIO_NUXT_BASE_CONFIG = ({
             ? {
                 stagingHost:
                   process.env.NODE_ENV !== 'production' &&
-                  !process.env.NUXT_PUBLIC_STACK_DOMAIN
+                  !process.env.NUXT_PUBLIC_HOST
                     ? stagingHost
                     : undefined,
               }
@@ -82,9 +84,13 @@ export const VIO_NUXT_BASE_CONFIG = ({
     },
 
     // modules
-    i18n: I18N_MODULE_CONFIG, // `langDir`, `lazy` and `locales` must be configured to extend a layer having lazy-loaded translations (https://v8.i18n.nuxtjs.org/guide/layers#locales)
+    i18n: {
+      defaultLocale, // Must be set for the default prefix_except_default prefix strategy.
+      ...I18N_MODULE_CONFIG, // `langDir`, `lazy` and `locales` must be configured to extend a layer having lazy-loaded translations (https://v8.i18n.nuxtjs.org/guide/layers#locales)
+    },
     site: {
-      name: siteName,
       ...(baseUrl ? { url: baseUrl } : {}),
+      ...(defaultLocale ? { defaultLocale } : {}),
+      name: siteName,
     },
   }) as Parameters<typeof defineNuxtConfig>[0]