From ce0dbd1467ec959ad2fb8a027545f0a503dd7944 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Thu, 8 Jun 2017 21:53:23 +1200 Subject: [PATCH 1/9] Added vanilla CRNA app with storybook Equivalent of: ``` yarn create react-native-app crna-vanilla cd crna-vanilla getstorybook ``` I did not hook up storybook with the app, per https://github.com/storybooks/storybook/tree/master/app/react-native#cre ate-react-native-app-crna --- app/react/src/server/middleware.js | 4 +- .../add-custom-head-tags/index.md | 1 - examples/crna-vanilla/.babelrc | 8 + examples/crna-vanilla/.flowconfig | 63 ++++++ examples/crna-vanilla/.gitignore | 3 + examples/crna-vanilla/.watchmanconfig | 1 + examples/crna-vanilla/App.js | 25 +++ examples/crna-vanilla/App.test.js | 11 + examples/crna-vanilla/README.md | 199 ++++++++++++++++++ examples/crna-vanilla/app.json | 5 + examples/crna-vanilla/package.json | 29 +++ examples/crna-vanilla/storybook/addons.js | 2 + examples/crna-vanilla/storybook/index.js | 9 + .../storybook/stories/Button/index.android.js | 18 ++ .../storybook/stories/Button/index.ios.js | 18 ++ .../storybook/stories/CenterView/index.js | 15 ++ .../storybook/stories/CenterView/style.js | 8 + .../storybook/stories/Welcome/index.js | 52 +++++ .../crna-vanilla/storybook/stories/index.js | 25 +++ lerna.json | 6 +- 20 files changed, 497 insertions(+), 5 deletions(-) create mode 100644 examples/crna-vanilla/.babelrc create mode 100644 examples/crna-vanilla/.flowconfig create mode 100644 examples/crna-vanilla/.gitignore create mode 100644 examples/crna-vanilla/.watchmanconfig create mode 100644 examples/crna-vanilla/App.js create mode 100644 examples/crna-vanilla/App.test.js create mode 100644 examples/crna-vanilla/README.md create mode 100644 examples/crna-vanilla/app.json create mode 100644 examples/crna-vanilla/package.json create mode 100644 examples/crna-vanilla/storybook/addons.js create mode 100644 examples/crna-vanilla/storybook/index.js create mode 100644 examples/crna-vanilla/storybook/stories/Button/index.android.js create mode 100644 examples/crna-vanilla/storybook/stories/Button/index.ios.js create mode 100644 examples/crna-vanilla/storybook/stories/CenterView/index.js create mode 100644 examples/crna-vanilla/storybook/stories/CenterView/style.js create mode 100644 examples/crna-vanilla/storybook/stories/Welcome/index.js create mode 100644 examples/crna-vanilla/storybook/stories/index.js diff --git a/app/react/src/server/middleware.js b/app/react/src/server/middleware.js index d15201c82a28..aa61721ca00a 100644 --- a/app/react/src/server/middleware.js +++ b/app/react/src/server/middleware.js @@ -50,14 +50,14 @@ export default function(configDir) { }; router.get('/', (req, res) => { - const headHtml = getManagerHeadHtml(configDir) + const headHtml = getManagerHeadHtml(configDir); res.send(getIndexHtml({ publicPath, headHtml })); }); router.get('/iframe.html', (req, res) => { const headHtml = getHeadHtml(configDir); res.send(getIframeHtml({ ...data, headHtml, publicPath })); - }); + }); if (stats.toJson().errors.length) { webpackReject(stats); diff --git a/docs/pages/configurations/add-custom-head-tags/index.md b/docs/pages/configurations/add-custom-head-tags/index.md index 6cae4180c759..7960160c17f6 100644 --- a/docs/pages/configurations/add-custom-head-tags/index.md +++ b/docs/pages/configurations/add-custom-head-tags/index.md @@ -27,4 +27,3 @@ Create a file called `manager-head.html` inside of the Storybook config director > **Important** > > Your scripts will run before Storybook's React UI. Also be aware, that this is an uncommon scenario and could potentially break Storybook's UI. So use with caution. - diff --git a/examples/crna-vanilla/.babelrc b/examples/crna-vanilla/.babelrc new file mode 100644 index 000000000000..2bcd546dbfd2 --- /dev/null +++ b/examples/crna-vanilla/.babelrc @@ -0,0 +1,8 @@ +{ + "presets": ["babel-preset-expo"], + "env": { + "development": { + "plugins": ["transform-react-jsx-source"] + } + } +} diff --git a/examples/crna-vanilla/.flowconfig b/examples/crna-vanilla/.flowconfig new file mode 100644 index 000000000000..c5507b0c06e7 --- /dev/null +++ b/examples/crna-vanilla/.flowconfig @@ -0,0 +1,63 @@ +[ignore] +; We fork some components by platform +.*/*[.]android.js + +; Ignore "BUCK" generated dirs +/\.buckd/ + +; Ignore unexpected extra "@providesModule" +.*/node_modules/.*/node_modules/fbjs/.* + +; Ignore duplicate module providers +; For RN Apps installed via npm, "Libraries" folder is inside +; "node_modules/react-native" but in the source repo it is in the root +.*/Libraries/react-native/React.js +.*/Libraries/react-native/ReactNative.js + +; Additional create-react-native-app ignores + +; Ignore duplicate module providers +.*/node_modules/fbemitter/lib/* + +; Ignore misbehaving dev-dependencies +.*/node_modules/xdl/build/* +.*/node_modules/reqwest/tests/* + +; Ignore missing expo-sdk dependencies (temporarily) +; https://github.com/expo/expo/issues/162 +.*/node_modules/expo/src/* + +; Ignore react-native-fbads dependency of the expo sdk +.*/node_modules/react-native-fbads/* + +[include] + +[libs] +node_modules/react-native/Libraries/react-native/react-native-interface.js +node_modules/react-native/flow +flow/ + +[options] +module.system=haste + +emoji=true + +experimental.strict_type_args=true + +munge_underscores=true + +module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub' + +suppress_type=$FlowIssue +suppress_type=$FlowFixMe +suppress_type=$FixMe + +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy +suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError + +unsafe.enable_getters_and_setters=true + +[version] +^0.42.0 diff --git a/examples/crna-vanilla/.gitignore b/examples/crna-vanilla/.gitignore new file mode 100644 index 000000000000..1025e17bd3c6 --- /dev/null +++ b/examples/crna-vanilla/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +.expo/ +npm-debug.* diff --git a/examples/crna-vanilla/.watchmanconfig b/examples/crna-vanilla/.watchmanconfig new file mode 100644 index 000000000000..0967ef424bce --- /dev/null +++ b/examples/crna-vanilla/.watchmanconfig @@ -0,0 +1 @@ +{} diff --git a/examples/crna-vanilla/App.js b/examples/crna-vanilla/App.js new file mode 100644 index 000000000000..a838e5b61abc --- /dev/null +++ b/examples/crna-vanilla/App.js @@ -0,0 +1,25 @@ +/* eslint-disable */ + +import React from 'react'; +import { StyleSheet, Text, View } from 'react-native'; + +export default class App extends React.Component { + render() { + return ( + + Open up App.js to start working on your app! + Changes you make will automatically reload. + Shake your phone to open the developer menu. + + ); + } +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: '#fff', + alignItems: 'center', + justifyContent: 'center', + }, +}); diff --git a/examples/crna-vanilla/App.test.js b/examples/crna-vanilla/App.test.js new file mode 100644 index 000000000000..d6439b1f0865 --- /dev/null +++ b/examples/crna-vanilla/App.test.js @@ -0,0 +1,11 @@ +/* eslint-disable */ + +import React from 'react'; +import App from './App'; + +import renderer from 'react-test-renderer'; + +it('renders without crashing', () => { + const rendered = renderer.create().toJSON(); + expect(rendered).toBeTruthy(); +}); diff --git a/examples/crna-vanilla/README.md b/examples/crna-vanilla/README.md new file mode 100644 index 000000000000..badf23552286 --- /dev/null +++ b/examples/crna-vanilla/README.md @@ -0,0 +1,199 @@ +This project was bootstrapped with [Create React Native App](https://github.com/react-community/create-react-native-app). + +Below you'll find information about performing common tasks. The most recent version of this guide is available [here](https://github.com/react-community/create-react-native-app/blob/master/react-native-scripts/template/README.md). + +## Table of Contents + +- [Updating to New Releases](#updating-to-new-releases) +- [Available Scripts](#available-scripts) + - [npm start](#npm-start) +- [Customizing App Display Name and Icon](#customizing-app-display-name-and-icon) +- [Writing and Running Tests](#writing-and-running-tests) +- [Environment Variables](#environment-variables) + - [Configuring Packager IP Address](#configuring-packager-ip-address) +- [Adding Flow](#adding-flow) +- [Sharing and Deployment](#sharing-and-deployment) + - [Publishing to Expo's React Native Community](#publishing-to-expos-react-native-community) + - [Building an Expo "standalone" app](#building-an-expo-standalone-app) + - [Ejecting from Create React Native App](#ejecting-from-create-react-native-app) +- [Troubleshooting](#troubleshooting) + - [Networking](#networking) + - [iOS Simulator won't open](#ios-simulator-wont-open) + - [QR Code does not scan](#qr-code-does-not-scan) + +## Updating to New Releases + +You should only need to update the global installation of `create-react-native-app` very rarely, ideally never. + +Updating the `react-native-scripts` dependency of your app should be as simple as bumping the version number in `package.json` and reinstalling your project's dependencies. + +Upgrading to a new version of React Native requires updating the `react-native`, `react`, and `expo` package versions, and setting the correct `sdkVersion` in `app.json`. See the [versioning guide](https://github.com/react-community/create-react-native-app/blob/master/VERSIONS.md) for up-to-date information about package version compatibility. + +## Available Scripts + +If Yarn was installed when the project was initialized, then dependencies will have been installed via Yarn, and you should probably use it to run these commands as well. Unlike dependency installation, command running syntax is identical for Yarn and NPM at the time of this writing. + +### `npm start` + +Runs your app in development mode. + +Open it in the [Expo app](https://expo.io) on your phone to view it. It will reload if you save edits to your files, and you will see build errors and logs in the terminal. + +Sometimes you may need to reset or clear the React Native packager's cache. To do so, you can pass the `--reset-cache` flag to the start script: + + npm start -- --reset-cache + # or + yarn start -- --reset-cache + +#### `npm test` + +Runs the [jest](https://github.com/facebook/jest) test runner on your tests. + +#### `npm run ios` + +Like `npm start`, but also attempts to open your app in the iOS Simulator if you're on a Mac and have it installed. + +#### `npm run android` + +Like `npm start`, but also attempts to open your app on a connected Android device or emulator. Requires an installation of Android build tools (see [React Native docs](https://facebook.github.io/react-native/docs/getting-started.html) for detailed setup). We also recommend installing Genymotion as your Android emulator. Once you've finished setting up the native build environment, there are two options for making the right copy of `adb` available to Create React Native App: + +##### Using Android Studio's `adb` + +1. Make sure that you can run adb from your terminal. +2. Open Genymotion and navigate to `Settings -> ADB`. Select โ€œUse custom Android SDK toolsโ€ and update with your [Android SDK directory](https://stackoverflow.com/questions/25176594/android-sdk-location). + +##### Using Genymotion's `adb` + +1. Find Genymotionโ€™s copy of adb. On macOS for example, this is normally `/Applications/Genymotion.app/Contents/MacOS/tools/`. +2. Add the Genymotion tools directory to your path (instructions for [Mac](http://osxdaily.com/2014/08/14/add-new-path-to-path-command-line/), [Linux](http://www.computerhope.com/issues/ch001647.htm), and [Windows](https://www.howtogeek.com/118594/how-to-edit-your-system-path-for-easy-command-line-access/)). +3. Make sure that you can run adb from your terminal. + +#### `npm run eject` + +This will start the process of "ejecting" from Create React Native App's build scripts. You'll be asked a couple of questions about how you'd like to build your project. + +**Warning:** Running eject is a permanent action (aside from whatever version control system you use). An ejected app will require you to have an [Xcode and/or Android Studio environment](https://facebook.github.io/react-native/docs/getting-started.html) set up. + +## Customizing App Display Name and Icon + +You can edit `app.json` to include [configuration keys](https://docs.expo.io/versions/latest/guides/configuration.html) under the `expo` key. + +To change your app's display name, set the `expo.name` key in `app.json` to an appropriate string. + +To set an app icon, set the `expo.icon` key in `app.json` to be either a local path or a URL. It's recommended that you use a 512x512 png file with transparency. + +## Writing and Running Tests + +This project is set up to use [jest](https://facebook.github.io/jest/) for tests. You can configure whatever testing strategy you like, but jest works out of the box. Create test files in directories called `__tests__` to have the files loaded by jest. See the [the template project](https://github.com/react-community/create-react-native-app/tree/master/react-native-scripts/template/__tests__) for an example test. The [jest documentation](https://facebook.github.io/jest/docs/getting-started.html) is also a wonderful resource, as is the [React Native testing tutorial](https://facebook.github.io/jest/docs/tutorial-react-native.html). + +## Environment Variables + +You can configure some of Create React Native App's behavior using environment variables. + +### Configuring Packager IP Address + +When starting your project, you'll see something like this for your project URL: + + exp://192.168.0.2:19000 + +The "manifest" at that URL tells the Expo app how to retrieve and load your app's JavaScript bundle, so even if you load it in the app via a URL like `exp://localhost:19000`, the Expo client app will still try to retrieve your app at the IP address that the start script provides. + +In some cases, this is less than ideal. This might be the case if you need to run your project inside of a virtual machine and you have to access the packager via a different IP address than the one which prints by default. In order to override the IP address or hostname that is detected by Create React Native App, you can specify your own hostname via the `REACT_NATIVE_PACKAGER_HOSTNAME` environment variable: + +Mac and Linux: + + REACT_NATIVE_PACKAGER_HOSTNAME='my-custom-ip-address-or-hostname' npm start + +Windows: + + set REACT_NATIVE_PACKAGER_HOSTNAME='my-custom-ip-address-or-hostname' + npm start + +The above example would cause the development server to listen on `exp://my-custom-ip-address-or-hostname:19000`. + +## Adding Flow + +Flow is a static type checker that helps you write code with fewer bugs. Check out this [introduction to using static types in JavaScript](https://medium.com/@preethikasireddy/why-use-static-types-in-javascript-part-1-8382da1e0adb) if you are new to this concept. + +React Native works with [Flow](http://flowtype.org/) out of the box, as long as your Flow version matches the one used in the version of React Native. + +To add a local dependency to the correct Flow version to a Create React Native App project, follow these steps: + +1. Find the Flow `[version]` at the bottom of the included [.flowconfig](.flowconfig) +2. Run `npm install --save-dev flow-bin@x.y.z` (or `yarn add --dev flow-bin@x.y.z`), where `x.y.z` is the .flowconfig version number. +3. Add `"flow": "flow"` to the `scripts` section of your `package.json`. +4. Add `// @flow` to any files you want to type check (for example, to `App.js`). + +Now you can run `npm run flow` (or `yarn flow`) to check the files for type errors. +You can optionally use a [plugin for your IDE or editor](https://flow.org/en/docs/editors/) for a better integrated experience. + +To learn more about Flow, check out [its documentation](https://flow.org/). + +## Sharing and Deployment + +Create React Native App does a lot of work to make app setup and development simple and straightforward, but it's very difficult to do the same for deploying to Apple's App Store or Google's Play Store without relying on a hosted service. + +### Publishing to Expo's React Native Community + +Expo provides free hosting for the JS-only apps created by CRNA, allowing you to share your app through the Expo client app. This requires registration for an Expo account. + +Install the `exp` command-line tool, and run the publish command: + + $ npm i -g exp + $ exp publish + +### Building an Expo "standalone" app + +You can also use a service like [Expo's standalone builds](https://docs.expo.io/versions/latest/guides/building-standalone-apps.html) if you want to get an IPA/APK for distribution without having to build the native code yourself. + +### Ejecting from Create React Native App + +If you want to build and deploy your app yourself, you'll need to eject from CRNA and use Xcode and Android Studio. + +This is usually as simple as running `npm run eject` in your project, which will walk you through the process. Make sure to install `react-native-cli` and follow the [native code getting started guide for React Native](https://facebook.github.io/react-native/docs/getting-started.html). + +#### Should I Use ExpoKit? + +If you have made use of Expo APIs while working on your project, then those API calls will stop working if you eject to a regular React Native project. If you want to continue using those APIs, you can eject to "React Native + ExpoKit" which will still allow you to build your own native code and continue using the Expo APIs. See the [ejecting guide](https://github.com/react-community/create-react-native-app/blob/master/EJECTING.md) for more details about this option. + +## Troubleshooting + +### Networking + +If you're unable to load your app on your phone due to a network timeout or a refused connection, a good first step is to verify that your phone and computer are on the same network and that they can reach each other. Create React Native App needs access to ports 19000 and 19001 so ensure that your network and firewall settings allow access from your device to your computer on both of these ports. + +Try opening a web browser on your phone and opening the URL that the packager script prints, replacing `exp://` with `http://`. So, for example, if underneath the QR code in your terminal you see: + + exp://192.168.0.1:19000 + +Try opening Safari or Chrome on your phone and loading + + http://192.168.0.1:19000 + +and + + http://192.168.0.1:19001 + +If this works, but you're still unable to load your app by scanning the QR code, please open an issue on the [Create React Native App repository](https://github.com/react-community/create-react-native-app) with details about these steps and any other error messages you may have received. + +If you're not able to load the `http` URL in your phone's web browser, try using the tethering/mobile hotspot feature on your phone (beware of data usage, though), connecting your computer to that WiFi network, and restarting the packager. + +### iOS Simulator won't open + +If you're on a Mac, there are a few errors that users sometimes see when attempting to `npm run ios`: + +- "non-zero exit code: 107" +- "You may need to install Xcode" but it is already installed +- and others + +There are a few steps you may want to take to troubleshoot these kinds of errors: + +1. Make sure Xcode is installed and open it to accept the license agreement if it prompts you. You can install it from the Mac App Store. +2. Open Xcode's Preferences, the Locations tab, and make sure that the `Command Line Tools` menu option is set to something. Sometimes when the CLI tools are first installed by Homebrew this option is left blank, which can prevent Apple utilities from finding the simulator. Make sure to re-run `npm/yarn run ios` after doing so. +3. If that doesn't work, open the Simulator, and under the app menu select `Reset Contents and Settings...`. After that has finished, quit the Simulator, and re-run `npm/yarn run ios`. + +### QR Code does not scan + +If you're not able to scan the QR code, make sure your phone's camera is focusing correctly, and also make sure that the contrast on the two colors in your terminal is high enough. For example, WebStorm's default themes may [not have enough contrast](https://github.com/react-community/create-react-native-app/issues/49) for terminal QR codes to be scannable with the system barcode scanners that the Expo app uses. + +If this causes problems for you, you may want to try changing your terminal's color theme to have more contrast, or running Create React Native App from a different terminal. You can also manually enter the URL printed by the packager script in the Expo app's search bar to load it manually. diff --git a/examples/crna-vanilla/app.json b/examples/crna-vanilla/app.json new file mode 100644 index 000000000000..46c3343ebc68 --- /dev/null +++ b/examples/crna-vanilla/app.json @@ -0,0 +1,5 @@ +{ + "expo": { + "sdkVersion": "17.0.0" + } +} diff --git a/examples/crna-vanilla/package.json b/examples/crna-vanilla/package.json new file mode 100644 index 000000000000..1dbf4611a118 --- /dev/null +++ b/examples/crna-vanilla/package.json @@ -0,0 +1,29 @@ +{ + "name": "crna-vanilla", + "version": "0.1.0", + "private": true, + "devDependencies": { + "react-native-scripts": "0.0.31", + "jest-expo": "~1.0.1", + "react-test-renderer": "16.0.0-alpha.6", + "react-dom": "^15.5.4", + "@storybook/react-native": "^3.0.1" + }, + "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js", + "scripts": { + "start": "react-native-scripts start", + "eject": "react-native-scripts eject", + "android": "react-native-scripts android", + "ios": "react-native-scripts ios", + "test": "node node_modules/jest/bin/jest.js --watch", + "storybook": "storybook start -p 7007" + }, + "jest": { + "preset": "jest-expo" + }, + "dependencies": { + "expo": "^17.0.0", + "react": "16.0.0-alpha.6", + "react-native": "^0.44.0" + } +} diff --git a/examples/crna-vanilla/storybook/addons.js b/examples/crna-vanilla/storybook/addons.js new file mode 100644 index 000000000000..6aed412d04af --- /dev/null +++ b/examples/crna-vanilla/storybook/addons.js @@ -0,0 +1,2 @@ +import '@storybook/addon-actions/register'; +import '@storybook/addon-links/register'; diff --git a/examples/crna-vanilla/storybook/index.js b/examples/crna-vanilla/storybook/index.js new file mode 100644 index 000000000000..fe7c22a703d5 --- /dev/null +++ b/examples/crna-vanilla/storybook/index.js @@ -0,0 +1,9 @@ +import { getStorybookUI, configure } from '@storybook/react-native'; + +// import stories +configure(() => { + require('./stories'); // eslint-disable-line global-require +}, module); + +const StorybookUI = getStorybookUI({ port: 7007, host: 'localhost' }); +export default StorybookUI; diff --git a/examples/crna-vanilla/storybook/stories/Button/index.android.js b/examples/crna-vanilla/storybook/stories/Button/index.android.js new file mode 100644 index 000000000000..178e9ba70878 --- /dev/null +++ b/examples/crna-vanilla/storybook/stories/Button/index.android.js @@ -0,0 +1,18 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { TouchableNativeFeedback } from 'react-native'; + +const Button = props => + + {props.children} + ; + +Button.propTypes = { + children: PropTypes.node.isRequired, + onPress: PropTypes.func, +}; +Button.defaultProps = { + onPress: () => {}, +}; + +export { Button as default }; diff --git a/examples/crna-vanilla/storybook/stories/Button/index.ios.js b/examples/crna-vanilla/storybook/stories/Button/index.ios.js new file mode 100644 index 000000000000..fb647e78a82c --- /dev/null +++ b/examples/crna-vanilla/storybook/stories/Button/index.ios.js @@ -0,0 +1,18 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { TouchableHighlight } from 'react-native'; + +const Button = props => + + {props.children} + ; + +Button.propTypes = { + children: PropTypes.node.isRequired, + onPress: PropTypes.func, +}; +Button.defaultProps = { + onPress: () => {}, +}; + +export { Button as default }; diff --git a/examples/crna-vanilla/storybook/stories/CenterView/index.js b/examples/crna-vanilla/storybook/stories/CenterView/index.js new file mode 100644 index 000000000000..93c04ff6e8cf --- /dev/null +++ b/examples/crna-vanilla/storybook/stories/CenterView/index.js @@ -0,0 +1,15 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { View } from 'react-native'; +import style from './style'; + +const CenterView = props => + + {props.children} + ; + +CenterView.propTypes = { + children: PropTypes.node.isRequired, +}; + +export { CenterView as default }; diff --git a/examples/crna-vanilla/storybook/stories/CenterView/style.js b/examples/crna-vanilla/storybook/stories/CenterView/style.js new file mode 100644 index 000000000000..ff347fd9841f --- /dev/null +++ b/examples/crna-vanilla/storybook/stories/CenterView/style.js @@ -0,0 +1,8 @@ +export default { + main: { + flex: 1, + justifyContent: 'center', + alignItems: 'center', + backgroundColor: '#F5FCFF', + }, +}; diff --git a/examples/crna-vanilla/storybook/stories/Welcome/index.js b/examples/crna-vanilla/storybook/stories/Welcome/index.js new file mode 100644 index 000000000000..c99a9aba96aa --- /dev/null +++ b/examples/crna-vanilla/storybook/stories/Welcome/index.js @@ -0,0 +1,52 @@ +import React from 'react'; +import { View, Text } from 'react-native'; +import PropTypes from 'prop-types'; + +export default class Welcome extends React.Component { + styles = { + wrapper: { + flex: 1, + padding: 24, + justifyContent: 'center', + }, + header: { + fontSize: 18, + marginBottom: 18, + }, + content: { + fontSize: 12, + marginBottom: 10, + lineHeight: 18, + }, + }; + + showApp(event) { + event.preventDefault(); + this.props.showApp(); + } + + render() { + return ( + + Welcome to React Native Storybook + + This is a UI Component development environment for your React Native app. Here you can + display and interact with your UI components as stories. A story is a single state of one + or more UI components. You can have as many stories as you want. In other words a story is + like a visual test case. + + + We have added some stories inside the "storybook/stories" directory for examples. Try + editing the "storybook/stories/Welcome.js" file to edit this message. + + + ); + } +} + +Welcome.propTypes = { + showApp: PropTypes.func, +}; +Welcome.defaultProps = { + showApp: () => {}, +}; diff --git a/examples/crna-vanilla/storybook/stories/index.js b/examples/crna-vanilla/storybook/stories/index.js new file mode 100644 index 000000000000..1f0e1cb917a5 --- /dev/null +++ b/examples/crna-vanilla/storybook/stories/index.js @@ -0,0 +1,25 @@ +import React from 'react'; +import { Text } from 'react-native'; + +import { storiesOf } from '@storybook/react-native'; +import { action } from '@storybook/addon-actions'; +import { linkTo } from '@storybook/addon-links'; + +import Button from './Button'; +import CenterView from './CenterView'; +import Welcome from './Welcome'; + +storiesOf('Welcome', module).add('to Storybook', () => ); + +storiesOf('Button', module) + .addDecorator(getStory => {getStory()}) + .add('with text', () => + + ) + .add('with some emoji', () => + + ); diff --git a/lerna.json b/lerna.json index b1c0d4d0125a..7eb97b5bd952 100644 --- a/lerna.json +++ b/lerna.json @@ -4,14 +4,16 @@ "bootstrap": { "ignore": [ "test-cra", - "react-native-vanilla" + "react-native-vanilla", + "crna-vanilla" ] }, "publish": { "ignore": [ "cra-storybook", "test-cra", - "react-native-vanilla" + "react-native-vanilla", + "crna-vanilla" ] } }, From 5af7b6ef1210013975338f7d5252ad5bfa4a2e67 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Thu, 8 Jun 2017 22:03:06 +1200 Subject: [PATCH 2/9] Add eslint-disable explanation for CRNA-generated files --- examples/crna-vanilla/App.js | 1 + examples/crna-vanilla/App.test.js | 1 + 2 files changed, 2 insertions(+) diff --git a/examples/crna-vanilla/App.js b/examples/crna-vanilla/App.js index a838e5b61abc..a84fe9b2f6bf 100644 --- a/examples/crna-vanilla/App.js +++ b/examples/crna-vanilla/App.js @@ -1,3 +1,4 @@ +// generated by CRNA /* eslint-disable */ import React from 'react'; diff --git a/examples/crna-vanilla/App.test.js b/examples/crna-vanilla/App.test.js index d6439b1f0865..0ed6152a5204 100644 --- a/examples/crna-vanilla/App.test.js +++ b/examples/crna-vanilla/App.test.js @@ -1,3 +1,4 @@ +// generated by CRNA /* eslint-disable */ import React from 'react'; From 10d63ec1a945e2b3c6a85aa7b966f469036691f2 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 9 Jun 2017 01:03:15 +1200 Subject: [PATCH 3/9] Make crna-vanilla use repo packages and run storybook w/o mods --- examples/crna-vanilla/App.js | 52 ++++++++++++++++-------------- examples/crna-vanilla/package.json | 9 +++++- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/examples/crna-vanilla/App.js b/examples/crna-vanilla/App.js index a84fe9b2f6bf..ac4ee7fb1f02 100644 --- a/examples/crna-vanilla/App.js +++ b/examples/crna-vanilla/App.js @@ -1,26 +1,30 @@ -// generated by CRNA -/* eslint-disable */ - -import React from 'react'; -import { StyleSheet, Text, View } from 'react-native'; +import StorybookUI from './storybook'; -export default class App extends React.Component { - render() { - return ( - - Open up App.js to start working on your app! - Changes you make will automatically reload. - Shake your phone to open the developer menu. - - ); - } -} +export default StorybookUI; -const styles = StyleSheet.create({ - container: { - flex: 1, - backgroundColor: '#fff', - alignItems: 'center', - justifyContent: 'center', - }, -}); +// generated by CRNA +// /* eslint-disable */ +// +// import React from 'react'; +// import { StyleSheet, Text, View } from 'react-native'; +// +// export default class App extends React.Component { +// render() { +// return ( +// +// Open up App.js to start working on your app! +// Changes you make will automatically reload. +// Shake your phone to open the developer menu. +// +// ); +// } +// } +// +// const styles = StyleSheet.create({ +// container: { +// flex: 1, +// backgroundColor: '#fff', +// alignItems: 'center', +// justifyContent: 'center', +// }, +// }); diff --git a/examples/crna-vanilla/package.json b/examples/crna-vanilla/package.json index 1dbf4611a118..14759c4fb323 100644 --- a/examples/crna-vanilla/package.json +++ b/examples/crna-vanilla/package.json @@ -7,7 +7,14 @@ "jest-expo": "~1.0.1", "react-test-renderer": "16.0.0-alpha.6", "react-dom": "^15.5.4", - "@storybook/react-native": "^3.0.1" + "@storybook/addon-actions": "file:../../addons/actions", + "@storybook/addon-links": "file:../../addons/links", + "@storybook/addon-options": "file:../../addons/options", + "@storybook/addons": "file:../../lib/addons", + "@storybook/channels": "file:../../lib/channels", + "@storybook/channel-postmessage": "file:../../lib/channel-postmessage", + "@storybook/react-native": "file:../../app/react-native", + "@storybook/ui": "file:../../lib/ui" }, "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js", "scripts": { From 424c02f10ce720efc832a5b33ef5a72c8d164bc8 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sat, 10 Jun 2017 23:08:08 +1200 Subject: [PATCH 4/9] Rename crna-vanilla to crna-getstorybook --- .../{crna-vanilla => crna-getstorybook}/.babelrc | 0 .../.flowconfig | 0 .../{crna-vanilla => crna-getstorybook}/.gitignore | 0 .../.watchmanconfig | 0 .../{crna-vanilla => crna-getstorybook}/App.js | 0 .../App.test.js | 0 .../{crna-vanilla => crna-getstorybook}/README.md | 0 .../{crna-vanilla => crna-getstorybook}/app.json | 0 .../package.json | 14 +++++--------- .../storybook/addons.js | 0 .../storybook/index.js | 0 .../storybook/stories/Button/index.android.js | 0 .../storybook/stories/Button/index.ios.js | 0 .../storybook/stories/CenterView/index.js | 0 .../storybook/stories/CenterView/style.js | 0 .../storybook/stories/Welcome/index.js | 0 .../storybook/stories/index.js | 0 lerna.json | 5 ++--- 18 files changed, 7 insertions(+), 12 deletions(-) rename examples/{crna-vanilla => crna-getstorybook}/.babelrc (100%) rename examples/{crna-vanilla => crna-getstorybook}/.flowconfig (100%) rename examples/{crna-vanilla => crna-getstorybook}/.gitignore (100%) rename examples/{crna-vanilla => crna-getstorybook}/.watchmanconfig (100%) rename examples/{crna-vanilla => crna-getstorybook}/App.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/App.test.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/README.md (100%) rename examples/{crna-vanilla => crna-getstorybook}/app.json (100%) rename examples/{crna-vanilla => crna-getstorybook}/package.json (59%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/addons.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/index.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/stories/Button/index.android.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/stories/Button/index.ios.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/stories/CenterView/index.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/stories/CenterView/style.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/stories/Welcome/index.js (100%) rename examples/{crna-vanilla => crna-getstorybook}/storybook/stories/index.js (100%) diff --git a/examples/crna-vanilla/.babelrc b/examples/crna-getstorybook/.babelrc similarity index 100% rename from examples/crna-vanilla/.babelrc rename to examples/crna-getstorybook/.babelrc diff --git a/examples/crna-vanilla/.flowconfig b/examples/crna-getstorybook/.flowconfig similarity index 100% rename from examples/crna-vanilla/.flowconfig rename to examples/crna-getstorybook/.flowconfig diff --git a/examples/crna-vanilla/.gitignore b/examples/crna-getstorybook/.gitignore similarity index 100% rename from examples/crna-vanilla/.gitignore rename to examples/crna-getstorybook/.gitignore diff --git a/examples/crna-vanilla/.watchmanconfig b/examples/crna-getstorybook/.watchmanconfig similarity index 100% rename from examples/crna-vanilla/.watchmanconfig rename to examples/crna-getstorybook/.watchmanconfig diff --git a/examples/crna-vanilla/App.js b/examples/crna-getstorybook/App.js similarity index 100% rename from examples/crna-vanilla/App.js rename to examples/crna-getstorybook/App.js diff --git a/examples/crna-vanilla/App.test.js b/examples/crna-getstorybook/App.test.js similarity index 100% rename from examples/crna-vanilla/App.test.js rename to examples/crna-getstorybook/App.test.js diff --git a/examples/crna-vanilla/README.md b/examples/crna-getstorybook/README.md similarity index 100% rename from examples/crna-vanilla/README.md rename to examples/crna-getstorybook/README.md diff --git a/examples/crna-vanilla/app.json b/examples/crna-getstorybook/app.json similarity index 100% rename from examples/crna-vanilla/app.json rename to examples/crna-getstorybook/app.json diff --git a/examples/crna-vanilla/package.json b/examples/crna-getstorybook/package.json similarity index 59% rename from examples/crna-vanilla/package.json rename to examples/crna-getstorybook/package.json index 14759c4fb323..1e5a70891cf6 100644 --- a/examples/crna-vanilla/package.json +++ b/examples/crna-getstorybook/package.json @@ -1,5 +1,5 @@ { - "name": "crna-vanilla", + "name": "crna-getstorybook", "version": "0.1.0", "private": true, "devDependencies": { @@ -7,14 +7,10 @@ "jest-expo": "~1.0.1", "react-test-renderer": "16.0.0-alpha.6", "react-dom": "^15.5.4", - "@storybook/addon-actions": "file:../../addons/actions", - "@storybook/addon-links": "file:../../addons/links", - "@storybook/addon-options": "file:../../addons/options", - "@storybook/addons": "file:../../lib/addons", - "@storybook/channels": "file:../../lib/channels", - "@storybook/channel-postmessage": "file:../../lib/channel-postmessage", - "@storybook/react-native": "file:../../app/react-native", - "@storybook/ui": "file:../../lib/ui" + "@storybook/addon-actions": "3.0.0", + "@storybook/addon-links": "3.0.0", + "@storybook/addons": "3.0.0", + "@storybook/react-native": "3.0.0" }, "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js", "scripts": { diff --git a/examples/crna-vanilla/storybook/addons.js b/examples/crna-getstorybook/storybook/addons.js similarity index 100% rename from examples/crna-vanilla/storybook/addons.js rename to examples/crna-getstorybook/storybook/addons.js diff --git a/examples/crna-vanilla/storybook/index.js b/examples/crna-getstorybook/storybook/index.js similarity index 100% rename from examples/crna-vanilla/storybook/index.js rename to examples/crna-getstorybook/storybook/index.js diff --git a/examples/crna-vanilla/storybook/stories/Button/index.android.js b/examples/crna-getstorybook/storybook/stories/Button/index.android.js similarity index 100% rename from examples/crna-vanilla/storybook/stories/Button/index.android.js rename to examples/crna-getstorybook/storybook/stories/Button/index.android.js diff --git a/examples/crna-vanilla/storybook/stories/Button/index.ios.js b/examples/crna-getstorybook/storybook/stories/Button/index.ios.js similarity index 100% rename from examples/crna-vanilla/storybook/stories/Button/index.ios.js rename to examples/crna-getstorybook/storybook/stories/Button/index.ios.js diff --git a/examples/crna-vanilla/storybook/stories/CenterView/index.js b/examples/crna-getstorybook/storybook/stories/CenterView/index.js similarity index 100% rename from examples/crna-vanilla/storybook/stories/CenterView/index.js rename to examples/crna-getstorybook/storybook/stories/CenterView/index.js diff --git a/examples/crna-vanilla/storybook/stories/CenterView/style.js b/examples/crna-getstorybook/storybook/stories/CenterView/style.js similarity index 100% rename from examples/crna-vanilla/storybook/stories/CenterView/style.js rename to examples/crna-getstorybook/storybook/stories/CenterView/style.js diff --git a/examples/crna-vanilla/storybook/stories/Welcome/index.js b/examples/crna-getstorybook/storybook/stories/Welcome/index.js similarity index 100% rename from examples/crna-vanilla/storybook/stories/Welcome/index.js rename to examples/crna-getstorybook/storybook/stories/Welcome/index.js diff --git a/examples/crna-vanilla/storybook/stories/index.js b/examples/crna-getstorybook/storybook/stories/index.js similarity index 100% rename from examples/crna-vanilla/storybook/stories/index.js rename to examples/crna-getstorybook/storybook/stories/index.js diff --git a/lerna.json b/lerna.json index 7eb97b5bd952..effe22994bf0 100644 --- a/lerna.json +++ b/lerna.json @@ -4,8 +4,7 @@ "bootstrap": { "ignore": [ "test-cra", - "react-native-vanilla", - "crna-vanilla" + "react-native-vanilla" ] }, "publish": { @@ -13,7 +12,7 @@ "cra-storybook", "test-cra", "react-native-vanilla", - "crna-vanilla" + "crna-getstorybook" ] } }, From 974571d7e5495292817880d83302e3d489453f0b Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sat, 10 Jun 2017 23:31:51 +1200 Subject: [PATCH 5/9] Random lint-fixing --- addons/info/src/components/Node.js | 4 ++-- addons/info/src/components/PropTable.js | 4 ++-- addons/info/src/components/Story.js | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/info/src/components/Node.js b/addons/info/src/components/Node.js index 34bf3aad17bb..6861665fca2e 100644 --- a/addons/info/src/components/Node.js +++ b/addons/info/src/components/Node.js @@ -106,7 +106,7 @@ export default function Node(props) { /> > - {React.Children.map(children, childElement => ( + {React.Children.map(children, childElement => - ))} + )}
</{name}>
diff --git a/addons/info/src/components/PropTable.js b/addons/info/src/components/PropTable.js index ca44d6e4d977..ded666436083 100644 --- a/addons/info/src/components/PropTable.js +++ b/addons/info/src/components/PropTable.js @@ -98,7 +98,7 @@ export default function PropTable(props) { - {array.map(row => ( + {array.map(row => {row.property} {row.propType} @@ -110,7 +110,7 @@ export default function PropTable(props) { {row.description} - ))} + )} ); diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js index 0ec1e096f9de..1c639aed8b0e 100644 --- a/addons/info/src/components/Story.js +++ b/addons/info/src/components/Story.js @@ -258,7 +258,7 @@ export default class Story extends React.Component {

Story Source

-          {React.Children.map(this.props.children, (root, idx) => (
+          {React.Children.map(this.props.children, (root, idx) =>
             
-          ))}
+          )}
); @@ -323,7 +323,7 @@ export default class Story extends React.Component { array.sort((a, b) => (a.displayName || a.name) > (b.displayName || b.name)); const { maxPropObjectKeys, maxPropArrayLength, maxPropStringLength } = this.props; - const propTables = array.map(type => ( + const propTables = array.map(type =>

"{type.displayName || type.name}" Component @@ -335,7 +335,7 @@ export default class Story extends React.Component { maxPropStringLength={maxPropStringLength} />

- )); + ); if (!propTables || propTables.length === 0) { return null; From 8b7d2c20f406f7646d2316e8dfee03d204aef792 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sat, 10 Jun 2017 23:32:36 +1200 Subject: [PATCH 6/9] Fix permissions --- app/react-native/src/bin/storybook-build.js | 0 app/react-native/src/bin/storybook-start.js | 0 app/react-native/src/bin/storybook.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 app/react-native/src/bin/storybook-build.js mode change 100644 => 100755 app/react-native/src/bin/storybook-start.js mode change 100644 => 100755 app/react-native/src/bin/storybook.js diff --git a/app/react-native/src/bin/storybook-build.js b/app/react-native/src/bin/storybook-build.js old mode 100644 new mode 100755 diff --git a/app/react-native/src/bin/storybook-start.js b/app/react-native/src/bin/storybook-start.js old mode 100644 new mode 100755 diff --git a/app/react-native/src/bin/storybook.js b/app/react-native/src/bin/storybook.js old mode 100644 new mode 100755 From 417e2f6b2ce34fd0ac509c32c2541efccab55c87 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sun, 11 Jun 2017 10:05:21 +1200 Subject: [PATCH 7/9] Convert crna-getstorybook to "*" dependencies --- examples/crna-getstorybook/package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/crna-getstorybook/package.json b/examples/crna-getstorybook/package.json index 1e5a70891cf6..6fc17c3cea9e 100644 --- a/examples/crna-getstorybook/package.json +++ b/examples/crna-getstorybook/package.json @@ -7,10 +7,9 @@ "jest-expo": "~1.0.1", "react-test-renderer": "16.0.0-alpha.6", "react-dom": "^15.5.4", - "@storybook/addon-actions": "3.0.0", - "@storybook/addon-links": "3.0.0", - "@storybook/addons": "3.0.0", - "@storybook/react-native": "3.0.0" + "@storybook/addon-actions": "*", + "@storybook/addon-links": "*", + "@storybook/react-native": "*" }, "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js", "scripts": { From 80a5a0b4cc0efecce95740111cc19af07b278cb3 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sun, 11 Jun 2017 10:28:08 +1200 Subject: [PATCH 8/9] Add basic testing to crna-getstorybook --- .../__snapshots__/storyshots.js.snap | 151 ++++++++++++++++++ .../__tests__/index.android.js | 13 ++ .../crna-getstorybook/__tests__/index.ios.js | 13 ++ .../crna-getstorybook/__tests__/storyshots.js | 7 + examples/crna-getstorybook/jest.config.js | 6 + examples/crna-getstorybook/package.json | 3 +- 6 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 examples/crna-getstorybook/__tests__/__snapshots__/storyshots.js.snap create mode 100644 examples/crna-getstorybook/__tests__/index.android.js create mode 100644 examples/crna-getstorybook/__tests__/index.ios.js create mode 100644 examples/crna-getstorybook/__tests__/storyshots.js create mode 100644 examples/crna-getstorybook/jest.config.js diff --git a/examples/crna-getstorybook/__tests__/__snapshots__/storyshots.js.snap b/examples/crna-getstorybook/__tests__/__snapshots__/storyshots.js.snap new file mode 100644 index 000000000000..bc75b09ed489 --- /dev/null +++ b/examples/crna-getstorybook/__tests__/__snapshots__/storyshots.js.snap @@ -0,0 +1,151 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Storyshots Button with some emoji 1`] = ` + + + + ๐Ÿ˜€ ๐Ÿ˜Ž ๐Ÿ‘ ๐Ÿ’ฏ + + + +`; + +exports[`Storyshots Button with text 1`] = ` + + + + Hello Button + + + +`; + +exports[`Storyshots Welcome to Storybook 1`] = ` + + + Welcome to React Native Storybook + + + This is a UI Component development environment for your React Native app. Here you can display and interact with your UI components as stories. A story is a single state of one or more UI components. You can have as many stories as you want. In other words a story is like a visual test case. + + + We have added some stories inside the "storybook/stories" directory for examples. Try editing the "storybook/stories/Welcome.js" file to edit this message. + + +`; diff --git a/examples/crna-getstorybook/__tests__/index.android.js b/examples/crna-getstorybook/__tests__/index.android.js new file mode 100644 index 000000000000..54427bbdb44c --- /dev/null +++ b/examples/crna-getstorybook/__tests__/index.android.js @@ -0,0 +1,13 @@ +// This is the default file as put down by RN +/* eslint-disable */ + +import 'react-native'; +import React from 'react'; +import Index from '../index.android.js'; + +// Note: test renderer must be required after react-native. +import renderer from 'react-test-renderer'; + +it('renders correctly', () => { + const tree = renderer.create(); +}); diff --git a/examples/crna-getstorybook/__tests__/index.ios.js b/examples/crna-getstorybook/__tests__/index.ios.js new file mode 100644 index 000000000000..9b20849b12c1 --- /dev/null +++ b/examples/crna-getstorybook/__tests__/index.ios.js @@ -0,0 +1,13 @@ +// This is the default file as put down by RN +/* eslint-disable */ + +import 'react-native'; +import React from 'react'; +import Index from '../index.ios.js'; + +// Note: test renderer must be required after react-native. +import renderer from 'react-test-renderer'; + +it('renders correctly', () => { + const tree = renderer.create(); +}); diff --git a/examples/crna-getstorybook/__tests__/storyshots.js b/examples/crna-getstorybook/__tests__/storyshots.js new file mode 100644 index 000000000000..4f625b473e29 --- /dev/null +++ b/examples/crna-getstorybook/__tests__/storyshots.js @@ -0,0 +1,7 @@ +import path from 'path'; +import initStoryshots from '@storybook/addon-storyshots'; + +initStoryshots({ + framework: 'react-native', + configPath: path.join(__dirname, '..', 'storybook'), +}); diff --git a/examples/crna-getstorybook/jest.config.js b/examples/crna-getstorybook/jest.config.js new file mode 100644 index 000000000000..377a172fabae --- /dev/null +++ b/examples/crna-getstorybook/jest.config.js @@ -0,0 +1,6 @@ +module.exports = { + preset: 'react-native', + globals: { + __DEV__: true, + }, +}; diff --git a/examples/crna-getstorybook/package.json b/examples/crna-getstorybook/package.json index 6fc17c3cea9e..b91d421d17e9 100644 --- a/examples/crna-getstorybook/package.json +++ b/examples/crna-getstorybook/package.json @@ -9,7 +9,8 @@ "react-dom": "^15.5.4", "@storybook/addon-actions": "*", "@storybook/addon-links": "*", - "@storybook/react-native": "*" + "@storybook/react-native": "*", + "@storybook/storyshots": "*" }, "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js", "scripts": { From 88dd5ebaed52048e9d2297c26b0ffce2ba4e84dc Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sun, 11 Jun 2017 10:55:02 +1200 Subject: [PATCH 9/9] Fix crna-getstorybook snapshot testing --- .../crna-getstorybook/__tests__/index.android.js | 13 ------------- examples/crna-getstorybook/__tests__/index.ios.js | 13 ------------- examples/crna-getstorybook/package.json | 6 ++++-- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 examples/crna-getstorybook/__tests__/index.android.js delete mode 100644 examples/crna-getstorybook/__tests__/index.ios.js diff --git a/examples/crna-getstorybook/__tests__/index.android.js b/examples/crna-getstorybook/__tests__/index.android.js deleted file mode 100644 index 54427bbdb44c..000000000000 --- a/examples/crna-getstorybook/__tests__/index.android.js +++ /dev/null @@ -1,13 +0,0 @@ -// This is the default file as put down by RN -/* eslint-disable */ - -import 'react-native'; -import React from 'react'; -import Index from '../index.android.js'; - -// Note: test renderer must be required after react-native. -import renderer from 'react-test-renderer'; - -it('renders correctly', () => { - const tree = renderer.create(); -}); diff --git a/examples/crna-getstorybook/__tests__/index.ios.js b/examples/crna-getstorybook/__tests__/index.ios.js deleted file mode 100644 index 9b20849b12c1..000000000000 --- a/examples/crna-getstorybook/__tests__/index.ios.js +++ /dev/null @@ -1,13 +0,0 @@ -// This is the default file as put down by RN -/* eslint-disable */ - -import 'react-native'; -import React from 'react'; -import Index from '../index.ios.js'; - -// Note: test renderer must be required after react-native. -import renderer from 'react-test-renderer'; - -it('renders correctly', () => { - const tree = renderer.create(); -}); diff --git a/examples/crna-getstorybook/package.json b/examples/crna-getstorybook/package.json index b91d421d17e9..9a5be5dcce93 100644 --- a/examples/crna-getstorybook/package.json +++ b/examples/crna-getstorybook/package.json @@ -9,8 +9,10 @@ "react-dom": "^15.5.4", "@storybook/addon-actions": "*", "@storybook/addon-links": "*", - "@storybook/react-native": "*", - "@storybook/storyshots": "*" + "@storybook/addon-storyshots": "*", + "@storybook/addons": "*", + "@storybook/channels": "*", + "@storybook/react-native": "*" }, "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js", "scripts": {