Skip to content

Commit bc0268a

Browse files
dimailndimailn
authored
Merge pull request #40 from VladimirIvanin/vue-3-test-migrate-next
Обновляем тесты
2 parents 0f4cfd2 + 73443d5 commit bc0268a

File tree

155 files changed

+3784
-4811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+3784
-4811
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"vue": "^3.4.21",
8282
"vue-analytics": "^5.16.1",
8383
"vue-loader": "^17.4.2",
84-
"vue-meta": "^2.4.0",
84+
"vue-meta": "3.0.0-alpha.10",
8585
"vue-router": "^4.0.0",
8686
"vuex": "^3.0.1",
8787
"webpack": "^4.39.1",

‎packages/docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"vee-validate": "^3.3.7",
7171
"vue-cookies": "^1.7.0",
7272
"vue-gtag": "^1.6.5",
73-
"vue-meta": "^2.4.0",
73+
"vue-meta": "3.0.0-alpha.10",
7474
"vue-prism-component": "^1.2.0",
7575
"vuelidate": "^0.7.5",
7676
"vuetify-loader": "^1.3.0",

‎packages/docs/src/entry-server.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ export default context => {
6565
// the initial data fetching on the client.
6666
context.state = store.state
6767

68-
// Inject vue-meta into template
69-
context.meta = app.$meta()
68+
// Vue Meta 3 SSR integration
69+
// В новой версии vue-meta метаданные будут автоматически добавлены
70+
// через teleport в контекст рендеринга при использовании renderToString
7071

7172
resolve(app)
7273
}).catch(e => {

‎packages/docs/src/main.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ export async function createApp ({
7676
}
7777
})
7878

79-
registerPlugins(app)
79+
const metaManager = registerPlugins(app)
8080

8181
// expose the app, the router and the store.
8282
// note we are not mounting the app here, since bootstrapping will be
8383
// different depending on whether we are in a browser or on the server.
84-
const entry = { app, router, store }
84+
const entry = { app, router, store, metaManager }
8585

8686
await start(entry)
8787

‎packages/docs/src/plugins/index.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import { useVuetify } from '@/vuetify'
1212
export function registerPlugins (app) {
1313
registerComponents(app)
1414
// loadFonts(app)
15-
// useMeta(app)
15+
const metaManager = useMeta(app)
1616
useVuetify(app)
17+
18+
return metaManager
1719
}

‎packages/docs/src/plugins/vue-meta.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
import Meta from 'vue-meta'
1+
import { createMetaManager, plugin as VueMeta } from 'vue-meta'
22

33
export function useMeta (app) {
4-
app.use(Meta, { refreshOnceOnNavigation: true })
4+
// Создаем meta manager для Vue Meta 3.0.0-alpha.10
5+
const metaManager = createMetaManager()
6+
7+
// Устанавливаем manager в приложение
8+
app.use(metaManager)
9+
app.use(VueMeta) // Плагин для поддержки Options API
10+
11+
// Возвращаем metaManager для использования в SSR
12+
return metaManager
513
}

‎packages/docs/src/ssr.template.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!DOCTYPE html>
2-
<html lang="{{ lang || 'en' }}" {{{ meta.inject().htmlAttrs.text(true) }}}>
3-
<head>
4-
{{{ meta.inject().head() }}}
2+
<html lang="{{ lang || 'en' }}" {{{ teleports.htmlAttrs || '' }}}>
3+
<head {{{ teleports.headAttrs || '' }}}>
4+
{{{ teleports.head || '' }}}
55
<meta property="og:url" content="{{ hostname }}{{ url }}">
66
<meta name="docsearch:language" content="{{ lang || 'en' }}" />
77
{{{ hreflangs }}}
88
</head>
9-
<body>
10-
{{ meta.inject().bodyPrepend(true) }}
9+
<body {{{ teleports.bodyAttrs || '' }}}>
10+
{{{ teleports.bodyPrepend || '' }}}
1111
<!--vue-ssr-outlet-->
1212
{{{ scripts }}}
13-
{{ meta.inject().bodyAppend(true) }}
13+
{{{ teleports.body || '' }}}
1414
</body>
1515
</html>

‎packages/vuetify/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"stylus-loader": "^3.0.2",
9595
"ts-loader": "^8.0.6",
9696
"url-loader": "^2.1.0",
97-
"vue-meta": "^2.4.0",
97+
"vue-meta": "3.0.0-alpha.10",
9898
"vuetify-loader": "^1.3.0",
9999
"webpack-dev-server": "^3.7.2"
100100
},

‎packages/vuetify/src/components/VAlert/__tests__/__snapshots__/VAlert.spec.ts.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ exports[`VAlert.ts should be dismissible 1`] = `
1313
aria-label="Close"
1414
>
1515
<span class="v-btn__content">
16-
<i aria-hidden="true"
17-
class="v-icon notranslate mdi mdi-close-circle theme--light"
16+
<i class="v-icon notranslate theme--light mdi mdi-close-circle"
17+
aria-hidden="true"
1818
>
1919
</i>
2020
</span>
@@ -58,8 +58,8 @@ exports[`VAlert.ts should have a close icon 1`] = `
5858
aria-label="Close"
5959
>
6060
<span class="v-btn__content">
61-
<i aria-hidden="true"
62-
class="v-icon notranslate mdi mdi-close-circle theme--light"
61+
<i class="v-icon notranslate theme--light mdi mdi-close-circle"
62+
aria-hidden="true"
6363
>
6464
</i>
6565
</span>

‎packages/vuetify/src/components/VAppBar/__tests__/__snapshots__/VAppBarNavIcon.spec.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ exports[`AppBarNavIcon.ts should render correctly 1`] = `
55
type="button"
66
>
77
<span class="v-btn__content">
8-
<i aria-hidden="true"
9-
class="v-icon notranslate mdi mdi-menu theme--light"
8+
<i class="v-icon notranslate theme--light mdi mdi-menu"
9+
aria-hidden="true"
1010
>
1111
</i>
1212
</span>

0 commit comments

Comments
 (0)