Skip to content

Commit

Permalink
Merge branch 'canary' of https://github.com/vercel/next.js into maste…
Browse files Browse the repository at this point in the history
…rpiecevr/canary
  • Loading branch information
timneutkens committed Jan 2, 2024
2 parents 083551e + e5aa95c commit d4e9747
Show file tree
Hide file tree
Showing 1,451 changed files with 51,742 additions and 37,504 deletions.
1 change: 0 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,4 @@ rustflags = [
"tokio_unstable",
"-Zshare-generics=y",
"-Csymbol-mangling-version=v0",
"-Aclippy::too_many_arguments",
]
5 changes: 1 addition & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ packages/react-refresh-utils/**/*.js
packages/react-dev-overlay/lib/**
**/__tmp__/**
.github/actions/next-stats-action/.work
.github/actions/validate-docs-links/lib/index.js
.github/actions/needs-triage/index.js
.github/actions/*/index.mjs
packages/next-codemod/transforms/__testfixtures__/**/*
packages/next-codemod/transforms/__tests__/**/*
packages/next-codemod/**/*.js
Expand All @@ -40,4 +37,4 @@ bench/nested-deps/**
bench/nested-deps-app-router/**
packages/next-bundle-analyzer/index.d.ts
examples/with-typescript-graphql/lib/gql/
test/development/basic/hmr/components/parse-error.js
test/development/basic/hmr/components/parse-error.js
10 changes: 1 addition & 9 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,6 @@
"jsdoc/no-undefined-types": "error"
}
},
{
"files": [
"test/**/*",
"examples/**/*",
"packages/create-next-app/templates/**/*"
],
"rules": { "react/react-in-jsx-scope": "off" }
},
{
"files": ["examples/**/*"],
"rules": {
Expand Down Expand Up @@ -351,7 +343,7 @@
"react/no-direct-mutation-state": "warn",
"react/no-is-mounted": "warn",
"react/no-typos": "error",
"react/react-in-jsx-scope": "error",
"react/react-in-jsx-scope": "off",
"react/require-render-return": "error",
"react/style-prop-object": "warn",
"react-hooks/rules-of-hooks": "error",
Expand Down
19 changes: 0 additions & 19 deletions .github/.kodiak.toml

This file was deleted.

1 change: 0 additions & 1 deletion .github/actions/needs-triage/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/needs-triage/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ description: 'vercel/next.js specific auto-labeling action'
author: 'Next.js team'
runs:
using: 'node20'
main: 'index.js'
main: 'dist/index.js'
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/actions/needs-triage/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"private": true,
"exports": "./index.js",
"exports": "./dist/index.js",
"files": [
"src"
],
"scripts": {
"build": "pnpm types && ncc -m -o . build lib/index.js --license licenses.txt",
"build": "pnpm types && ncc build lib/index.js -m -o dist --license licenses.txt",
"types": "tsc"
},
"devDependencies": {
Expand Down
12 changes: 5 additions & 7 deletions .github/actions/next-integration-stat/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@ author: Turbopack team
description: 'Display next.js integration test failure status'

inputs:
# Github token to use to create test report comment. If not specified, the default token will be used with username 'github-actions'
token:
default: ${{ github.token }}
description: 'GitHub token used to create the test report comment. If not specified, the default GitHub actions token will be used'

# The base of the test results to compare against. If not specified, will try to compare with latest main branch's test results.
diff_base:
default: 'main'
description: "The base of the test results to compare against. If not specified, will try to compare with latest main branch's test results."

# Include full test failure message in the report.
# This is currently disabled as we have too many failed test cases, causes
# too many report comment generated.
expand_full_result_message:
default: 'false'
description: 'Whether to include the full test failure message in the report. This is currently disabled as we have too many failed test cases, which would lead to massive comments.'

runs:
using: node16
main: index.js
using: node20
main: dist/index.js
Loading

0 comments on commit d4e9747

Please sign in to comment.