Skip to content
This repository has been archived by the owner on Jan 13, 2023. It is now read-only.

Commit

Permalink
fix(boilerplate): Update to React Native 0.61 (#263 by @jamonholmgren)
Browse files Browse the repository at this point in the history
  • Loading branch information
jamonholmgren authored Oct 7, 2019
1 parent ad289f6 commit 3f7894c
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 69 deletions.
26 changes: 20 additions & 6 deletions boilerplate/.gitignore.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
project.xcworkspace

# Android/IntelliJ
#
Expand All @@ -40,13 +39,28 @@ yarn-error.log
buck-out/
\.buckd/
*.keystore
!debug.keystore

# VS Code
.vscode

# Cocoapods
/ios/Pods
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

*/fastlane/report.xml
*/fastlane/Preview.html
*/fastlane/screenshots

# Bundle artifact
*.jsbundle

# CocoaPods
/ios/Pods/

# Bowser-specific items
# You can safely replace everything above this comment with whatever is
# in the default .gitignore generated by React-Native CLI

# VS Code
.vscode
4 changes: 2 additions & 2 deletions boilerplate/app/components/icon/icons/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const icons = {
back: require("./arrow-left.png"),
bullet: require("./bullet.png"),
back: require("./arrow-left@2x.png"),
bullet: require("./bullet@2x.png"),
}

export type IconTypes = keyof typeof icons
2 changes: 1 addition & 1 deletion boilerplate/app/components/wallpaper/wallpaper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Image } from "react-native"
import { presets } from "./wallpaper.presets"
import { WallpaperProps } from "./wallpaper.props"

const defaultImage = require("./bg.png")
const defaultImage = require("./bg@2x.png")

/**
* For your text displaying needs.
Expand Down
8 changes: 2 additions & 6 deletions boilerplate/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,28 @@
"validate.js": "0.13.1"
},
"devDependencies": {
"@babel/core": "^7.5.5",
"@babel/runtime": "^7.5.5",
"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
"@storybook/addon-storyshots": "5.1.11",
"@storybook/react-native": "5.1.11",
"babel-core": "7.0.0-bridge.0",
<%# Work around https://github.com/storybookjs/storybook/issues/5817
which results in the "can yarn install and pass tests" test failing
with "Cannot find module 'emotion-theming' from 'index.js'".
If you upgrade packages, try removing these two: -%>
"@emotion/core": "^10.0.15",
"emotion-theming": "^10.0.14",
"@types/jest": "24.0.16",
"@types/jest": "24.0.18",
"@types/ramda": "0.26.18",
"@types/react": "16.8.24",
"@types/react-native": "0.60.5",
"@types/react-native": "0.60.19",
"@types/react-navigation": "3.0.7",
"@types/react-test-renderer": "16.8.3",
"@typescript-eslint/eslint-plugin": "^1.1.0",
"@typescript-eslint/parser": "^1.1.0",
<% if (props.includeDetox) { -%>
"detox": "^14.0.1",
<% } -%>
"eslint": "^6.1.0",
"eslint-config-prettier": "^6.0.0",
"eslint-config-standard": "^13.0.1",
"eslint-plugin-import": "^2.15.0",
Expand Down
Loading

0 comments on commit 3f7894c

Please sign in to comment.