Skip to content

Commit

Permalink
Merge branch 'master' into proj-davinci-dev
Browse files Browse the repository at this point in the history
* master: (182 commits)
  chore(release): 7.2.5 [skip ci]
  fix(types): Make onContentProcessDidTerminate optional (react-native-webview#890)
  chore(release): 7.2.4 [skip ci]
  fix(android): Revert scroll update from react-native-webview#281 (react-native-webview#889)
  chore(release): 7.2.3 [skip ci]
  fix(iOS): Xcode issues and warnings (no functionality changes) (react-native-webview#860)
  chore(release): 7.2.2 [skip ci]
  fix(android): redirect and renderLoading issues (react-native-webview#548)
  chore(release): 7.2.1 [skip ci]
  fix(android): Filter extra onLoadProgress & add url event (react-native-webview#643)
  chore(release): 7.2.0 [skip ci]
  feat(iOS): Add callback for webViewWebContentProcessDidTerminate (react-native-webview#774)
  chore(release): 7.1.1 [skip ci]
  fix(Android): hardware acceleration issue (react-native-webview#854)
  chore(release): 7.1.0 [skip ci]
  feat(iOS): Allow custom CA to be used on webview requests (react-native-webview#865)
  feat(new prop): onHttpError callback (react-native-webview#885)
  fix(iOS): Call dispatchViewManagerCommand with correct number of arguments (react-native-webview#886)
  fix(iOS): inconsistent backgroundColor (react-native-webview#868)
  chore(release): 7.0.7 [skip ci]
  ...

# Conflicts:
#	android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java
#	ios/RNCUIWebView.h
#	ios/RNCUIWebView.m
#	ios/RNCUIWebViewManager.m
#	ios/RNCWebView.h
#	ios/RNCWebView.m
#	ios/RNCWebViewManager.m
#	js/WebView.android.js
#	js/WebView.ios.js
#	js/WebViewTypes.js
#	typings/index.d.ts
  • Loading branch information
Ryan007008 committed Oct 12, 2019
2 parents 0b422c6 + 3b22e65 commit ceddc9d
Show file tree
Hide file tree
Showing 62 changed files with 8,593 additions and 4,434 deletions.
48 changes: 48 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,54 @@
"contributions": [
"doc"
]
},
{
"login": "CubeSugar",
"name": "Jian Wei",
"avatar_url": "https://avatars3.githubusercontent.com/u/3667305?v=4",
"profile": "https://github.com/CubeSugar",
"contributions": [
"code",
"doc"
]
},
{
"login": "svbutko",
"name": "Sergei Butko",
"avatar_url": "https://avatars2.githubusercontent.com/u/14828004?v=4",
"profile": "https://www.linkedin.com/in/svbutko/",
"contributions": [
"doc"
]
},
{
"login": "TMomemt",
"name": "TMomemt",
"avatar_url": "https://avatars3.githubusercontent.com/u/42024947?v=4",
"profile": "https://github.com/TMomemt",
"contributions": [
"code"
]
},
{
"login": "ericlewis",
"name": "Eric Lewis",
"avatar_url": "https://avatars0.githubusercontent.com/u/674503?v=4",
"profile": "http://www.try.com",
"contributions": [
"code",
"doc"
]
},
{
"login": "dvicory",
"name": "Daniel Vicory",
"avatar_url": "https://avatars2.githubusercontent.com/u/1542454?v=4",
"profile": "https://bzfx.net",
"contributions": [
"code",
"doc"
]
}
],
"contributorsPerLine": 7
Expand Down
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defaults: &defaults
working_directory: ~/code
docker:
- image: circleci/node:10.6.0-browsers
- image: circleci/node:12.9.1-browsers

version: 2
jobs:
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:

- run:
name: Run Tests
command: yarn ci:test
command: yarn ci

publish:
<<: *defaults
Expand Down
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lib/
babel.config.js
93 changes: 93 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
module.exports = {
// Airbnb is the base, prettier is here so that eslint doesn't conflict with prettier
extends: ['airbnb', 'prettier', 'prettier/react'],
parser: '@typescript-eslint/parser',
plugins: ['react', 'react-native', 'import', '@typescript-eslint'],
rules: {
'no-console': 'off',
// Lines will be broken before binary operators
'operator-linebreak': ['error', 'before'],
// Allow imports from dev and peer dependencies
'import/no-extraneous-dependencies': [
'error',
{ devDependencies: true, peerDependencies: true },
],
'react/jsx-filename-extension': ['error', { extensions: ['.tsx'] }],
// This rule doesn't play nice with Prettier
'react/jsx-one-expression-per-line': 'off',
// This rule doesn't play nice with Prettier
'react/jsx-wrap-multilines': 'off',
// Remove this rule because we only destructure props, but never state
'react/destructuring-assignment': 'off',
'react/prop-types': 'off',
'react/jsx-props-no-spreading': 'off',
'react/static-property-placement': 'off',
'react/state-in-constructor': 'off',
'@typescript-eslint/adjacent-overload-signatures': 'error',
'@typescript-eslint/array-type': [
'error',
{
default: 'array',
},
],
'@typescript-eslint/generic-type-naming': ['error', '^[a-zA-Z]+$'],
'@typescript-eslint/no-array-constructor': 'error',
'@typescript-eslint/no-empty-interface': 'error',
'@typescript-eslint/no-explicit-any': 'error',
'@typescript-eslint/no-extraneous-class': 'error',
'@typescript-eslint/no-inferrable-types': 'error',
'@typescript-eslint/no-misused-new': 'error',
'@typescript-eslint/no-namespace': 'error',
'@typescript-eslint/no-non-null-assertion': 'error',
'@typescript-eslint/consistent-type-assertions': [
'error',
{
assertionStyle: 'as',
},
],
'@typescript-eslint/no-parameter-properties': 'error',
'@typescript-eslint/no-this-alias': 'error',
'@typescript-eslint/triple-slash-reference': [
'error',
{ path: 'never', types: 'never', lib: 'never' },
],
'@typescript-eslint/no-type-alias': [
'error',
{
allowAliases: 'always',
allowCallbacks: 'always',
allowMappedTypes: 'always',
},
],
'@typescript-eslint/no-unused-vars': [
'error',
{ ignoreRestSiblings: true },
],
'@typescript-eslint/consistent-type-definitions': [
'error',
'interface',
],
'@typescript-eslint/prefer-namespace-keyword': 'error',
'@typescript-eslint/type-annotation-spacing': 'error',
},
settings: {
'import/resolver': {
node: {
extensions: [
'.js',
'.android.js',
'.ios.js',
'.jsx',
'.android.jsx',
'.ios.jsx',
'.tsx',
'.ts',
'.android.tsx',
'.android.ts',
'.ios.tsx',
'.ios.ts',
],
},
},
},
};
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @titozzz @jamonholmgren
42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: Bug report
about: Something is not working as expected
title: ''
labels: 'Type: bug report'
assignees: ''

---

<!---
Hello and thank you for taking the time to report a bug.
This is a community repository, meaning that it's everyone's responsibility to address bugs and send pull requests.
Maintainers will be here to help/guide you if you have questions.
Please search in the opened issues before submitting a new one.
Issues with no activity for a long time will be closed.
--->
**Bug description:**
<!---
A clear and concise description of what the bug is.
--->

**To Reproduce:**
<!---
Here you should put a link to a repository with a reproduction of the bug
Please also describe the steps required for the bug to happen
--->

**Expected behavior:**
<!---
A clear and concise description of what you expected to happen.
--->

**Screenshots/Videos:**
<!---
If applicable, add screenshots to help explain your problem.
--->

**Environment:**
- OS:
- OS version:
- react-native version:
- react-native-webview version:
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'Type: feature request'
assignees: ''

---

<!---
Hello and thank you for taking the time to report a bug.
This is a community repository, meaning that it's everyone's responsibility to address bugs and send pull requests.
Maintainers will be here to help/guide you if you have questions.
Please search in the opened issues before submitting a new one.
Issues with no activity for a long time will be closed.
--->
**Is your feature request related to a problem? If so, Please describe.**
<!---
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
--->

**Describe the solutions you came up with**
<!---
A clear and concise description of what you want to happen.
--->

**Additional context**
<!---
Add any other context about the feature request here.
--->
20 changes: 20 additions & 0 deletions .github/workflows/detox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 'Detox CI Tests'
on: [push]

jobs:
tests:
name: 'Running tests'
runs-on: 'macOS-latest'
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: 12.6
- name: Setup - Install Yarn
run: YARN_GPG=NO curl -o- -L https://yarnpkg.com/install.sh | bash
- name: Setup - Install NPM Dependencies
run: yarn
- name: Setup - Install CocoaPods CLI
run: sudo gem install cocoapods
- name: Run tests
run: yarn ci
16 changes: 16 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Close stale issues and PRs"
on:
schedule:
- cron: "0 0 * * *"

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v1
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'
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,6 @@ bundles/

android/gradle
android/gradlew
android/gradlew.bat
android/gradlew.bat

lib/
10 changes: 10 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// https://prettier.io/docs/en/options.html

module.exports = {
// Enables semicolons at the end of statements
semi: true,
// Formats strings with single quotes ('') instead of quotes ("")
singleQuote: true,
// Adds a trailing comma at the end of all lists (including function arguments)
trailingComma: 'all',
};
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
]
}
Loading

0 comments on commit ceddc9d

Please sign in to comment.