e5ac6aeea8
#62980 migrated `examples/basic-css` to use app router. A handful of our create-next-app tests use this example when asserting the correct project files are created, so we were asserting on a pages file existing rather than an app dir page. This PR updates those tests. <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> Closes NEXT-2754
201 lines
5.5 KiB
JavaScript
201 lines
5.5 KiB
JavaScript
const { promisify } = require('util')
|
|
const { exec: execOrig, spawn } = require('child_process')
|
|
|
|
const exec = promisify(execOrig)
|
|
|
|
const CHANGE_ITEM_GROUPS = {
|
|
docs: [
|
|
'bench',
|
|
'docs',
|
|
'errors',
|
|
'examples',
|
|
'UPGRADING.md',
|
|
'contributing.md',
|
|
'contributing',
|
|
'CODE_OF_CONDUCT.md',
|
|
'readme.md',
|
|
'.github/ISSUE_TEMPLATE',
|
|
'.github/labeler.json',
|
|
'.github/pull_request_template.md',
|
|
'packages/next-plugin-storybook/readme.md',
|
|
'packages/next/license.md',
|
|
'packages/next/README.md',
|
|
'packages/eslint-plugin-next/README.md',
|
|
'packages/next-codemod/license.md',
|
|
'packages/next-codemod/README.md',
|
|
'packages/next-swc/crates/wasm/README.md',
|
|
'packages/next-swc/README.md',
|
|
'packages/next-bundle-analyzer/readme.md',
|
|
'packages/next-mdx/license.md',
|
|
'packages/next-mdx/readme.md',
|
|
'packages/react-dev-overlay/README.md',
|
|
'packages/react-refresh-utils/README.md',
|
|
'packages/create-next-app/README.md',
|
|
'packages/font/README.md',
|
|
'packages/next-env/README.md',
|
|
],
|
|
'deploy-examples': ['examples/image-component'],
|
|
cna: [
|
|
'packages/create-next-app',
|
|
'test/integration/create-next-app',
|
|
'examples/basic-css',
|
|
],
|
|
'next-codemod': ['packages/next-codemod'],
|
|
'next-swc': [
|
|
'packages/next-swc',
|
|
'scripts/normalize-version-bump.js',
|
|
'test/integration/create-next-app',
|
|
'scripts/send-trace-to-jaeger',
|
|
],
|
|
}
|
|
|
|
async function main() {
|
|
let eventData = {}
|
|
|
|
try {
|
|
eventData = require(process.env.GITHUB_EVENT_PATH)['pull_request'] || {}
|
|
} catch (_) {}
|
|
|
|
const branchName =
|
|
eventData?.head?.ref ||
|
|
process.env.GITHUB_REF_NAME ||
|
|
(await exec('git rev-parse --abbrev-ref HEAD')).stdout
|
|
|
|
const remoteUrl =
|
|
eventData?.head?.repo?.full_name ||
|
|
process.env.GITHUB_REPOSITORY ||
|
|
(await exec('git remote get-url origin')).stdout
|
|
|
|
const isCanary =
|
|
branchName.trim() === 'canary' && remoteUrl.includes('vercel/next.js')
|
|
|
|
try {
|
|
await exec('git remote set-branches --add origin canary')
|
|
await exec('git fetch origin canary --depth=20')
|
|
} catch (err) {
|
|
console.error(await exec('git remote -v'))
|
|
console.error(`Failed to fetch origin/canary`, err)
|
|
}
|
|
// if we are on the canary branch only diff current commit
|
|
const toDiff = isCanary
|
|
? `${process.env.GITHUB_SHA || 'canary'}~`
|
|
: 'origin/canary...'
|
|
|
|
const changesResult = await exec(`git diff ${toDiff} --name-only`).catch(
|
|
(err) => {
|
|
console.error(err)
|
|
return { stdout: '' }
|
|
}
|
|
)
|
|
console.error({ branchName, remoteUrl, isCanary, changesResult })
|
|
const changedFilesOutput = changesResult.stdout
|
|
|
|
const typeIndex = process.argv.indexOf('--type')
|
|
const type = typeIndex > -1 && process.argv[typeIndex + 1]
|
|
const isNegated = process.argv.indexOf('--not') > -1
|
|
const alwaysCanary = process.argv.indexOf('--always-canary') > -1
|
|
|
|
if (!type) {
|
|
throw new Error(
|
|
`Missing "--type" flag, e.g. "node run-for-change.js --type docs"`
|
|
)
|
|
}
|
|
const execArgIndex = process.argv.indexOf('--exec')
|
|
const listChangedDirectories = process.argv.includes(
|
|
'--listChangedDirectories'
|
|
)
|
|
|
|
if (execArgIndex < 0 && !listChangedDirectories) {
|
|
throw new Error(
|
|
'Invalid: must provide either "--exec" or "--listChangedDirectories" flag'
|
|
)
|
|
}
|
|
let hasMatchingChange = false
|
|
const changeItems = CHANGE_ITEM_GROUPS[type]
|
|
const execArgs = process.argv.slice(execArgIndex + 1)
|
|
|
|
if (execArgs.length < 1 && !listChangedDirectories) {
|
|
throw new Error('Missing exec arguments after "--exec"')
|
|
}
|
|
|
|
if (!changeItems) {
|
|
throw new Error(
|
|
`Invalid change type, allowed types are ${Object.keys(
|
|
CHANGE_ITEM_GROUPS
|
|
).join(', ')}`
|
|
)
|
|
}
|
|
let changedFilesCount = 0
|
|
let changedDirectories = []
|
|
|
|
// always run for canary if flag is enabled
|
|
if (alwaysCanary && branchName === 'canary') {
|
|
changedFilesCount += 1
|
|
hasMatchingChange = true
|
|
}
|
|
|
|
for (let file of changedFilesOutput.split('\n')) {
|
|
file = file.trim().replace(/\\/g, '/')
|
|
|
|
if (file) {
|
|
changedFilesCount += 1
|
|
|
|
// if --not flag is provided we execute for any file changed
|
|
// not included in the change items otherwise we only execute
|
|
// if a change item is changed
|
|
const matchesItem = changeItems.some((item) => {
|
|
const found = file.startsWith(item)
|
|
if (found) {
|
|
changedDirectories.push(item)
|
|
}
|
|
return found
|
|
})
|
|
|
|
if (!matchesItem && isNegated) {
|
|
hasMatchingChange = true
|
|
break
|
|
}
|
|
|
|
if (matchesItem && !isNegated) {
|
|
hasMatchingChange = true
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// if we fail to detect the changes run the command
|
|
if (changedFilesCount < 1) {
|
|
console.error(`No changed files detected:\n${changedFilesOutput}`)
|
|
hasMatchingChange = true
|
|
}
|
|
|
|
if (hasMatchingChange) {
|
|
if (listChangedDirectories) {
|
|
console.log(changedDirectories.join('\n'))
|
|
return
|
|
}
|
|
const cmd = spawn(execArgs[0], execArgs.slice(1))
|
|
cmd.stdout.pipe(process.stdout)
|
|
cmd.stderr.pipe(process.stderr)
|
|
|
|
await new Promise((resolve, reject) => {
|
|
cmd.on('exit', (code) => {
|
|
if (code !== 0) {
|
|
return reject(new Error('command failed with code: ' + code))
|
|
}
|
|
resolve()
|
|
})
|
|
cmd.on('error', (err) => reject(err))
|
|
})
|
|
} else if (!listChangedDirectories) {
|
|
console.log(
|
|
`No matching changed files for ${isNegated ? 'not ' : ''}"${type}":\n` +
|
|
changedFilesOutput.trim()
|
|
)
|
|
}
|
|
}
|
|
|
|
main().catch((err) => {
|
|
console.error('Failed to detect changes', err)
|
|
process.exit(1)
|
|
})
|