Skip to content

Commit

Permalink
Merge branch 'canary' into add-types-for-next-middleware
Browse files Browse the repository at this point in the history
  • Loading branch information
styfle committed Nov 22, 2021
2 parents b091a7a + f584722 commit 2f5f985
Show file tree
Hide file tree
Showing 468 changed files with 6,250 additions and 1,447 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Expand Up @@ -24,7 +24,8 @@ packages/next-codemod/**/*.d.ts
packages/next-env/**/*.d.ts
packages/create-next-app/templates/**
test/integration/eslint/**
test/development/basic/legacy-decorators/**/*
test-timings.json
packages/next/build/swc/tests/**
packages/next-swc/crates/**
bench/nested-deps/pages/**
bench/nested-deps/components/**
5 changes: 3 additions & 2 deletions .eslintrc.json
Expand Up @@ -30,14 +30,15 @@
},
"overrides": [
{
"files": ["test/**/*.test.js"],
"files": ["test/**/*.js", "test/**/*.ts", "**/*.test.ts"],
"extends": ["plugin:jest/recommended"],
"rules": {
"jest/expect-expect": "off",
"jest/no-disabled-tests": "off",
"jest/no-conditional-expect": "off",
"jest/valid-title": "off",
"jest/no-interpolation-in-snapshots": "off"
"jest/no-interpolation-in-snapshots": "off",
"jest/no-export": "off"
}
},
{ "files": ["**/__tests__/**"], "env": { "jest": true } },
Expand Down
5 changes: 5 additions & 0 deletions .github/actions/next-stats-action/src/index.js
Expand Up @@ -118,6 +118,11 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
// in case of noisy environment slowing down initial repo build
await exec(buildCommand, false, { timeout: 5 * 60 * 1000 })
}
await fs.copy(
path.join(__dirname, '../native'),
path.join(dir, 'packages/next-swc/native')
)
// TODO: remove after next stable release (current v12.0.4)
await fs.copy(
path.join(__dirname, '../native'),
path.join(dir, 'packages/next/native')
Expand Down
13 changes: 12 additions & 1 deletion .github/actions/next-stats-action/src/prepare/repo-setup.js
Expand Up @@ -98,13 +98,24 @@ module.exports = (actionInfo) => {
pkgData.dependencies[pkg] = packedPkgPath
}
// make sure native binaries are included in local linking
if (pkg === 'next') {
if (pkg === '@next/swc') {
if (!pkgData.files) {
pkgData.files = []
}
pkgData.files.push('native')
console.log(
'using swc binaries: ',
await exec(`ls ${path.join(path.dirname(pkgDataPath), 'native')}`)
)
}
if (pkg === 'next') {
if (pkgDatas.get('@next/swc')) {
pkgData.dependencies['@next/swc'] =
pkgDatas.get('@next/swc').packedPkgPath
} else {
pkgData.files.push('native')
}
}
await fs.writeFile(
pkgDataPath,
JSON.stringify(pkgData, null, 2),
Expand Down
6 changes: 3 additions & 3 deletions .github/labeler.json
@@ -1,8 +1,8 @@
{
"labels": {
"type: example": ["examples/**"],
"type: documentation": ["docs/**", "errors/**"],
"type: create-next-app": ["packages/create-next-app/**"],
"area: examples": ["examples/**"],
"area: documentation": ["docs/**", "errors/**"],
"area: create-next-app": ["packages/create-next-app/**"],
"type: next": [
"packages/next/**",
"packages/react-dev-overlay/**",
Expand Down

0 comments on commit 2f5f985

Please sign in to comment.