Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .storybook/Storybook.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// storybook.requires generated in prestart script
// which calls get-stories script
// eslint-disable-next-line import/no-unresolved
import './storybook.requires'

import { getStorybookUI } from '@storybook/react-native'
Expand Down
1 change: 1 addition & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* Parsed by prestart script calling get-stories script
* @storybook/react-native/scripts (loader.js)
* ES6 mods not (yet) supported, for e.g.
* main.{ts/mjs}: export default { ... }
Expand Down
34 changes: 0 additions & 34 deletions .storybook/storybook.requires.js

This file was deleted.

807 changes: 0 additions & 807 deletions .yarn/releases/yarn-3.3.0.cjs

This file was deleted.

815 changes: 815 additions & 0 deletions .yarn/releases/yarn-4.0.0-rc.28.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.3.0.cjs
yarnPath: .yarn/releases/yarn-4.0.0-rc.28.cjs
13 changes: 0 additions & 13 deletions jest/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,12 @@ jest.mock('@storybook/addon-ondevice-notes', () => ({
*/
register: () => jest.fn()
}))
jest.mock('@storybook/addon-actions/dist/modern/preset/addArgs', () => ({
argsEnhancers: {
/**
* TODO: Figure why Jest unable to parse Array.prototype.forEach()
* e.g. argsEnhancers: []
* Jest config likely needs ES version bump or polyfill
*/
forEach: jest.fn()
}
}))
jest.mock('@storybook/react-native', () => ({
addDecorator: jest.fn(),
addParameters: jest.fn(),
configure: jest.fn(),
getStorybookUI: jest.fn()
}))
// @storybook/addon-ondevice-knobs
jest.mock('react-native-color-picker', () => jest.fn())
jest.mock('react-native-switch', () => jest.fn())
jest.mock('@storybook/addon-ondevice-knobs', () => ({
register: () => jest.fn()
}))
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"scripts": {
"setup": "yarn",
"prestart": "yarn get-stories",
"start": "react-native start",
"start:reset": "react-native start --reset-cache",
"android": "react-native run-android --active-arch-only",
Expand Down Expand Up @@ -61,7 +62,7 @@
"@storybook/addon-controls": "6.5.14",
"@storybook/addon-knobs": "6.4.0",
"@storybook/addon-links": "6.5.14",
"@storybook/addon-notes": "next",
"@storybook/addon-notes": "5.3.21",
"@storybook/addon-ondevice-actions": "6.0.1-canary.3",
"@storybook/addon-ondevice-backgrounds": "6.0.1-canary.3",
"@storybook/addon-ondevice-controls": "6.0.1-canary.3",
Expand Down Expand Up @@ -146,5 +147,5 @@
"prettier --write"
]
},
"packageManager": "yarn@3.3.0"
"packageManager": "yarn@4.0.0-rc.28"
}
1 change: 0 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {
ReloadInstructions
} from 'react-native/Libraries/NewAppScreen'

// TODO: Fix Storybook v6.0.1-alpha.7 crash and upgrade to v6.0.1-beta.6
import _StorybookUIRoot from '../.storybook/Storybook'

if (__DEV__) {
Expand Down
1 change: 0 additions & 1 deletion storybook/stories/CenterView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ CenterView.defaultProps = {
}

CenterView.propTypes = {
// @ts-expect-error Type 'Requireable<ReactNodeLike>' is not assignable to type 'Validator<ReactNode>'
children: PropTypes.node
}

Expand Down
Loading