From 338f65cd86fc8a0f0c8d57dfa4b6e06ce1de8d45 Mon Sep 17 00:00:00 2001 From: Loick Le Digabel Date: Wed, 4 Aug 2021 18:26:24 +0200 Subject: [PATCH 1/5] feat(createRouter): Add the store as parameter --- packages/vue-app/template/index.js | 4 ++-- packages/vue-app/template/router.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vue-app/template/index.js b/packages/vue-app/template/index.js index 11d4821d2639..53c9f9078f82 100644 --- a/packages/vue-app/template/index.js +++ b/packages/vue-app/template/index.js @@ -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) <% if (store) { %> - const store = createStore(ssrContext) // Add this.$router into store actions/mutations store.$router = router <% if (mode === 'universal') { %> diff --git a/packages/vue-app/template/router.js b/packages/vue-app/template/router.js index 6c3d6a50f0f3..9e0300844144 100644 --- a/packages/vue-app/template/router.js +++ b/packages/vue-app/template/router.js @@ -101,7 +101,7 @@ export const routerOptions = { fallback: <%= router.fallback %> } -export function createRouter (ssrContext, config) { +export function createRouter (ssrContext, config, store) { const base = (config._app && config._app.basePath) || routerOptions.base const router = new Router({ ...routerOptions, base }) From 6b530250f43f22b8b1496abc4c4f4620780cb4dc Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 11 Aug 2021 14:37:28 +0200 Subject: [PATCH 2/5] Update packages/vue-app/template/index.js --- packages/vue-app/template/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-app/template/index.js b/packages/vue-app/template/index.js index 53c9f9078f82..476b4f1fda55 100644 --- a/packages/vue-app/template/index.js +++ b/packages/vue-app/template/index.js @@ -93,7 +93,7 @@ function registerModule (path, rawModule, options = {}) { async function createApp(ssrContext, config = {}) { const store = <%= store ? %> createStore(ssrContext) <% : undefined %> - const router = await createRouter(ssrContext, config, store) + const router = await createRouter(ssrContext, config, { store }) <% if (store) { %> // Add this.$router into store actions/mutations From ac7d20aa67894acfdca05d45ba7ee092d6fd2b61 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 11 Aug 2021 14:37:32 +0200 Subject: [PATCH 3/5] Update packages/vue-app/template/router.js --- packages/vue-app/template/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-app/template/router.js b/packages/vue-app/template/router.js index 9e0300844144..6c3d6a50f0f3 100644 --- a/packages/vue-app/template/router.js +++ b/packages/vue-app/template/router.js @@ -101,7 +101,7 @@ export const routerOptions = { fallback: <%= router.fallback %> } -export function createRouter (ssrContext, config, store) { +export function createRouter (ssrContext, config) { const base = (config._app && config._app.basePath) || routerOptions.base const router = new Router({ ...routerOptions, base }) From f89b3c16904ac7f715d48cc82f869ec230134753 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 11 Aug 2021 18:29:53 +0200 Subject: [PATCH 4/5] Update index.js --- packages/vue-app/template/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-app/template/index.js b/packages/vue-app/template/index.js index ce72d784a84f..8dd4c688cee2 100644 --- a/packages/vue-app/template/index.js +++ b/packages/vue-app/template/index.js @@ -92,7 +92,7 @@ function registerModule (path, rawModule, options = {}) { <% } %> async function createApp(ssrContext, config = {}) { - const store = <%= store ? %> createStore(ssrContext) <% : undefined %> + const store = <%= store ? 'createStore(ssrContext)' : null %> const router = await createRouter(ssrContext, config, { store }) <% if (store) { %> From 857e9c028b48325e2aa8c15d2030172ad5eebc6d Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 11 Aug 2021 18:35:16 +0200 Subject: [PATCH 5/5] Update index.js --- packages/vue-app/template/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-app/template/index.js b/packages/vue-app/template/index.js index 8dd4c688cee2..a82d4c5af73b 100644 --- a/packages/vue-app/template/index.js +++ b/packages/vue-app/template/index.js @@ -92,7 +92,7 @@ function registerModule (path, rawModule, options = {}) { <% } %> async function createApp(ssrContext, config = {}) { - const store = <%= store ? 'createStore(ssrContext)' : null %> + const store = <%= store ? 'createStore(ssrContext)' : 'null' %> const router = await createRouter(ssrContext, config, { store }) <% if (store) { %>