Skip to content

Commit

Permalink
Merge branch 'EvanBacon/master' into release/0.0.22
Browse files Browse the repository at this point in the history
Merges expo/web support from #58
  • Loading branch information
fbartho committed Jun 10, 2020
2 parents 4a60c68 + c909f64 commit dd13b3b
Show file tree
Hide file tree
Showing 5 changed files with 7,743 additions and 12 deletions.
3 changes: 1 addition & 2 deletions Example/index.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
'use strict';

import React from 'react';
import ReactNative from 'react-native';
const { AppRegistry, StyleSheet, View } = ReactNative;
import { AppRegistry, StyleSheet, View } from 'react-native';

import ParsedText from 'react-native-parsed-text';

Expand Down
9 changes: 7 additions & 2 deletions Example/index.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@
'use strict';

import React from 'react';
import ReactNative from 'react-native';
const { AppRegistry, StyleSheet, View, LinkingIOS, AlertIOS } = ReactNative;
import {
AppRegistry,
StyleSheet,
View,
LinkingIOS,
AlertIOS,
} from 'react-native';

import ParsedText from 'react-native-parsed-text';

Expand Down
13 changes: 7 additions & 6 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module.exports = {
retainLines: true,
compact: true,
comments: false,
presets: ['module:metro-react-native-babel-preset'],
sourceMaps: false,
module.exports = function (api) {
if (!!api) {
api.cache(true);
}
return {
presets: ['babel-preset-expo'],
};
};
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@
"@babel/core": "7.10.x",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "26.0.x",
"babel-preset-expo": "8.2.x",
"eslint": "7.2.x",
"jest": "26.0.x",
"metro-react-native-babel-preset": "0.57.x || 0.58.x || 0.59.x",
"prettier": "2.0.x",
"react": "16.13.x",
"react-native": "0.62.x",
"react-test-renderer": "16.13.x",
"react": "16.13.x"
"react-test-renderer": "16.13.x"
},
"author": "jrichardlai",
"license": "MIT",
Expand Down
Loading

0 comments on commit dd13b3b

Please sign in to comment.