Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(vue-app): pass store to createRouter #9629

Merged
merged 6 commits into from Aug 11, 2021
Merged

feat(vue-app): pass store to createRouter #9629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
338f65c
feat(createRouter): Add the store as parameter
loick Aug 4, 2021
6b53025
Update packages/vue-app/template/index.js
pi0 Aug 11, 2021
ac7d20a
Update packages/vue-app/template/router.js
pi0 Aug 11, 2021
ee19523
Merge branch 'dev' into feat-createRouter-with-store
pi0 Aug 11, 2021
f89b3c1
Update index.js
pi0 Aug 11, 2021
857e9c0
Update index.js
pi0 Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/vue-app/template/index.js
View file
Open in desktop
Expand Up @@ -92,10 +92,10 @@ function registerModule (path, rawModule, options = {}) {
<% } %>

async function createApp(ssrContext, config = {}) {
const router = await createRouter(ssrContext, config)
const store = <%= store ? %> createStore(ssrContext) <% : undefined %>
const router = await createRouter(ssrContext, config, store)
pi0 marked this conversation as resolved.
Show resolved Hide resolved

<% if (store) { %>
const store = createStore(ssrContext)
// Add this.$router into store actions/mutations
store.$router = router
<% if (mode === 'universal') { %>
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-app/template/router.js
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@ export const routerOptions = {
fallback: <%= router.fallback %>
}

export function createRouter (ssrContext, config) {
export function createRouter (ssrContext, config, store) {
pi0 marked this conversation as resolved.
Show resolved Hide resolved
const base = (config._app && config._app.basePath) || routerOptions.base
const router = new Router({ ...routerOptions, base })

Expand Down