Skip to content

Commit

Permalink
Merge branch 'master' into feature/upgrade-rollup-to-latest-version
Browse files Browse the repository at this point in the history
  • Loading branch information
Kunuk Nykjaer committed Feb 20, 2020
2 parents 6070bf0 + b789060 commit af015e1
Show file tree
Hide file tree
Showing 71 changed files with 10,187 additions and 7,763 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.js
Expand Up @@ -5,6 +5,8 @@ const {
esNextPaths,
} = require('./scripts/shared/pathsByLanguageVersion');

const restrictedGlobals = require('confusing-browser-globals');

const OFF = 0;
const ERROR = 2;

Expand Down Expand Up @@ -45,6 +47,7 @@ module.exports = {
'no-bitwise': OFF,
'no-inner-declarations': [ERROR, 'functions'],
'no-multi-spaces': ERROR,
'no-restricted-globals': [ERROR].concat(restrictedGlobals),
'no-restricted-syntax': [ERROR, 'WithStatement'],
'no-shadow': ERROR,
'no-unused-expressions': ERROR,
Expand Down
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
contact_links:
- name: 📃 Documentation Issue
url: https://github.com/reactjs/reactjs.org/issues/new
about: This issue tracker is not for documentation issues. Please file documentation issues here.
- name: 🤔 Questions and Help
url: https://reactjs.org/community/support.html
about: This issue tracker is not for support questions. Please refer to the React community's help and discussion forums.
13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/documentation.md

This file was deleted.

29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -40,6 +40,7 @@
"chalk": "^3.0.0",
"cli-table": "^0.3.1",
"coffee-script": "^1.12.7",
"confusing-browser-globals": "^1.0.9",
"core-js": "^3.6.4",
"coveralls": "^3.0.9",
"create-react-class": "^15.6.3",
Expand Down

0 comments on commit af015e1

Please sign in to comment.