Skip to content

Commit

Permalink
Merge branch 'original_master'
Browse files Browse the repository at this point in the history
* original_master: (94 commits)
  chore(release): 11.3.1 [skip ci]
  fix(windows): Check UAP contract version before calling FrameworkElement.IsLoaded (react-native-webview#1858)
  fix(android:) enable DRM protected content (react-native-webview#1862)
  chore(release): 11.3.0 [skip ci]
  feat(ios): Add support for `limitsNavigationsToAppBoundDomains` (react-native-webview#1662)
  chore(release): 11.2.6 [skip ci]
  fix(ios): Add missing nullability specifiers; fix if block warning (react-native-webview#1898)
  chore(release): 11.2.5 [skip ci]
  chore(docs): Clarify that navigationType and isTopFrame is iOS only (react-native-webview#1880)
  chore(docs): fixed "postMessage" url in Reference.md (react-native-webview#1913)
  fix(iOS): webview retain cycle (react-native-webview#1916)
  chore(release): 11.2.4 [skip ci]
  fix(iOS): Send cookies with resource requests (react-native-webview#1803)
  chore(release): 11.2.3 [skip ci]
  fix(android): Fix full=screen video when in modals (react-native-webview#1748 by @cristianoccazinsp)
  chore(release): 11.2.2 [skip ci]
  fix(windows): Resolve Deploy Issue (react-native-webview#1850)
  chore(ci): Upgrade react-native-windows to 0.62.17 (react-native-webview#1768)
  chore(release): 11.2.1 [skip ci]
  fix(ios): error on iOS < 13(react-native-webview#1843)
  ...
  • Loading branch information
uspython committed Mar 17, 2021
2 parents ab9d584 + 991f6b7 commit a529e9a
Show file tree
Hide file tree
Showing 83 changed files with 18,051 additions and 16,667 deletions.
2 changes: 1 addition & 1 deletion .all-contributorsrc
@@ -1,6 +1,6 @@
{
"projectName": "react-native-webview",
"projectOwner": "react-native-community",
"projectOwner": "react-native-webview",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
Expand Down
12 changes: 12 additions & 0 deletions .gitattributes
@@ -0,0 +1,12 @@
* text=auto

*.bat text eol=crlf
*.def text eol=crlf
*.filters text eol=crlf
*.idl text eol=crlf
*.props text eol=crlf
*.ps1 text eol=crlf
*.sln text eol=crlf
*.vcxproj text eol=crlf
*.xaml text eol=crlf

3 changes: 2 additions & 1 deletion .github/workflows/stale.yml
Expand Up @@ -7,10 +7,11 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v1
- uses: actions/stale@v3.0.14
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Hello 👋, this issue has been opened for more than 2 months with no activity on it. If the issue is still here, please keep in mind that we need community support and help to fix it! Just comment something like _still searching for solutions_ and if you found one, please open a pull request! You have 7 days until this gets closed automatically'
stale-pr-message: 'Hello 👋, this PR has been opened for more than 2 months with no activity on it. If you think this is a mistake please comment and ping a maintainer to get this merged ASAP! Thanks for contributing! You have 7 days until this gets closed automatically'
exempt-issue-label: 'Keep opened'
exempt-pr-label: 'Keep opened'
remove-stale-when-updated: true
22 changes: 7 additions & 15 deletions .github/workflows/windows-ci.yml
Expand Up @@ -15,17 +15,8 @@ jobs:
with:
node-version: '12.9.1'

- name: Install Visual Studio components
shell: powershell
run: .\.github\workflows\scripts\install-vs-features.ps1 Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.0.0
with:
vs-version: 16.5

- name: Setup NuGet
uses: NuGet/setup-nuget@v1.0.2
uses: microsoft/setup-msbuild@v1.0.2

- name: Check node modules cache
uses: actions/cache@v1
Expand All @@ -45,13 +36,14 @@ jobs:
run: |
yarn build
yarn tsc
- name: NuGet restore
run: nuget restore example\windows\WebViewWindows.sln
- name: Build x64 release
run: msbuild example\windows\WebViewWindows.sln /p:Configuration=Release /p:Platform=x64 -m
shell: powershell
run: npx react-native run-windows --root example --arch x64 --release --no-packager --no-deploy --logging

# Workaround for a bug in package searching during deploy.
# The deploy script only searches windows/{*/bin/x64/Release,Release/*}, but the build step above placed the pakcages at windows/x64/Release.
# Copy the packages to Windows/Release before deploying.
- name: Deploy
shell: powershell
run: |
Expand All @@ -64,4 +56,4 @@ jobs:
run: Start-Process PowerShell -ArgumentList "yarn appium"

- name: Run tests
run: yarn test:windows
run: yarn test:windows
28 changes: 14 additions & 14 deletions README.md
@@ -1,9 +1,9 @@
# React Native WebView - a Modern, Cross-Platform WebView for React Native

[![star this repo](http://githubbadges.com/star.svg?user=react-native-community&repo=react-native-webview&style=flat)](https://github.com/react-native-community/react-native-webview)
[![star this repo](http://githubbadges.com/star.svg?user=react-native-webview&repo=react-native-webview&style=flat)](https://github.com/react-native-webview/react-native-webview)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
[![All Contributors](https://img.shields.io/badge/all_contributors-16-orange.svg?style=flat-square)](#contributors)
[![Known Vulnerabilities](https://snyk.io/test/github/react-native-community/react-native-webview/badge.svg?style=flat-square)](https://snyk.io/test/github/react-native-community/react-native-webview)
[![Known Vulnerabilities](https://snyk.io/test/github/react-native-webview/react-native-webview/badge.svg?style=flat-square)](https://snyk.io/test/github/react-native-webview/react-native-webview)
[![NPM Version](https://img.shields.io/npm/v/react-native-webview.svg?style=flat-square)](https://www.npmjs.com/package/react-native-webview)
[![Lean Core Extracted](https://img.shields.io/badge/Lean%20Core-Extracted-brightgreen.svg?style=flat-square)][lean-core-issue]

Expand Down Expand Up @@ -37,20 +37,20 @@ This project follows [semantic versioning](https://semver.org/). We do not hesit

Current Version: ![version](https://img.shields.io/npm/v/react-native-webview.svg)

- [8.0.0](https://github.com/react-native-community/react-native-webview/releases/tag/v8.0.0) - onNavigationStateChange now triggers with hash url changes

- [7.0.1](https://github.com/react-native-community/react-native-webview/releases/tag/v7.0.1) - Removed UIWebView

- [6.0.**2**](https://github.com/react-native-community/react-native-webview/releases/tag/v6.0.2) - Update to AndroidX. Make sure to enable it in your project's `android/gradle.properties`. See [Getting Started Guide](docs/Getting-Started.md).

- [5.0.**1**](https://github.com/react-native-community/react-native-webview/releases/tag/v5.0.0) - Refactored the old postMessage implementation for communication from webview to native.
- [4.0.0](https://github.com/react-native-community/react-native-webview/releases/tag/v4.0.0) - Added cache (enabled by default).
- [3.0.0](https://github.com/react-native-community/react-native-webview/releases/tag/v3.0.0) - WKWebview: Add shared process pool so cookies and localStorage are shared across webviews in iOS (enabled by default).
- [2.0.0](https://github.com/react-native-community/react-native-webview/releases/tag/v2.0.0) - First release this is a replica of the core webview component
- [11.0.0](https://github.com/react-native-webview/react-native-webview/releases/tag/v11.0.0) - Android setSupportMultipleWindows.
- [10.0.0](https://github.com/react-native-webview/react-native-webview/releases/tag/v10.0.0) - Android Gradle plugin is only required when opening the project stand-alone
- [9.0.0](https://github.com/react-native-webview/react-native-webview/releases/tag/v9.0.0) - props updates to injectedJavaScript are no longer immutable.
- [8.0.0](https://github.com/react-native-webview/react-native-webview/releases/tag/v8.0.0) - onNavigationStateChange now triggers with hash url changes
- [7.0.1](https://github.com/react-native-webview/react-native-webview/releases/tag/v7.0.1) - Removed UIWebView
- [6.0.**2**](https://github.com/react-native-webview/react-native-webview/releases/tag/v6.0.2) - Update to AndroidX. Make sure to enable it in your project's `android/gradle.properties`. See [Getting Started Guide](docs/Getting-Started.md).
- [5.0.**1**](https://github.com/react-native-webview/react-native-webview/releases/tag/v5.0.0) - Refactored the old postMessage implementation for communication from webview to native.
- [4.0.0](https://github.com/react-native-webview/react-native-webview/releases/tag/v4.0.0) - Added cache (enabled by default).
- [3.0.0](https://github.com/react-native-webview/react-native-webview/releases/tag/v3.0.0) - WKWebview: Add shared process pool so cookies and localStorage are shared across webviews in iOS (enabled by default).
- [2.0.0](https://github.com/react-native-webview/react-native-webview/releases/tag/v2.0.0) - First release this is a replica of the core webview component

**Upcoming:**

- this.webView.postMessage() removal (never documented and less flexible than injectJavascript) -> [how to migrate](https://github.com/react-native-community/react-native-webview/issues/809)
- this.webView.postMessage() removal (never documented and less flexible than injectJavascript) -> [how to migrate](https://github.com/react-native-webview/react-native-webview/issues/809)
- Kotlin rewrite
- Maybe Swift rewrite

Expand Down Expand Up @@ -79,7 +79,7 @@ For more, read the [API Reference](./docs/Reference.md) and [Guide](./docs/Guide

## Contributing

See [Contributing.md](https://github.com/react-native-community/react-native-webview/blob/master/docs/Contributing.md)
See [Contributing.md](https://github.com/react-native-webview/react-native-webview/blob/master/docs/Contributing.md)

## Contributors

Expand Down

0 comments on commit a529e9a

Please sign in to comment.