Skip to content

Commit abbfe8f

Browse files
committed
Merge remote-tracking branch 'necolas/master' into kidroca/feat/image-source-headers
# Conflicts: # packages/react-native-web/src/exports/Image/index.js
2 parents e5a4597 + fa47f80 commit abbfe8f

File tree

24 files changed

+180
-111
lines changed

24 files changed

+180
-111
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Thank you for contributing!
114114
To commit, publish, and push a final version:
115115

116116
```
117-
npm run release -- <version> --opt=<opt-code>
117+
npm run release -- <version> --otp=<otp-code>
118118
```
119119

120120
Release candidates or versions that you'd like to publish to npm, but do not want to produce a commit and push it to GitHub:

package-lock.json

Lines changed: 70 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/babel-plugin-react-native-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"registry": "https://registry.npmjs.org/"
44
},
55
"name": "babel-plugin-react-native-web",
6-
"version": "0.18.7",
6+
"version": "0.18.10",
77
"description": "Babel plugin for React Native for Web",
88
"main": "index.js",
99
"devDependencies": {

packages/babel-plugin-react-native-web/src/__tests__/__snapshots__/index-test.js.snap

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ export { default as unstable_createElement } from 'react-native-web/dist/exports
3030
3131
`;
3232

33-
exports[`Rewrite react-native to react-native-web import from "native-native": import from "native-native" 1`] = `
33+
exports[`Rewrite react-native to react-native-web import from "react-native": import from "react-native" 1`] = `
3434
3535
import ReactNative from 'react-native';
3636
import { View } from 'react-native';
3737
import { Invalid, View as MyView } from 'react-native';
38+
import { useLocaleContext } from 'react-native';
3839
import * as ReactNativeModules from 'react-native';
3940
4041
↓ ↓ ↓ ↓ ↓ ↓
@@ -43,12 +44,13 @@ import ReactNative from 'react-native-web/dist/index';
4344
import View from 'react-native-web/dist/exports/View';
4445
import { Invalid } from 'react-native-web/dist/index';
4546
import MyView from 'react-native-web/dist/exports/View';
47+
import useLocaleContext from 'react-native-web/dist/exports/useLocaleContext';
4648
import * as ReactNativeModules from 'react-native-web/dist/index';
4749
4850
4951
`;
5052

51-
exports[`Rewrite react-native to react-native-web import from "native-native": import from "native-native" 2`] = `
53+
exports[`Rewrite react-native to react-native-web import from "react-native": import from "react-native" 2`] = `
5254
5355
import ReactNative from 'react-native';
5456
import { View } from 'react-native';

packages/babel-plugin-react-native-web/src/__tests__/index-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ const pluginTester = require('babel-plugin-tester').default;
44
const tests = [
55
// import react-native
66
{
7-
title: 'import from "native-native"',
7+
title: 'import from "react-native"',
88
code: `import ReactNative from 'react-native';
99
import { View } from 'react-native';
1010
import { Invalid, View as MyView } from 'react-native';
11+
import { useLocaleContext } from 'react-native';
1112
import * as ReactNativeModules from 'react-native';`,
1213
snapshot: true
1314
},
1415
{
15-
title: 'import from "native-native"',
16+
title: 'import from "react-native"',
1617
code: `import ReactNative from 'react-native';
1718
import { View } from 'react-native';
1819
import { Invalid, View as MyView } from 'react-native';
@@ -39,6 +40,7 @@ export { StyleSheet, Text, unstable_createElement } from 'react-native';`,
3940
export { StyleSheet, Text, unstable_createElement } from 'react-native-web';`,
4041
snapshot: true
4142
},
43+
// require react-native
4244
{
4345
title: 'require "react-native"',
4446
code: `const ReactNative = require('react-native');

packages/benchmarks/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"prop-types": "^15.6.0",
1414
"react": ">=17.0.2",
1515
"react-dom": ">=17.0.2",
16-
"react-native-web": "0.18.6"
16+
"react-native-web": "0.18.8"
1717
},
1818
"devDependencies": {
1919
"babel-loader": "^8.2.5",
20-
"babel-plugin-react-native-web": "0.18.6",
20+
"babel-plugin-react-native-web": "0.18.8",
2121
"css-loader": "^6.7.1",
2222
"style-loader": "^3.3.1",
2323
"url-loader": "^4.1.1",

packages/react-native-web-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "react-native-web-docs",
4-
"version": "0.18.7",
4+
"version": "0.18.10",
55
"description": "Documentation website for React Native for Web",
66
"scripts": {
77
"dev": "eleventy --serve",

packages/react-native-web-examples/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"private": true,
33
"name": "react-native-web-examples",
4-
"version": "0.18.7",
4+
"version": "0.18.10",
55
"scripts": {
66
"build": "next build",
77
"dev": "next",
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"babel-plugin-react-native-web": "0.18.7",
11+
"babel-plugin-react-native-web": "0.18.10",
1212
"next": "^12.2.0",
1313
"react": "^17.0.2",
1414
"react-dom": "^17.0.2",
15-
"react-native-web": "0.18.7"
15+
"react-native-web": "0.18.10"
1616
},
1717
"devDependencies": {
1818
"@babel/core": "^7.18.6",

packages/react-native-web-examples/pages/checkbox/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ export default function CheckboxPage() {
2424
<CheckBox disabled style={styles.item} value={false} />
2525
<Divider />
2626
<CheckBox disabled style={styles.item} value={true} />
27+
<Divider />
28+
<CheckBox accessibilityReadOnly style={styles.item} value={true} />
2729
</View>
2830
<View style={styles.row}>
2931
<CheckBox value={false} />

packages/react-native-web-examples/pages/pressable/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ export default function PressablePage() {
3434
delayPressIn={delay}
3535
delayPressOut={delay}
3636
disabled={disabled}
37+
onBlur={handleEvent('onBlur')}
38+
onFocus={handleEvent('onFocus')}
3739
onHoverIn={handleEvent('onHoverIn')}
3840
onHoverOut={handleEvent('onHoverOut')}
3941
onKeyDown={(e) => {

0 commit comments

Comments
 (0)