Essentials: Prototype removing addon-docs from addon-essentials

code/addons/essentials/package.json

@@ -28,81 +28,6 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs"
     },
-    "./actions/preview": {
-      "types": "./dist/actions/preview.d.ts",
-      "require": "./dist/actions/preview.js",
-      "import": "./dist/actions/preview.mjs"
-    },
-    "./actions/manager": {
-      "types": "./dist/actions/manager.d.ts",
-      "require": "./dist/actions/manager.js",
-      "import": "./dist/actions/manager.mjs"
-    },
-    "./backgrounds/preview": {
-      "types": "./dist/backgrounds/preview.d.ts",
-      "require": "./dist/backgrounds/preview.js",
-      "import": "./dist/backgrounds/preview.mjs"
-    },
-    "./backgrounds/manager": {
-      "types": "./dist/backgrounds/manager.d.ts",
-      "require": "./dist/backgrounds/manager.js",
-      "import": "./dist/backgrounds/manager.mjs"
-    },
-    "./controls/manager": {
-      "types": "./dist/controls/manager.d.ts",
-      "require": "./dist/controls/manager.js",
-      "import": "./dist/controls/manager.mjs"
-    },
-    "./docs/preview": {
-      "types": "./dist/docs/preview.d.ts",
-      "require": "./dist/docs/preview.js",
-      "import": "./dist/docs/preview.mjs"
-    },
-    "./docs/preset": {
-      "types": "./dist/docs/preset.d.ts",
-      "require": "./dist/docs/preset.js",
-      "import": "./dist/docs/preset.mjs"
-    },
-    "./docs/mdx-react-shim": {
-      "types": "./dist/docs/mdx-react-shim.d.ts",
-      "require": "./dist/docs/mdx-react-shim.js",
-      "import": "./dist/docs/mdx-react-shim.mjs"
-    },
-    "./highlight/preview": {
-      "types": "./dist/highlight/preview.d.ts",
-      "require": "./dist/highlight/preview.js",
-      "import": "./dist/highlight/preview.mjs"
-    },
-    "./measure/preview": {
-      "types": "./dist/measure/preview.d.ts",
-      "require": "./dist/measure/preview.js",
-      "import": "./dist/measure/preview.mjs"
-    },
-    "./measure/manager": {
-      "types": "./dist/measure/manager.d.ts",
-      "require": "./dist/measure/manager.js",
-      "import": "./dist/measure/manager.mjs"
-    },
-    "./outline/preview": {
-      "types": "./dist/outline/preview.d.ts",
-      "require": "./dist/outline/preview.js",
-      "import": "./dist/outline/preview.mjs"
-    },
-    "./outline/manager": {
-      "types": "./dist/outline/manager.d.ts",
-      "require": "./dist/outline/manager.js",
-      "import": "./dist/outline/manager.mjs"
-    },
-    "./toolbars/manager": {
-      "types": "./dist/toolbars/manager.d.ts",
-      "require": "./dist/toolbars/manager.js",
-      "import": "./dist/toolbars/manager.mjs"
-    },
-    "./viewport/manager": {
-      "types": "./dist/viewport/manager.d.ts",
-      "require": "./dist/viewport/manager.js",
-      "import": "./dist/viewport/manager.mjs"
-    },
     "./package.json": "./package.json"
   },
   "main": "dist/index.js",
@@ -122,20 +47,16 @@
     "@storybook/addon-actions": "7.1.0",
     "@storybook/addon-backgrounds": "7.1.0",
     "@storybook/addon-controls": "7.1.0",
-    "@storybook/addon-docs": "7.1.0",
     "@storybook/addon-highlight": "7.1.0",
     "@storybook/addon-measure": "7.1.0",
     "@storybook/addon-outline": "7.1.0",
     "@storybook/addon-toolbars": "7.1.0",
     "@storybook/addon-viewport": "7.1.0",
     "@storybook/core-common": "7.1.0",
-    "@storybook/manager-api": "7.1.0",
     "@storybook/node-logger": "7.1.0",
-    "@storybook/preview-api": "7.1.0",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
-    "@storybook/vue": "7.1.0",
     "typescript": "^4.9.3"
   },
   "peerDependencies": {
@@ -147,22 +68,7 @@
   },
   "bundler": {
     "entries": [
-      "./src/index.ts",
-      "./src/actions/preview.ts",
-      "./src/actions/manager.ts",
-      "./src/backgrounds/preview.ts",
-      "./src/backgrounds/manager.ts",
-      "./src/controls/manager.ts",
-      "./src/docs/preview.ts",
-      "./src/docs/preset.ts",
-      "./src/docs/mdx-react-shim.ts",
-      "./src/highlight/preview.ts",
-      "./src/measure/preview.ts",
-      "./src/measure/manager.ts",
-      "./src/outline/preview.ts",
-      "./src/outline/manager.ts",
-      "./src/toolbars/manager.ts",
-      "./src/viewport/manager.ts"
+      "./src/index.ts"
     ],
     "platform": "node"
   },

code/addons/essentials/src/index.ts

@@ -1,10 +1,9 @@
-import path from 'path';
+import path, { dirname } from 'path';
 import { logger } from '@storybook/node-logger';
 import { serverRequire } from '@storybook/core-common';
 
 interface PresetOptions {
   configDir: string;
-  docs?: boolean;
   controls?: boolean;
   actions?: boolean;
   backgrounds?: boolean;
@@ -38,7 +37,6 @@ export function addons(options: PresetOptions) {
 
   const main = requireMain(options.configDir);
   return [
-    'docs',
     'controls',
     'actions',
     'backgrounds',
@@ -51,7 +49,7 @@ export function addons(options: PresetOptions) {
     .filter((key) => (options as any)[key] !== false)
     .filter((addon) => !checkInstalled(addon, main))
     .map((addon) => {
-      // We point to the re-export from addon-essentials to support yarn pnp and pnpm.
-      return `@storybook/addon-essentials/${addon}`;
+      // We point to the resolved directories to support yarn pnp and pnpm.
+      return dirname(require.resolve(`@storybook/addon-${addon}/package.json`));
     });
 }

code/builders/builder-vite/src/optimizeDeps.ts

@@ -12,7 +12,6 @@ const INCLUDE_CANDIDATES = [
   '@mdx-js/react',
   '@storybook/addon-docs > acorn-jsx',
   '@storybook/addon-docs',
-  '@storybook/addon-essentials/docs/mdx-react-shim',
   '@storybook/channels',
   '@storybook/client-api',
   '@storybook/client-logger',

code/lib/cli/src/generators/baseGenerator.ts

@@ -232,12 +232,14 @@ export async function baseGenerator(
   const addons = [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
+    '@storybook/addon-docs',
     ...stripVersions(extraAddonPackages),
   ];
   // added to package.json
   const addonPackages = [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
+    '@storybook/addon-docs',
     '@storybook/blocks',
     ...extraAddonPackages,
   ];

code/ui/.storybook/main.ts

@@ -51,6 +51,7 @@ const config: StorybookConfig = {
   stories: isBlocksOnly ? blocksOnlyStories : allStories,
   addons: [
     '@storybook/addon-links',
+    '@storybook/addon-docs',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',
     '@storybook/addon-storysource',

code/ui/manager/src/components/sidebar/Tree.stories.tsx

@@ -102,7 +102,7 @@ export const SingleStoryComponents: Story = {
               title: 'Single',
               name: 'Single',
               kind: 'single',
-              tags: [],
+              tags: ['autodocs'],
               isRoot: false,
               isLeaf: true,
               isComponent: false,
@@ -174,7 +174,7 @@ export const DocsOnlySingleStoryComponents = {
               title: 'Single',
               name: 'Single',
               kind: 'single',
-              tags: [],
+              tags: ['autodocs'],
               isRoot: false,
               isLeaf: true,
               isComponent: false,

code/yarn.lock

@@ -5711,17 +5711,13 @@ __metadata:
     "@storybook/addon-actions": 7.1.0
     "@storybook/addon-backgrounds": 7.1.0
     "@storybook/addon-controls": 7.1.0
-    "@storybook/addon-docs": 7.1.0
     "@storybook/addon-highlight": 7.1.0
     "@storybook/addon-measure": 7.1.0
     "@storybook/addon-outline": 7.1.0
     "@storybook/addon-toolbars": 7.1.0
     "@storybook/addon-viewport": 7.1.0
     "@storybook/core-common": 7.1.0
-    "@storybook/manager-api": 7.1.0
     "@storybook/node-logger": 7.1.0
-    "@storybook/preview-api": 7.1.0
-    "@storybook/vue": 7.1.0
     ts-dedent: ^2.0.0
     typescript: ^4.9.3
   peerDependencies: