Skip to content

Commit 8f45a80

Browse files
t73liut73liu
committed
# Conflicts: # react-native-scripts/package.json # react-native-scripts/src/scripts/init.js # react-native-scripts/template-with-web/app.json # react-native-scripts/template/app.json
2 parents 461b880 + 05760c7 commit 8f45a80

File tree

9 files changed

+28
-69
lines changed

9 files changed

+28
-69
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.14.0 (April 27, 2018)
2+
3+
Update Expo SDK 27.
4+
15
## 1.12.1 (March 29, 2018)
26

37
Update XDL to version 48.1.2.

‎VERSIONS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ Each version of these dependencies is only compatible with a narrow version rang
2020
| 0.51.x | 16.0.0 | 24.x.x | `"24.0.0"` |
2121
| 0.52.x | 16.2.0 | 25.x.x | `"25.0.0"` |
2222
| 0.54.x | 16.3.0-alpha.1 | 26.x.x | `"26.0.0"` |
23+
| 0.55.x | 16.3.1 | 27.x.x | `"27.0.0"` |

‎react-native-scripts/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-scripts-ts",
3-
"version": "1.13.0",
3+
"version": "1.14.0",
44
"description": "Configuration and scripts for Create React Native App.",
55
"license": "BSD-3-Clause",
66
"keywords": [
@@ -40,7 +40,7 @@
4040
"progress": "^2.0.0",
4141
"qrcode-terminal": "^0.11.0",
4242
"rimraf": "^2.6.1",
43-
"xdl": "48.1.3"
43+
"xdl": "48.1.4"
4444
},
4545
"devDependencies": {
4646
"@taskr/babel": "^1.0.6",

‎react-native-scripts/src/scripts/init.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { hasYarn } from '../util/pm';
1212

1313
// UPDATE DEPENDENCY VERSIONS HERE
1414
const DEFAULT_DEPENDENCIES = {
15-
expo: '^26.0.0',
16-
react: '16.3.0-alpha.1',
17-
'react-native': '0.54.0',
15+
expo: '^27.0.1',
16+
react: '16.3.1',
17+
'react-native': '~0.55.2',
1818
};
1919

2020
const WEB_DEFAULT_DEPENDENCIES = {
@@ -27,16 +27,16 @@ const WEB_DEFAULT_DEPENDENCIES = {
2727

2828
// TODO figure out how this interacts with ejection
2929
const DEFAULT_DEV_DEPENDENCIES = {
30-
'@types/jest': '^22.2.2',
31-
'@types/react': '^16.1.0',
32-
'@types/react-native': '^0.52.21',
33-
'@types/react-test-renderer': '^16.0.0',
34-
'ts-jest': '^22.4.2',
35-
'jest-expo': '26.0.0',
30+
'@types/jest': '^22.2.3',
31+
'@types/react': '^16.3.14',
32+
'@types/react-native': '^0.55.14',
33+
'@types/react-test-renderer': '^16.0.1',
34+
'ts-jest': '^22.4.6',
35+
'jest-expo': '~27.0.0',
3636
'react-native-typescript-transformer': '^1.2.3',
37-
'react-test-renderer': '16.3.0-alpha.1',
38-
'tslib': '^1.9.0',
39-
'typescript': '^2.8.1',
37+
'react-test-renderer': '16.3.1',
38+
'tslib': '^1.9.1',
39+
'typescript': '^2.8.3',
4040
};
4141

4242
const WEB_DEFAULT_DEV_DEPENDENCIES = {

‎react-native-scripts/src/util/expo.js‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,48 +62,21 @@ publish it there. See this StackOverflow question for more information:
6262
// update app.json file with new contents
6363
await fse.writeFile(appJsonPath, JSON.stringify(appJson, null, 2));
6464

65-
await Detach.detachAsync(process.cwd());
66-
// yesno lib doesn't properly shut down. without this the command won't exit
67-
process.stdin.pause();
68-
6965
const pkgJson = JSON.parse((await fse.readFile(path.resolve('package.json'))).toString());
70-
7166
pkgJson.main = 'node_modules/expo/AppEntry.js';
72-
7367
delete pkgJson.devDependencies['react-native-scripts'];
7468
delete pkgJson.scripts.start;
7569
delete pkgJson.scripts.build;
7670
delete pkgJson.scripts.eject;
7771
delete pkgJson.scripts.android;
7872
delete pkgJson.scripts.ios;
79-
80-
const versions = await Versions.versionsAsync();
81-
const sdkTag = versions.sdkVersions[appJson.expo.sdkVersion].expoReactNativeTag;
82-
8373
await fse.writeFile('package.json', JSON.stringify(pkgJson, null, 2));
8474

85-
console.log('Installing the Expo fork of react-native...');
86-
const reactNativeVersion = `https://github.com/expo/react-native/archive/${sdkTag}.tar.gz`;
87-
const {
88-
code,
89-
} = await install(process.cwd(), 'react-native', reactNativeVersion, {
90-
silent: true,
91-
});
92-
93-
if (code === 0) {
94-
console.log(`${chalk.green('Successfully set up ExpoKit!')}`);
95-
} else {
96-
console.warn(
97-
`
98-
${chalk.yellow('Unable to install the Expo fork of react-native.')}
99-
${chalk.yellow(`Please install react-native@${reactNativeVersion} before continuing.`)}
100-
`
101-
);
102-
}
75+
await Detach.detachAsync(process.cwd());
10376

10477
console.log(
10578
`
106-
You'll need to use Expo's XDE to run this project:
79+
You'll need to use Expo's XDE or exp to run this project:
10780
${chalk.cyan('https://docs.expo.io/versions/latest/introduction/installation.html')}
10881
10982
For further instructions, please read ExpoKit's build documentation:

‎react-native-scripts/template-with-web/app.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"expo": {
3-
"sdkVersion": "26.0.0",
3+
"sdkVersion": "27.0.0",
44
"packagerOpts": {
55
"sourceExts": ["ts", "tsx"],
66
"transformer": "node_modules/react-native-typescript-transformer/index.js"

‎react-native-scripts/template/README.md‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Below you'll find information about performing common tasks. The most recent ver
1414
* [Writing and Running Tests](#writing-and-running-tests)
1515
* [Environment Variables](#environment-variables)
1616
* [Configuring Packager IP Address](#configuring-packager-ip-address)
17-
* [Adding Flow](#adding-flow)
1817
* [Customizing App Display Name and Icon](#customizing-app-display-name-and-icon)
1918
* [Sharing and Deployment](#sharing-and-deployment)
2019
* [Publishing to Expo's React Native Community](#publishing-to-expos-react-native-community)
@@ -124,24 +123,6 @@ npm start
124123

125124
The above example would cause the development server to listen on `exp://my-custom-ip-address-or-hostname:19000`.
126125

127-
## Adding Flow
128-
129-
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.
130-
131-
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.
132-
133-
To add a local dependency to the correct Flow version to a Create React Native App project, follow these steps:
134-
135-
1. Find the Flow `[version]` at the bottom of the included [.flowconfig](.flowconfig)
136-
2. Run `npm install --save-dev [email protected]` (or `yarn add --dev [email protected]`), where `x.y.z` is the .flowconfig version number.
137-
3. Add `"flow": "flow"` to the `scripts` section of your `package.json`.
138-
4. Add `// @flow` to any files you want to type check (for example, to `App.js`).
139-
140-
Now you can run `npm run flow` (or `yarn flow`) to check the files for type errors.
141-
You can optionally use a [plugin for your IDE or editor](https://flow.org/en/docs/editors/) for a better integrated experience.
142-
143-
To learn more about Flow, check out [its documentation](https://flow.org/).
144-
145126
## Sharing and Deployment
146127

147128
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.

‎react-native-scripts/template/app.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"expo": {
3-
"sdkVersion": "26.0.0",
3+
"sdkVersion": "27.0.0",
44
"packagerOpts": {
55
"sourceExts": ["ts", "tsx"],
66
"transformer": "node_modules/react-native-typescript-transformer/index.js"

‎react-native-scripts/yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4029,8 +4029,8 @@ very-fast-args@^1.1.0:
40294029
resolved "https://registry.yarnpkg.com/very-fast-args/-/very-fast-args-1.1.0.tgz#e16d1d1faf8a6e596a246421fd90a77963d0b396"
40304030

40314031
whatwg-fetch@>=0.10.0:
4032-
version "2.0.3"
4033-
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
4032+
version "2.0.4"
4033+
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
40344034

40354035
which@^1.2.9:
40364036
version "1.3.0"
@@ -4056,9 +4056,9 @@ wrappy@1:
40564056
version "1.0.2"
40574057
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
40584058

4059-
[email protected].3:
4060-
version "48.1.3"
4061-
resolved "https://registry.yarnpkg.com/xdl/-/xdl-48.1.3.tgz#fbcdade1e381be723566a22f2ab7977ce182d26f"
4059+
[email protected].4:
4060+
version "48.1.4"
4061+
resolved "https://registry.yarnpkg.com/xdl/-/xdl-48.1.4.tgz#95e75ab3537034508e5d0e1cb476c8c661df43b4"
40624062
dependencies:
40634063
"@expo/bunyan" "^1.8.10"
40644064
"@expo/json-file" "^5.3.0"

0 commit comments

Comments
 (0)