Merge pull request #11753 from merceyz/pnp

Core: Fix monorepo compatibility
storybookjs · Sep 11, 2020 · df297e2 · df297e2
2 parents bca57a8 + 7cd6bdb
commit df297e2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/app/react/src/server/framework-preset-cra.ts b/app/react/src/server/framework-preset-cra.ts
@@ -7,7 +7,7 @@ type Preset = string | { name: string };
 const checkForNewPreset = (presetsList: Preset[]) => {
   const hasNewPreset = presetsList.some((preset: Preset) => {
     const presetName = typeof preset === 'string' ? preset : preset.name;
-    return presetName === '@storybook/preset-create-react-app';
+    return /@storybook(\/|\\)preset-create-react-app/.test(presetName);
   });
 
   if (!hasNewPreset) {

diff --git a/lib/core/src/server/presets.js b/lib/core/src/server/presets.js
@@ -69,7 +69,10 @@ export const resolveAddonName = (configDir, name) => {
     // eslint-disable-next-line no-empty
   } catch (err) {}
 
-  return { name, type: 'presets' };
+  return {
+    name: resolveFrom(configDir, name),
+    type: 'presets',
+  };
 };
 
 const map = ({ configDir }) => (item) => {

diff --git a/lib/core/src/server/presets.test.js b/lib/core/src/server/presets.test.js
@@ -25,8 +25,10 @@ jest.mock('resolve-from', () => (l, name) => {
     '/absolute/preset',
     '/absolute/addons',
     '@storybook/addon-docs/preset',
+    '@storybook/addon-essentials',
     '@storybook/addon-knobs/register',
     '@storybook/addon-notes/register-panel',
+    '@storybook/preset-create-react-app',
     '@storybook/preset-typescript',
     'addon-bar/preset.js',
     'addon-baz/register.js',

diff --git a/lib/core/src/server/preview/base-webpack.config.js b/lib/core/src/server/preview/base-webpack.config.js
@@ -5,8 +5,8 @@ import { logger } from '@storybook/node-logger';
 
 export async function createDefaultWebpackConfig(storybookBaseConfig, options) {
   if (
-    options.presetsList.some(
-      (preset) => (preset.name || preset) === '@storybook/preset-create-react-app'
+    options.presetsList.some((preset) =>
+      /@storybook(\/|\\)preset-create-react-app/.test(preset.name || preset)
     )
   ) {
     return storybookBaseConfig;

diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts
@@ -83,6 +83,13 @@ const configureYarn2 = async ({ cwd }: Options) => {
     `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`,
     // Some required magic to be able to fetch deps from local registry
     `yarn config set unsafeHttpWhitelist --json '["localhost"]'`,
+    // Disable fallback mode to make sure everything is required correctly
+    `yarn config set pnpFallbackMode none`,
+    // Add package extensions
+    // https://github.com/casesandberg/reactcss/pull/153
+    `yarn config set "packageExtensions.reactcss@*.peerDependencies.react" "*"`,
+    // https://github.com/casesandberg/react-color/pull/746
+    `yarn config set "packageExtensions.react-color@*.peerDependencies.react" "*"`,
   ].join(' && ');
   logger.info(`🎛 Configuring Yarn 2`);
   logger.debug(command);