@storybook/react-native 7.0.0-alpha.0 → 7.0.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native",
-  "version": "7.0.0-alpha.0",
+  "version": "7.0.0-alpha.2",
   "description": "A better way to develop React Native Components for your app",
   "keywords": [
     "react",
@@ -59,8 +59,9 @@
     "@storybook/core-events": "^7",
     "@storybook/csf": "^0.1.1",
     "@storybook/global": "^5.0.0",
+    "@storybook/preview-api": "^7",
     "@storybook/preview-web": "^7",
-    "@storybook/react-native-theming": "^7.0.0-alpha.0",
+    "@storybook/react-native-theming": "^7.0.0-alpha.2",
     "chokidar": "^3.5.1",
     "commander": "^8.2.0",
     "deepmerge": "^4.3.0",
@@ -71,6 +72,7 @@
     "util": "^0.12.4"
   },
   "devDependencies": {
+    "@storybook/types": "^7",
     "@types/jest": "^29.4.3",
     "@types/react": "~18.2.14",
     "babel-jest": "^29.4.3",
@@ -92,5 +94,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a16d060c6d1e49a7d68ba8e698d7128ee18a94b7"
+  "gitHead": "284fd8ae2ea94588dfea0f216d34bf263b2c6139"
 }

package/scripts/__snapshots__/loader.test.js.snap

@@ -4,7 +4,7 @@ exports[`loader writeRequires when there are different file extensions writes th
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer, clearDecorators } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/file-extensions","files":"FakeStory.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/file-extensions\\\\/FakeStory\\\\.stories\\\\.tsx)$"}]
 
@@ -48,7 +48,7 @@ exports[`loader writeRequires when there is a configuration object writes the st
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer, clearDecorators } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
 
       global.STORIES = [{"titlePrefix":"ComponentsPrefix","files":"**/*.stories.tsx","directory":"./scripts/mocks/configuration-objects/components","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/configuration-objects\\\\/components(?:\\\\/(?!\\\\.)(?:(?:(?!(?:^|\\\\/)\\\\.).)*?)\\\\/|\\\\/|$)(?!\\\\.)(?=.)[^/]*?\\\\.stories\\\\.tsx)$"}]
 
@@ -92,7 +92,7 @@ exports[`loader writeRequires when there is a story glob and exclude paths globs
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer, clearDecorators } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/exclude-config-files","files":"**/*.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/exclude-config-files(?:\\\\/(?!\\\\.)(?:(?:(?!(?:^|\\\\/)\\\\.).)*?)\\\\/|\\\\/|$)(?!\\\\.)(?=.)[^/]*?\\\\.stories\\\\.tsx)$"}]
 
@@ -136,7 +136,7 @@ exports[`loader writeRequires when there is a story glob writes the story import
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer, clearDecorators } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/all-config-files","files":"FakeStory.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/all-config-files\\\\/FakeStory\\\\.stories\\\\.tsx)$"}]
 
@@ -180,7 +180,7 @@ exports[`loader writeRequires when there is no preview does not add preview rela
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer, clearDecorators } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/no-preview","files":"FakeStory.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/no-preview\\\\/FakeStory\\\\.stories\\\\.tsx)$"}]
 
@@ -214,7 +214,7 @@ exports[`loader writeRequires when there is no story glob or addons writes no st
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer, clearDecorators } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
 
       global.STORIES = []
 

package/scripts/loader.js

@@ -112,8 +112,10 @@ function writeRequires({ configPath, absolute = false, unstable_useRequireContex
   if (unstable_useRequireContext) {
     const contexts = storiesSpecifiers.map((specifier) => {
       const { path: p, recursive: r, match: m } = toRequireContext(specifier);
-      // TODO remove this dot 👇 and find actual solution
-      return `require.context('.${p}', ${r}, ${m})`;
+
+      const pathToStory = ensureRelativePathHasDot(path.relative(configPath, p));
+
+      return `require.context('${pathToStory}', ${r}, ${m})`;
     });
 
     configure = `
@@ -187,10 +189,7 @@ function writeRequires({ configPath, absolute = false, unstable_useRequireContex
     `;
   }
 
-  const normalizedStories = normalizeStories(main.stories, {
-    configDir: configPath,
-    workingDir: cwd,
-  }).map((specifier) => ({
+  const normalizedStories = storiesSpecifiers.map((specifier) => ({
     ...specifier,
     importPathMatcher: specifier.importPathMatcher.source,
   }));
@@ -200,7 +199,7 @@ function writeRequires({ configPath, absolute = false, unstable_useRequireContex
   const fileContent = `
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer, clearDecorators } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
 
       ${globalStories}