feat(react-native): upgrade @storybook/react-native to 6.0.1-beta.11 (#…

…14437)
nrwl · Jan 23, 2023 · 0a1e744 · 0a1e744
1 parent 578f5c0
commit 0a1e744
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/packages/react-native/src/generators/storybook-configuration/files/app/storybook.ts.template b/packages/react-native/src/generators/storybook-configuration/files/app/storybook.ts.template
@@ -1,9 +1,9 @@
 import { configure, getStorybookUI } from '@storybook/react-native';
 
-import { loadStories } from '../../../../.storybook/story-loader';
+import { loadStories } from '<%= offsetFromRoot %>../.storybook/story-loader';
 
-configure(loadStories(), module, false);
+configure(() => loadStories(), module);
 
-const StorybookUIRoot = getStorybookUI({});
+const StorybookUIRoot = getStorybookUI();
 
-export default StorybookUIRoot;
+export default StorybookUIRoot;
diff --git a/packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts b/packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts
@@ -24,7 +24,13 @@ export async function createStorybookFiles(
   );
 
   // do not proceed if not a react native project
-  if (targets?.start?.executor !== '@nrwl/react-native:start') {
+  if (
+    targets?.start?.executor !== '@nrwl/react-native:start' &&
+    targets?.start?.executor !== '@nrwl/expo:start'
+  ) {
+    logger.error(
+      `Unable to add storybook to ${schema.name}. It is not a Nx React Native / Expo project.`
+    );
     return;
   }
 
@@ -33,7 +39,7 @@ export async function createStorybookFiles(
 
   if (host.exists(storybookUIFilePath)) {
     logger.warn(
-      `${storybookUIFileName} file already exists for React Native ${projectType} ${schema.name}! Skipping generating this file.`
+      `${storybookUIFileName} file already exists for ${projectType} ${schema.name}! Skipping generating this file.`
     );
     return;
   }
@@ -45,10 +51,6 @@ export async function createStorybookFiles(
     );
   }
 
-  const projectDirectory = projectType === 'application' ? 'app' : 'lib';
-
-  logger.debug(`Adding storybook file to React Native app ${projectDirectory}`);
-
   // copy files to app's .storybook folder
   generateFiles(
     host,
@@ -57,7 +59,6 @@ export async function createStorybookFiles(
     {
       tmpl: '',
       offsetFromRoot: offsetFromRoot(sourceRoot),
-      projectType: projectDirectory,
     }
   );
 

diff --git a/packages/storybook/migrations.json b/packages/storybook/migrations.json
@@ -68,6 +68,31 @@
     }
   },
   "packageJsonUpdates": {
+    "15.5.2": {
+      "version": "15.5.2-beta.0",
+      "packages": {
+        "@storybook/react-native": {
+          "version": "^6.0.1-beta.11",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/addon-ondevice-actions": {
+          "version": "^6.0.1-beta.11",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/addon-ondevice-backgrounds": {
+          "version": "^6.0.1-beta.11",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/addon-ondevice-controls": {
+          "version": "^6.0.1-beta.11",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/addon-ondevice-notes": {
+          "version": "^6.0.1-beta.11",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
     "15.4.3": {
       "version": "15.4.3-beta.1",
       "packages": {

diff --git a/packages/storybook/src/utils/versions.ts b/packages/storybook/src/utils/versions.ts
@@ -7,7 +7,7 @@ export const svgrVersion = '^5.4.0';
 export const urlLoaderVersion = '^3.0.0';
 export const webpack5Version = '^5.64.0';
 export const viteBuilderVersion = '^0.2.6';
-export const storybookReactNativeVersion = '^6.0.1-beta.9';
+export const storybookReactNativeVersion = '^6.0.1-beta.11';
 export const reactNativeStorybookLoader = '^2.0.5';
 export const storybookSwcAddonVersion = '^1.1.7';
 export const storybookNextAddonVersion = '^1.6.6';