Skip to content

Sync fork with upstream #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
03ddd95
[fix] layout measurement API consistency with React Native
LucioChavezFuentes Feb 27, 2023
985c79f
[fix] Nested scroll in inverted VirtualizedList
roryabraham Nov 22, 2022
1c5119b
[fix] Reintroduce BackHandler with console.error
necolas Apr 5, 2023
5ace60e
[fix] VirtualizedList sync from react-native
LucioChavezFuentes Mar 28, 2023
4a61c16
0.19.2
necolas Apr 5, 2023
6795738
[fix] Patch more internal sources of deprecation warnings
necolas Apr 11, 2023
338cce1
[fix] SSR of Animated doesn't call useLayoutEffect
necolas Apr 11, 2023
3e74ed0
Update interactive examples
necolas Apr 11, 2023
7638301
[fix] Defaults and fallback logic for web props
necolas Apr 12, 2023
526eac1
0.19.3
necolas Apr 12, 2023
8472324
[fix] Linking listener.remove() API
necolas Apr 12, 2023
e160546
0.19.4
necolas Apr 12, 2023
39b94b1
Remove internal createEventHandle module
necolas Apr 12, 2023
3af715a
Bump engine.io from 6.4.0 to 6.4.2
dependabot[bot] May 4, 2023
f06c8b5
Bump yaml from 2.2.1 to 2.2.2
dependabot[bot] Apr 25, 2023
3acbbd8
Bump nunjucks from 3.2.3 to 3.2.4
dependabot[bot] Apr 20, 2023
c43b629
Bump socket.io-parser from 4.2.2 to 4.2.3
dependabot[bot] May 24, 2023
2a901e5
[fix] Image: style resolving
necolas May 31, 2023
9b69c73
[fix] Make children pressable when parent is disabled
jennifer-dickinson Jun 13, 2023
6ab9b61
[fix] Dimensions measurements with window zoom
alitoshmatov May 13, 2023
14204b0
Use correct "NativeBase" name in website docs
ankit-tailor May 4, 2023
6dbef6e
Fix website undesired vertical scrollbar on Windows
tarunrajput May 30, 2023
c350d82
0.19.5
necolas Jun 16, 2023
1c376db
[fix] Add support for caretHidden prop in TextInput
aswin-s Jun 22, 2023
80e83fa
[fix] Update normalize-color
makkarMeenu Jun 26, 2023
d200276
[fix] Missing @react-native/normalize-color updates
necolas Jun 27, 2023
869c416
[fix] Animated fix transforms on null values
necolas Jun 27, 2023
b10c663
0.19.6
necolas Jun 28, 2023
b04ca26
Force install react-integration workflow dependencies
necolas Jul 10, 2023
15f7899
Bump tough-cookie from 4.1.2 to 4.1.3
dependabot[bot] Jul 10, 2023
9d7dca1
Bump word-wrap from 1.2.3 to 1.2.4
dependabot[bot] Jul 19, 2023
3babcc4
[fix] Remove StyleSheet.compose(a, b) in FlatList
berkcoker Jul 16, 2023
a8a0c17
[fix] Pressable button click regression
necolas Jul 19, 2023
213b616
[fix] Switch uses aria-label on native control
tarunrajput Jul 17, 2023
617b438
[fix] Only stringify numeric aspectRatio
itsramiel Jul 18, 2023
ef95fc0
0.19.7
necolas Jul 20, 2023
713a52d
merge upstream to master
shubham1206agra Aug 6, 2023
414987e
Merge branch 'master' of https://github.com/necolas/react-native-web …
shubham1206agra Aug 6, 2023
01fb564
removed extra space
shubham1206agra Aug 6, 2023
f087102
fix typo
shubham1206agra Aug 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/react-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
node-version: 16
- run: npm install
# Update react-native-web to use react@next
- run: npm install react@next react-dom@next -w react-native-web
- run: npm install --force react@next react-dom@next -w react-native-web
# Run the unit tests
- run: npm run unit
5 changes: 4 additions & 1 deletion configs/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
<PROJECT_ROOT>/packages/.*/dist/.*
<PROJECT_ROOT>/packages/react-native-web-docs/.*
<PROJECT_ROOT>/packages/react-native-web-examples/.*
.*/node_modules/.*/.*.json

[include]

[declarations]
.*/node_modules/.*

[libs]

[options]
indexed_access=true
munge_underscores=true
112 changes: 82 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/babel-plugin-react-native-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"registry": "https://registry.npmjs.org/"
},
"name": "babel-plugin-react-native-web",
"version": "0.19.1",
"version": "0.19.7",
"description": "Babel plugin for React Native for Web",
"main": "index.js",
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-react-native-web/src/moduleMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = {
AppRegistry: true,
AppState: true,
Appearance: true,
BackHandler: true,
Button: true,
CheckBox: true,
Clipboard: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-web-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "react-native-web-docs",
"version": "0.19.1",
"version": "0.19.7",
"description": "Documentation website for React Native for Web",
"scripts": {
"dev": "eleventy --serve",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<nav id="navigation-scroller" class="view overflow-x-hidden overflow-y-auto h-full p-6 pt-12">
<h1 class="m-0 mb-4" style="font-size:1rem;">
<a class="view no-underline group font-semibold" href="{{ '/' | url }}" style="color:var(--docs-theme-color)">
<span class="view flex-row items-center overflow-x-hidden mb-1 text-xl">
<span class="view flex-row items-center overflow-hidden mb-1 text-xl">
{{ site.name }}
</span>
<span>{{ site.packageName }}@{{ site.packageVersion }}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h2>Try it out!</h2>
></iframe>

<div class="callout">
<p><strong>Did you know?</strong> React Native for Web powers web support in multi-platform React tools like <a href="https://expo.dev">Expo</a>, <a href="https://reactnativeelements.com/">React Native Elements</a>, <a href="https://callstack.github.io/react-native-paper/using-on-the-web.html">React Native Paper</a>, and <a href="https://docs.nativebase.io/getting-started">React Native Base</a>.
<p><strong>Did you know?</strong> React Native for Web powers web support in multi-platform React tools like <a href="https://expo.dev">Expo</a>, <a href="https://reactnativeelements.com/">React Native Elements</a>, <a href="https://callstack.github.io/react-native-paper/using-on-the-web.html">React Native Paper</a>, and <a href="https://docs.nativebase.io/getting-started">NativeBase</a>.
</div>

<div style="height:2rem"><!-- spacer --></div>
Expand Down
7 changes: 5 additions & 2 deletions packages/react-native-web-examples/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ const pages = fs
.map((dirent) => dirent.name);

module.exports = {
outDir: 'dist',
env: { pages }
env: { pages },
webpack: (config, options) => {
config.resolve.alias['react-native'] = 'react-native-web';
return config;
}
};
6 changes: 3 additions & 3 deletions packages/react-native-web-examples/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"private": true,
"name": "react-native-web-examples",
"version": "0.19.1",
"version": "0.19.7",
"scripts": {
"build": "next build",
"dev": "next",
"start": "next start"
},
"dependencies": {
"babel-plugin-react-native-web": "0.19.1",
"babel-plugin-react-native-web": "0.19.7",
"next": "^12.2.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-native-web": "0.19.1"
"react-native-web": "0.19.7"
},
"devDependencies": {
"@babel/core": "^7.18.6",
Expand Down
Loading