Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update react-native from 0.43.4 to 0.49.3 in app/react-native #1971

Merged
merged 10 commits into from
Oct 29, 2017
Merged

Update react-native from 0.43.4 to 0.49.3 in app/react-native #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8396bc4
Update react-native from 0.43.4 to 0.49.1 in app/react-native
dependencies-bot Oct 4, 2017
f0ce6a3
Merge branch 'master' into react-native-0.49.1-9.0.0-app--react-native
Hypnosphi Oct 4, 2017
ebbda93
Merge remote-tracking branch 'origin/master' into react-native-0.49.1…
Hypnosphi Oct 9, 2017
e6c63e9
Merge branch 'master' into react-native-0.49.1-9.0.0-app--react-native
Hypnosphi Oct 9, 2017
65cfbf1
Merge branch 'master' into react-native-0.49.1-9.0.0-app--react-native
danielduan Oct 29, 2017
8bfa4be
fix crna dependencies
danielduan Oct 29, 2017
39fdb4e
vanilla app runs jest fine
danielduan Oct 29, 2017
3d8e344
react-native update
danielduan Oct 29, 2017
0b999b9
Merge branch 'master' into react-native-0.49.1-9.0.0-app--react-native
danielduan Oct 29, 2017
74ec0f7
new lock file
danielduan Oct 29, 2017
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
2 changes: 1 addition & 1 deletion app/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"babel-cli": "^6.26.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-native": "^0.43.3"
"react-native": "^0.49.3"
},
"peerDependencies": {
"react": "*",
Expand Down
2 changes: 1 addition & 1 deletion examples/crna-kitchen-sink/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"expo": {
"sdkVersion": "19.0.0"
"sdkVersion": "22.0.0"
}
}
12 changes: 6 additions & 6 deletions examples/crna-kitchen-sink/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@storybook/react-native": "file:../../packs/storybook-react-native.tgz",
"@storybook/ui": "file:../../packs/storybook-ui.tgz",
"react-native-scripts": "1.1.0",
"jest-expo": "~19.0.0",
"react-test-renderer": "16.0.0-alpha.12"
"jest-expo": "^22.0.0",
"react-test-renderer": "~16.0.0"
},
"main": "./node_modules/react-native-scripts/build/bin/crna-entry.js",
"scripts": {
Expand All @@ -30,9 +30,9 @@
"preset": "jest-expo"
},
"dependencies": {
"expo": "^19.0.0",
"prop-types": "^15.6.0",
"react": "16.0.0-alpha.12",
"react-native": "^0.46.1"
"expo": "^22.0.0",
"prop-types": "^15.5.0",
"react": "~16.0.0",
"react-native": "~0.49.3"
}
}
7 changes: 7 additions & 0 deletions examples/react-native-vanilla/__tests__/__snapshots__/storyshots.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ exports[`Storyshots Button with some emoji 1`] = `
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
Expand All @@ -40,6 +41,7 @@ exports[`Storyshots Button with some emoji 1`] = `
<Text
accessible={true}
allowFontScaling={true}
disabled={false}
ellipsizeMode="tail"
>
😀 😎 👍 💯
Expand Down Expand Up @@ -67,6 +69,7 @@ exports[`Storyshots Button with text 1`] = `
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
Expand All @@ -88,6 +91,7 @@ exports[`Storyshots Button with text 1`] = `
<Text
accessible={true}
allowFontScaling={true}
disabled={false}
ellipsizeMode="tail"
>
Hello Button
Expand All @@ -109,6 +113,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
<Text
accessible={true}
allowFontScaling={true}
disabled={false}
ellipsizeMode="tail"
style={
Object {
Expand All @@ -122,6 +127,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
<Text
accessible={true}
allowFontScaling={true}
disabled={false}
ellipsizeMode="tail"
style={
Object {
Expand All @@ -136,6 +142,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
<Text
accessible={true}
allowFontScaling={true}
disabled={false}
ellipsizeMode="tail"
style={
Object {
Expand Down
8 changes: 4 additions & 4 deletions examples/react-native-vanilla/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"version": "0.0.1",
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start",
"start": "node node_modules/react-native/local-cli/cli.js run-ios",
"test": "jest",
"storybook": "storybook start -p 7007"
},
"dependencies": {
"prop-types": "^15.6.0",
"react": "16.0.0-alpha.6",
"react-native": "0.44.1"
"react": "~16.0.0",
"react-native": "~0.49.3"
},
"devDependencies": {
"babel-jest": "21.0.0",
"babel-preset-react-native": "1.9.2",
"jest": "^21.0.1",
"react-test-renderer": "16.0.0-alpha.6",
"react-test-renderer": "~16.0.0",
"@storybook/addon-actions": "file:../../packs/storybook-addon-actions.tgz",
"@storybook/addon-links": "file:../../packs/storybook-addon-links.tgz",
"@storybook/addon-options": "file:../../packs/storybook-addon-options.tgz",
Expand Down
3 changes: 3 additions & 0 deletions examples/react-native-vanilla/storybook/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import StorybookUI from './storybook';

export default StorybookUI;
Loading