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

Commit

Permalink
Upgraded React Native to version 0.57.5, fixed new errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jamonholmgren committed Nov 14, 2018
1 parent 3f4f9c4 commit f01a5c3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
17 changes: 13 additions & 4 deletions boilerplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const isAndroidInstalled = function (context) {
*
* @param {any} context - The gluegun context.
*/
async function install (context) {
async function install(context) {
const {
filesystem,
parameters,
Expand Down Expand Up @@ -112,7 +112,7 @@ async function install (context) {
/**
* Merge the package.json from our template into the one provided from react-native init.
*/
async function mergePackageJsons () {
async function mergePackageJsons() {
// transform our package.json in case we need to replace variables
const rawJson = await template.generate({
directory: `${ignite.ignitePluginPath()}/boilerplate`,
Expand Down Expand Up @@ -167,7 +167,7 @@ async function install (context) {
spinner.stop()

// patch splash screen
async function patchSplashScreen () {
async function patchSplashScreen() {
spinner.text = `▸ setting up splash screen`
spinner.start()
spinner.text = `▸ setting up splash screen: configuring`
Expand Down Expand Up @@ -211,11 +211,20 @@ async function install (context) {

// TODO: Make husky hooks optional
const huskyCmd = '' // `&& node node_modules/husky/bin/install .`
system.run(`git init . && git add . && git commit -m "Initial commit." ${huskyCmd}`)
await system.run(`git init . && git add . && git commit -m "Initial commit." ${huskyCmd}`)

spinner.succeed(`configured git`)
}

// re-run yarn
const installDeps = ignite.useYarn ? 'yarn' : 'npm install'
await system.run(installDeps)
spinner.succeed(`Installed dependencies`)

// re-run react-native link
await system.run('react-native link')
spinner.succeed(`Linked dependencies`)

const perfDuration = parseInt(((new Date()).getTime() - perfStart) / 10) / 100
spinner.succeed(`ignited ${yellow(name)} in ${perfDuration}s`)

Expand Down
2 changes: 1 addition & 1 deletion boilerplate/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@babel/runtime": "^7.0.0",
"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
"@storybook/addon-storyshots": "github:infinitered/addon-storyshots",
"@storybook/addon-storyshots": "^4.0.6",
"@storybook/react-native": "3.4.3",
"@types/jest": "23.3.2",
"@types/ramda": "0.25.28",
Expand Down
4 changes: 2 additions & 2 deletions lib/react-native-version.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { pathOr, is } = require('ramda')

// the default React Native version for this boilerplate
const REACT_NATIVE_VERSION = '0.57.3'
const REACT_NATIVE_VERSION = '0.57.5'

// where the version lives under gluegun
const pathToVersion = ['parameters', 'options', 'react-native-version']
Expand All @@ -15,7 +15,7 @@ const getVersionFromContext = pathOr(REACT_NATIVE_VERSION, pathToVersion)
* Attempts to read it from the command line, and if not there, falls back
* to the version we want for this boilerplate. For example:
*
* $ ignite new Custom --react-native-version 0.55.0
* $ ignite new Custom --react-native-version 0.58.0
*
* @param {*} context - The gluegun context.
*/
Expand Down

0 comments on commit f01a5c3

Please sign in to comment.