Merge pull request #56 from tfoxy/fix-docs-stories

Fix docs stories
NickMcBurney · Nov 18, 2023 · cc22781 · cc22781
2 parents e6362d4 + 3be6e45
commit cc22781
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -1,9 +1,6 @@
 module.exports = {
   stories: ["../examples/**/*.stories.mdx", "../examples/**/*.stories.@(js|jsx|ts|tsx)"],
   addons: ["../preset.js", "@storybook/addon-essentials"],
-  docs: {
-    autodocs: false
-  },
   framework: {
     name: "@storybook/vue3-vite",
     options: {}

diff --git a/examples/basicExamples.stories.ts b/examples/basicExamples.stories.ts
@@ -5,6 +5,7 @@ import routerViewWrapper from './components/routerViewWrapper.vue'
 export default {
   title: 'Basic Router View Wrapper',
   component: routerViewWrapper,
+  tags: ['autodocs'],
 }
 
 /**

diff --git a/src/withMockRouter.ts b/src/withMockRouter.ts
@@ -1,8 +1,7 @@
 
-import { setup, Decorator } from '@storybook/vue3'
-import { App } from 'vue';
+import { Decorator } from '@storybook/vue3'
+import { getCurrentInstance } from 'vue';
 import { action } from '@storybook/addon-actions'
-import type { StoryContext, StoryFn } from '@storybook/types'
 
 import type {
   Router,
@@ -29,16 +28,9 @@ export function withMockRouter (
     /* optional: router options - used to pass `initialRoute` value, `beforeEach()` navigation guard methods and vue-router `createRouter` options */
     options: { meta?: Array<string>, params?: Array<string>, query?: Array<string> }
 ): Decorator {
-  let app: App
-  let ctx: StoryContext
-
-  setup((setupApp: App, context: StoryContext) => {
-    app = setupApp
-    ctx = context
-  })
-
-  return () => ({
+  return (_, ctx) => ({
     setup () {
+      const { app } = getCurrentInstance()!.appContext
       const existingRouter = app.config.globalProperties.$router as MockRouter
       const existingRoute = app.config.globalProperties.$route as MockRoute
 

diff --git a/src/withVueRouter.ts b/src/withVueRouter.ts
@@ -1,6 +1,5 @@
-import { setup, Decorator } from '@storybook/vue3'
-import { App } from 'vue';
-import type { StoryContext, StoryFn } from '@storybook/types'
+import { Decorator } from '@storybook/vue3'
+import { getCurrentInstance } from 'vue';
 
 import {
   createRouter,
@@ -38,14 +37,10 @@ export function withVueRouter (
     vueRouterOptions?: RouterOptions;
   }
 ): Decorator {
-  let app: App
-
-  setup((setupApp: App) => {
-    app = setupApp
-  })
-
   return () => ({
     setup () {
+        const { app } = getCurrentInstance()!.appContext
+
         /* setup router var */
         let router