Merge pull request #16328 from storybookjs/fix-stories-entry-path

Core: Fix paths to be relative to working dir in v7 mode
storybookjs · Oct 13, 2021 · 9a506dd · 9a506dd
2 parents 5234731 + 6febea3
commit 9a506dd
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/examples/react-ts/main.ts → examples/react-ts/.storybook/main.ts b/examples/react-ts/main.ts → examples/react-ts/.storybook/main.ts
@@ -1,7 +1,7 @@
 import type { StorybookConfig } from '@storybook/react/types';
 
 const config: StorybookConfig = {
-  stories: [{ directory: './src', titlePrefix: 'Demo' }],
+  stories: [{ directory: '../src', titlePrefix: 'Demo' }],
   logLevel: 'debug',
   addons: [
     '@storybook/react',

diff --git a/examples/react-ts/preview.js → examples/react-ts/.storybook/preview.js b/examples/react-ts/preview.js → examples/react-ts/.storybook/preview.js
diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json
@@ -3,9 +3,9 @@
   "version": "6.4.0-beta.9",
   "private": true,
   "scripts": {
-    "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
-    "debug": "cross-env NODE_OPTIONS=--inspect-brk STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./",
-    "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ --no-manager-cache"
+    "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook",
+    "debug": "cross-env NODE_OPTIONS=--inspect-brk STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011",
+    "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 --no-manager-cache"
   },
   "dependencies": {
     "formik": "^2.2.9",

diff --git a/examples/react-ts/tsconfig.json b/examples/react-ts/tsconfig.json
@@ -6,5 +6,5 @@
     "skipLibCheck": true,
     "strict": true
   },
-  "include": ["src/*", "main.ts"]
+  "include": ["src/*", ".storybook/main.ts"]
 }
diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts
@@ -55,7 +55,6 @@ const storybookPaths: Record<string, string> = [
 );
 export default async (options: Options & Record<string, any>): Promise<Configuration> => {
   const {
-    configDir,
     babelOptions,
     outputDir = path.join('.', 'public'),
     quiet,
@@ -94,10 +93,10 @@ export default async (options: Options & Record<string, any>): Promise<Configura
   const virtualModuleMapping: Record<string, string> = {};
   if (features?.storyStoreV7) {
     const storiesFilename = 'storybook-stories.js';
-    const storiesPath = path.resolve(path.join(configDir, storiesFilename));
+    const storiesPath = path.resolve(path.join(workingDir, storiesFilename));
 
     virtualModuleMapping[storiesPath] = toImportFn(stories);
-    const configEntryPath = path.resolve(path.join(configDir, 'storybook-config-entry.js'));
+    const configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js'));
     virtualModuleMapping[configEntryPath] = handlebars(
       await readTemplate(path.join(__dirname, 'virtualModuleModernEntry.js.handlebars')),
       {

diff --git a/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -50,7 +50,6 @@ const storybookPaths: Record<string, string> = [
 
 export default async (options: Options & Record<string, any>): Promise<Configuration> => {
   const {
-    configDir,
     babelOptions,
     outputDir = path.join('.', 'public'),
     quiet,
@@ -88,10 +87,10 @@ export default async (options: Options & Record<string, any>): Promise<Configura
   const virtualModuleMapping: Record<string, string> = {};
   if (features?.storyStoreV7) {
     const storiesFilename = 'storybook-stories.js';
-    const storiesPath = path.resolve(path.join(configDir, storiesFilename));
+    const storiesPath = path.resolve(path.join(workingDir, storiesFilename));
 
     virtualModuleMapping[storiesPath] = toImportFn(stories);
-    const configEntryPath = path.resolve(path.join(configDir, 'storybook-config-entry.js'));
+    const configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js'));
     virtualModuleMapping[configEntryPath] = handlebars(
       await readTemplate(path.join(__dirname, 'virtualModuleModernEntry.js.handlebars')),
       {

diff --git a/lib/core-server/src/core-presets.test.ts b/lib/core-server/src/core-presets.test.ts
@@ -83,7 +83,7 @@ const baseOptions = {
   managerOnly, // production
   docsMode: false,
   cache,
-  configDir: path.resolve(`${__dirname}/../../../examples/react-ts`),
+  configDir: path.resolve(`${__dirname}/../../../examples/react-ts/.storybook`),
   outputDir: `${__dirname}/storybook-static`, // production
   ci: true,
   managerCache: false,