Skip to content

Commit

Permalink
Merge branch 'canary' into first-input-delay
Browse files Browse the repository at this point in the history
  • Loading branch information
timneutkens authored Mar 3, 2020
2 parents b7fe05a + 6598e99 commit eebed57
Show file tree
Hide file tree
Showing 1,208 changed files with 28,709 additions and 15,678 deletions.
217 changes: 0 additions & 217 deletions .circleci/config.yml

This file was deleted.

16 changes: 15 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
}
},
"overrides": [
{ "files": ["**/__tests__/**"], "env": { "jest": true } },
{
"files": ["**/*.ts", "**/*.tsx"],
"parser": "@typescript-eslint/parser",
Expand Down Expand Up @@ -61,12 +62,25 @@
"ignoreRestSiblings": true
}
],
"no-unused-expressions": "off",
"@typescript-eslint/no-unused-expressions": [
"error",
{
"allowShortCircuit": true,
"allowTernary": true,
"allowTaggedTemplates": true
}
],
"no-useless-constructor": "off",
"@typescript-eslint/no-useless-constructor": "warn"
}
},
{
"files": ["test/**/*", "examples/**/*"],
"files": [
"test/**/*",
"examples/**/*",
"packages/create-next-app/templates/**/*"
],
"rules": { "react/react-in-jsx-scope": "off" }
}
],
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1.Bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug report
about: Create a bug report for the Next.js core
about: Create a bug report for the Next.js core / examples
---

# Bug report
Expand Down
41 changes: 0 additions & 41 deletions .github/ISSUE_TEMPLATE/3.Example_Bug_report.md

This file was deleted.

8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/8.Question_about_next.md

This file was deleted.

5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question
url: https://github.com/zeit/next.js/discussions
about: Ask questions and discuss with other community members
Loading

0 comments on commit eebed57

Please sign in to comment.