Skip to content

Commit

Permalink
Merge branch 'canary' into fix/issue-14022
Browse files Browse the repository at this point in the history
  • Loading branch information
moh12594 committed Jan 8, 2021
2 parents eb11269 + 8bdff57 commit d537fb1
Show file tree
Hide file tree
Showing 2,732 changed files with 78,916 additions and 23,705 deletions.
9 changes: 8 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,11 @@ packages/next/compiled/**/*
packages/react-refresh-utils/**/*.js
packages/react-dev-overlay/lib/**
**/__tmp__/**
.github/actions/next-stats-action/.work
.github/actions/next-stats-action/.work
packages/next-codemod/transforms/__testfixtures__/**/*
packages/next-codemod/transforms/__tests__/**/*
packages/next-codemod/**/*.js
packages/next-codemod/**/*.d.ts
packages/next-env/**/*.d.ts
test/integration/async-modules/**
test-timings.json
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/1.Bug_report.md

This file was deleted.

61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/1.bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Bug Report
about: Create a bug report for the Next.js core
title: ''
labels: 'template: bug'
issue_body: true
inputs:
- type: description
attributes:
value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
- type: description
attributes:
value: If you leave out sections there is a high likelihood it will be moved to the GitHub Discussions "Help" section.
- type: input
attributes:
label: What version of Next.js are you using?
description: 'For example: 10.0.1'
required: true
- type: input
attributes:
label: What version of Node.js are you using?
description: 'For example: 12.0.0'
required: true
- type: input
attributes:
label: What browser are you using?
description: 'For example: Chrome, Safari'
required: true
- type: input
attributes:
label: What operating system are you using?
description: 'For example: macOS, Windows'
required: true
- type: input
attributes:
label: How are you deploying your application?
description: 'For example: next start, next export, Vercel, Other platform'
required: true
- type: textarea
attributes:
label: Describe the Bug
description: A clear and concise description of what the bug is.
required: true
- type: textarea
attributes:
label: Expected Behavior
description: A clear and concise description of what you expected to happen.
required: true
- type: textarea
attributes:
label: To Reproduce
description: Steps to reproduce the behavior, please provide a clear code snippets that always reproduces the issue or a GitHub repository. Screenshots can be provided in the issue body below.
required: true
- type: description
attributes:
value: Before posting the issue go through the steps you've written down to make sure the steps provided are detailed and clear.
- type: description
attributes:
value: Contributors should be able to follow the steps provided in order to reproduce the bug.
- type: description
attributes:
value: These steps are used to add integration tests to ensure the same issue does not happen again. Thanks in advance!
22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/2.Feature_request.md

This file was deleted.

66 changes: 66 additions & 0 deletions .github/ISSUE_TEMPLATE/2.example_bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Example Bug Report
about: Create a bug report for the examples
title: ''
labels: 'type: example,template: bug'
issue_body: true
inputs:
- type: description
attributes:
value: Thanks for taking the time to file a examples bug report! Please fill out this form as completely as possible.
- type: description
attributes:
value: If you leave out sections there is a high likelihood it will be moved to the GitHub Discussions "Help" section.
- type: input
attributes:
label: What example does this report relate to?
description: 'For example: with-styled-components'
required: true
- type: input
attributes:
label: What version of Next.js are you using?
description: 'For example: 10.0.1'
required: true
- type: input
attributes:
label: What version of Node.js are you using?
description: 'For example: 12.0.0'
required: true
- type: input
attributes:
label: What browser are you using?
description: 'For example: Chrome, Safari'
required: true
- type: input
attributes:
label: What operating system are you using?
description: 'For example: macOS, Windows'
required: true
- type: input
attributes:
label: How are you deploying your application?
description: 'For example: next start, next export, Vercel, Other platform'
required: true
- type: textarea
attributes:
label: Describe the Bug
description: A clear and concise description of what the bug is.
required: true
- type: textarea
attributes:
label: Expected Behavior
description: A clear and concise description of what you expected to happen.
required: true
- type: textarea
attributes:
label: To Reproduce
description: Steps to reproduce the behavior, please provide a clear code snippets that always reproduces the issue or a GitHub repository. Screenshots can be provided in the issue body below.
required: true
- type: description
attributes:
value: Before posting the issue go through the steps you've written down to make sure the steps provided are detailed and clear.
- type: description
attributes:
value: Contributors should be able to follow the steps provided in order to reproduce the bug.
- type: description
attributes:
value: Thanks in advance!
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/3.feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Feature Request
about: Create a feature request for the Next.js core
title: ''
labels: 'template: story'
issue_body: true
inputs:
- type: description
attributes:
value: Thanks for taking the time to file a feature request! Please fill out this form as completely as possible.
- type: description
attributes:
value: 'Feature requests will be converted to the GitHub Discussions "Ideas" section.'
- type: textarea
attributes:
label: Describe the feature you'd like to request
description: A clear and concise description of what you want and what your use case is.
required: true
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
required: true
- type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
required: true
9 changes: 9 additions & 0 deletions .github/actions/next-stats-action/src/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const path = require('path')
const fs = require('fs-extra')
const exec = require('./util/exec')
const logger = require('./util/logger')
const runConfigs = require('./run')
Expand Down Expand Up @@ -25,6 +27,13 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {

;(async () => {
try {
if (await fs.pathExists(path.join(__dirname, '../SKIP_NEXT_STATS.txt'))) {
console.log(
'SKIP_NEXT_STATS.txt file present, exiting stats generation..'
)
process.exit(0)
}

const { stdout: gitName } = await exec(
'git config user.name && git config user.email'
)
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/next-stats-action/src/prepare/action-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ module.exports = function actionInfo() {
isLocal: LOCAL_STATS,
commitId: null,
issueId: ISSUE_ID,
isRelease: releaseTypes.has(GITHUB_ACTION),
isRelease:
GITHUB_REPOSITORY === 'vercel/next.js' &&
(GITHUB_REF || '').includes('canary'),
}

// get comment
Expand Down
3 changes: 2 additions & 1 deletion .github/labeler.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"type: next": [
"packages/next/**",
"packages/react-dev-overlay/**",
"packages/react-refresh-utils/**"
"packages/react-refresh-utils/**",
"packages/next-codemod/**"
]
}
}

0 comments on commit d537fb1

Please sign in to comment.