feat: upgrade to unhead@1.3.0

vueuse · Aug 14, 2023 · 3b01248 · 3b01248
1 parent a46fc8c
commit 3b01248
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 87 deletions.
diff --git a/package.json b/package.json
@@ -49,10 +49,10 @@
     "vue": ">=2.7 || >=3"
   },
   "dependencies": {
-    "@unhead/dom": "^1.1.26",
-    "@unhead/schema": "^1.1.26",
-    "@unhead/ssr": "^1.1.26",
-    "@unhead/vue": "^1.1.26"
+    "@unhead/dom": "^1.3.1",
+    "@unhead/schema": "^1.3.1",
+    "@unhead/ssr": "^1.3.1",
+    "@unhead/vue": "^1.3.1"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.36.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.ts b/src/index.ts
@@ -13,26 +13,4 @@ export {
   useHeadSafe,
   useServerHead,
   useServerHeadSafe,
-  useTagTitle,
-  useTagBase,
-  useTagMeta,
-  useTagMetaFlat,
-  useTagLink,
-  useTagScript,
-  useTagStyle,
-  useTagNoscript,
-  useHtmlAttrs,
-  useBodyAttrs,
-  useTitleTemplate,
-  useServerTagTitle,
-  useServerTagBase,
-  useServerTagMeta,
-  useServerTagMetaFlat,
-  useServerTagLink,
-  useServerTagScript,
-  useServerTagStyle,
-  useServerTagNoscript,
-  useServerHtmlAttrs,
-  useServerBodyAttrs,
-  useServerTitleTemplate,
 } from '@unhead/vue'
diff --git a/tests/basic.test.ts b/tests/basic.test.ts
@@ -23,7 +23,6 @@ describe('basic', () => {
       [
         {
           "_i": 0,
-          "_sde": {},
           "input": {
             "link": [
               {
@@ -52,7 +51,6 @@ describe('basic', () => {
       [
         {
           "_i": 0,
-          "_sde": {},
           "input": [Function],
         },
       ]

diff --git a/tests/dedupe.test.ts b/tests/dedupe.test.ts
@@ -181,12 +181,10 @@ describe('dedupe', () => {
       link: [{ rel: 'icon', href: '/favicon.ico', key: 'icon' }],
     })
     const { headTags } = await renderSSRHead(head.unhead)
-    expect(headTags).toMatchInlineSnapshot(
-      `
+    expect(headTags).toMatchInlineSnapshot(`
       "<meta name=\\"description\\" content=\\"test\\">
-      <link rel=\\"icon\\" href=\\"/favicon.ico\\" data-h-e16a2dd=\\"\\">"
-    `,
-    )
+      <link rel=\\"icon\\" href=\\"/favicon.ico\\" data-hid=\\"e16a2dd\\">"
+    `)
   })
 
   test('dedupes legacy', async () => {

diff --git a/tests/e2e/vite-ssr/vite-ssr.test.ts b/tests/e2e/vite-ssr/vite-ssr.test.ts
@@ -34,7 +34,7 @@ describe('e2e: vite ssr', async () => {
           <meta http-equiv=\\"X-UA-Compatible\\" content=\\"IE=edge\\">
           <meta name=\\"viewport\\" content=\\"width=device-width, initial-scale=1.0\\">
           <title>count: 0 | @vueuse/head</title>
-        <base href=\\"/\\"><meta name=\\"custom-priority\\" content=\\"of 1\\"><meta name=\\"global-meta\\" content=\\"some global meta tag\\"><style>body {background: salmon}</style><noscript>This app requires javascript to work</noscript><meta name=\\"description\\" content=\\"desc\\"><meta name=\\"description\\" content=\\"desc 2\\"><meta property=\\"og:locale:alternate\\" content=\\"fr\\"><meta property=\\"og:locale:alternate\\" content=\\"zh\\"><link href=\\"/foo\\" rel=\\"stylesheet\\"><script data-h-1a4cc2a=\\"\\">console.log(\\"counter mount\\")</script>"
+        <base href=\\"/\\"><meta name=\\"custom-priority\\" content=\\"of 1\\"><meta name=\\"global-meta\\" content=\\"some global meta tag\\"><style>body {background: salmon}</style><noscript>This app requires javascript to work</noscript><meta name=\\"description\\" content=\\"desc\\"><meta name=\\"description\\" content=\\"desc 2\\"><meta property=\\"og:locale:alternate\\" content=\\"fr\\"><meta property=\\"og:locale:alternate\\" content=\\"zh\\"><link href=\\"/foo\\" rel=\\"stylesheet\\"><script data-hid=\\"1a4cc2a\\">console.log(\\"counter mount\\")</script>"
     `)
 
     await page.click('button.counter')

diff --git a/tests/encoding.test.ts b/tests/encoding.test.ts
@@ -55,7 +55,7 @@ describe('encoding', () => {
           'src': 'https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&v=weekly',
           'data-key': 'AIzaSyD9hQ0Z7Y9XQX8Zjwq7Q9Z2YQ9Z2YQ9Z2Y',
           'defer': true,
-          'body': true,
+          tagPosition: 'bodyClose',
         },
       ],
     })

diff --git a/tests/reactivity-types.test.ts b/tests/reactivity-types.test.ts
@@ -48,6 +48,7 @@ describe('reactivity', () => {
         {
           children: '* { color: red }',
           body: true,
+          tagPosition: 'bodyClose',
         },
       ],
       script: [
@@ -69,7 +70,7 @@ describe('reactivity', () => {
       <meta property=\\"og:locale:alternate\\" content=\\"fr\\">
       <meta property=\\"og:locale:alternate\\" content=\\"zh\\">
       <link as=\\"style\\" href=\\"/style.css\\">
-      <script src=\\"foo.js\\" data-h-e959ceb=\\"\\"></script>",
+      <script src=\\"foo.js\\" data-hid=\\"e959ceb\\"></script>",
         "htmlAttrs": " lang=\\"zh\\"",
       }
     `)

diff --git a/tests/vue-ssr.test.ts b/tests/vue-ssr.test.ts
@@ -131,12 +131,10 @@ describe('vue ssr', () => {
       }),
     )
 
-    expect(headResult.headTags).toMatchInlineSnapshot(
-      `
-      "<script src=\\"test\\" data-h-722c761=\\"\\">console.log('A')</script>
-      <script data-h-722c761=\\"\\">console.log('B')</script>"
-    `,
-    )
+    expect(headResult.headTags).toMatchInlineSnapshot(`
+      "<script src=\\"test\\" data-hid=\\"722c761\\">console.log('A')</script>
+      <script data-hid=\\"722c761\\">console.log('B')</script>"
+    `)
   })
 
   test('#issue 138', async () => {

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -11,6 +11,7 @@ export default defineConfig({
     },
   },
   test: {
+    testTimeout: 30000,
     // note: we can't use a dom environment otherwise the tests will think we're
     // browser based
     globals: true,