Vue3: Move docs preset to framework

app/vue3/package.json

@@ -49,6 +49,7 @@
     "@storybook/core": "6.5.0-alpha.47",
     "@storybook/core-common": "6.5.0-alpha.47",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
+    "@storybook/docs-tools": "6.5.0-alpha.47",
     "@storybook/store": "6.5.0-alpha.47",
     "@types/node": "^14.14.20 || ^16.0.0",
     "@types/webpack-env": "^1.16.0",

app/vue3/src/client/docs/config.ts

@@ -1,5 +1,5 @@
+import { extractComponentDescription, enhanceArgTypes } from '@storybook/docs-tools';
 import { extractArgTypes } from './extractArgTypes';
-import { extractComponentDescription } from '../../lib/docgen';
 import { prepareForInline } from './prepareForInline';
 
 export const parameters = {
@@ -10,3 +10,5 @@ export const parameters = {
     extractComponentDescription,
   },
 };
+
+export const argTypesEnhancers = [enhanceArgTypes];

app/vue3/src/client/docs/extractArgTypes.ts

@@ -1,7 +1,6 @@
 import type { StrictArgTypes } from '@storybook/csf';
-import { hasDocgen, extractComponentProps } from '../../lib/docgen';
-import type { ArgTypesExtractor } from '../../lib/docgen';
-import { convert } from '../../lib/convert';
+import type { ArgTypesExtractor } from '@storybook/docs-tools';
+import { hasDocgen, extractComponentProps, convert } from '@storybook/docs-tools';
 
 const SECTIONS = ['props', 'events', 'slots'];
 

app/vue3/src/client/docs/prepareForInline.ts

@@ -1,8 +1,7 @@
 import React from 'react';
 import * as Vue from 'vue';
-import { app } from '@storybook/vue3';
-import type { StoryContext, PartialStoryFn } from '@storybook/csf';
-import type { VueFramework } from '@storybook/vue3';
+import { StoryContext, PartialStoryFn } from '@storybook/csf';
+import { app, VueFramework } from '../index';
 
 // This is cast as `any` to workaround type errors caused by Vue 2 types
 const { render, h } = Vue as any;

app/vue3/src/server/framework-preset-vue3-docs.ts

@@ -1,4 +1,4 @@
-import type { Options } from '@storybook/core-common';
+import { findDistEsm, Options, StorybookConfig } from '@storybook/core-common';
 
 export function webpackFinal(webpackConfig: any = {}, options: Options) {
   let vueDocgenOptions = {};
@@ -26,3 +26,7 @@ export function webpackFinal(webpackConfig: any = {}, options: Options) {
   });
   return webpackConfig;
 }
+
+export const config: StorybookConfig['config'] = (entry = []) => {
+  return [...entry, findDistEsm(__dirname, 'client/docs/config')];
+};

app/vue3/src/server/options.ts

@@ -4,5 +4,8 @@ import type { LoadOptions } from '@storybook/core-common';
 export default {
   packageJson: sync({ cwd: __dirname }).packageJson,
   framework: 'vue3',
-  frameworkPresets: [require.resolve('./framework-preset-vue3')],
+  frameworkPresets: [
+    require.resolve('./framework-preset-vue3'),
+    require.resolve('./framework-preset-vue3-docs'),
+  ],
 } as LoadOptions;