Skip to content

Commit

Permalink
Merge branch 'canary' into cna-update-prompts
Browse files Browse the repository at this point in the history
  • Loading branch information
ijjk authored Dec 12, 2023
2 parents a810b34 + 6fbff29 commit 5661320
Show file tree
Hide file tree
Showing 572 changed files with 28,865 additions and 50,625 deletions.
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
2 changes: 1 addition & 1 deletion .github/actions/next-integration-stat/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ inputs:

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

0 comments on commit 5661320

Please sign in to comment.