Skip to content

Commit f986c6f

Browse files
fix(app-vite&app-webpack): Avoid Vue "enumaration" warning when using router inside Pinia (fix: #12936) (#12937)
Co-authored-by: Yusuf Kandemir <yusuf.kandemir@outlook.com.tr>
1 parent 56dd965 commit f986c6f

File tree

2 files changed

+12
-2
lines changed
  • app-vite/templates/entry
  • app-webpack/templates/entry

2 files changed

+12
-2
lines changed

app-vite/templates/entry/app.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ import <%= metaConf.needsAppMountHook === true ? 'AppComponent' : 'RootComponent
2020

2121
<% if (store) { %>
2222
import createStore from 'app/<%= sourceFiles.store %>'
23+
<% if (metaConf.storePackage === 'pinia') { %>
24+
import { markRaw } from 'vue'
25+
<% } %>
2326
<% } %>
2427
import createRouter from 'app/<%= sourceFiles.router %>'
2528

@@ -116,7 +119,9 @@ export default async function (createAppFn, quasarUserOptions<%= ctx.mode.ssr ?
116119
<% if (metaConf.storePackage === 'vuex') { %>
117120
store.$router = router
118121
<% } else if (metaConf.storePackage === 'pinia') { %>
119-
store.use(() => ({ router }))
122+
store.use(({ store }) => {
123+
store.router = markRaw(router)
124+
})
120125
<% } %>
121126
<% } %>
122127

app-webpack/templates/entry/app.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ import <%= __needsAppMountHook === true ? 'AppComponent' : 'RootComponent' %> fr
1919

2020
<% if (store) { %>
2121
import createStore from 'app/<%= sourceFiles.store %>'
22+
<% if (__storePackage === 'pinia') { %>
23+
import { markRaw } from 'vue'
24+
<% } %>
2225
<% } %>
2326
import createRouter from 'app/<%= sourceFiles.router %>'
2427

@@ -115,7 +118,9 @@ export default async function (createAppFn, quasarUserOptions<%= ctx.mode.ssr ?
115118
<% if (__storePackage === 'vuex') { %>
116119
store.$router = router
117120
<% } else if (__storePackage === 'pinia') { %>
118-
store.use(() => ({ router }))
121+
store.use(({ store }) => {
122+
store.router = markRaw(router)
123+
})
119124
<% } %>
120125
<% } %>
121126

0 commit comments

Comments
 (0)