Unverified Commit d0ea7129 authored by Anas's avatar Anas Committed by GitHub

fix patch-next by adding missing script (#81430)

The `patch-next.cjs` script is failing because two of its dependencies,
`pack-util` and `build-native`, are missing their CommonJS versions,
which are required for compatibility with the current Node.js
environment. To fix this, i added the transpiled `pack-util.js` and
`build-native.js` files.

---------
Co-authored-by: 's avatargraphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>
Co-authored-by: 's avatarBenjamin Woodruff <benjamin.woodruff@vercel.com>
parent e210360b
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
"prepare": "husky", "prepare": "husky",
"sync-react": "node ./scripts/sync-react.js", "sync-react": "node ./scripts/sync-react.js",
"update-google-fonts": "node ./scripts/update-google-fonts.js", "update-google-fonts": "node ./scripts/update-google-fonts.js",
"patch-next": "node scripts/patch-next.cjs", "patch-next": "tsx scripts/patch-next.ts",
"unpack-next": "tsx scripts/unpack-next.ts", "unpack-next": "tsx scripts/unpack-next.ts",
"swc-build-native": "tsx scripts/build-native.ts", "swc-build-native": "tsx scripts/build-native.ts",
"swc-build-wasm": "tsx scripts/build-wasm.cjs", "swc-build-wasm": "tsx scripts/build-wasm.cjs",
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import fs from 'node:fs/promises' import fs from 'node:fs/promises'
import yargs from 'yargs' import yargs from 'yargs'
import { hideBin } from 'yargs/helpers'
import { default as patchPackageJson } from './pack-utils/patch-package-json.js' import { default as patchPackageJson } from './pack-utils/patch-package-json.js'
import buildNative from './build-native.js' import buildNative from './build-native.js'
...@@ -31,7 +32,8 @@ interface CliOptions { ...@@ -31,7 +32,8 @@ interface CliOptions {
_: string[] _: string[]
} }
const cliOptions = yargs(process.argv.slice(2)) const cliOptions = yargs(hideBin(process.argv))
.scriptName('pack-next')
.command('$0') .command('$0')
.option('js-build', { .option('js-build', {
type: 'boolean', type: 'boolean',
......
#!/usr/bin/env node
const {
NEXT_DIR,
exec,
execFn,
booleanArg,
packageFiles,
} = require('./pack-util.cjs')
const fs = require('fs')
const path = require('path')
/** @type {string[]} */
const argv = process.argv
const args = argv.slice(2)
const NEXT_PACKAGES = `${NEXT_DIR}/packages`
const noBuild = booleanArg(args, '--no-build')
const noNativeBuild = booleanArg(args, '--no-native-build')
const PROJECT_DIR = path.resolve(args[0])
function realPathIfAny(path) {
try {
return fs.realpathSync(path)
} catch {
return null
}
}
async function copy(src, dst) {
const realDst = realPathIfAny(dst)
if (!realDst) {
return
}
const files = await packageFiles(src)
for (const file of files) {
fs.cpSync(path.join(src, file), path.join(realDst, file), {
recursive: true,
})
}
}
async function main() {
if (!noBuild) {
exec('Install Next.js build dependencies', 'pnpm i')
exec('Build Next.js', 'pnpm run build')
}
if (!noNativeBuild) {
process.argv = [...process.argv.slice(0, 2), ...args.slice(1)]
await require('./build-native.cjs')
}
await execFn('Patching next', () =>
copy(`${NEXT_PACKAGES}/next`, `${PROJECT_DIR}/node_modules/next`)
)
await execFn('Patching @next/swc', () =>
copy(`${NEXT_PACKAGES}/next-swc`, `${PROJECT_DIR}/node_modules/@next/swc`)
)
await execFn('Patching @next/mdx', () =>
copy(`${NEXT_PACKAGES}/next-mdx`, `${PROJECT_DIR}/node_modules/@next/mdx`)
)
await execFn('Patching @next/bundle-analyzer', () =>
copy(
`${NEXT_PACKAGES}/next-bundle-analyzer`,
`${PROJECT_DIR}/node_modules/@next/bundle-anlyzer`
)
)
}
main().catch((e) => {
console.error(e)
process.exit(1)
})
// the script must be run with tsx
import fs from 'fs'
import yargs from 'yargs'
import { hideBin } from 'yargs/helpers'
import path from 'path'
import { NEXT_DIR, exec, execFn, packageFiles } from './pack-util.js'
import buildNative from './build-native.js'
interface Options {
project: string
build: boolean
noBuild: boolean
buildNative: boolean
noNativeBuild: boolean
verbose: number
_: string[]
}
// --- Parse command line arguments ---
const argv = yargs(hideBin(process.argv))
.scriptName('patch-next')
.usage(
'$0 <project> [..options]',
'Patch Local Next.js packages to the target project directory',
(yargs: any) => {
yargs
.positional('project', {
type: 'string',
describe: ': Target directory of the Next.js Project to patch',
nargs: 1,
})
.example(
'$0 ../my-app --no-build --no-build-native',
'Patch Next.js packages in the "my-app" directory'
)
.example(
'$0 ../my-app -- --release',
'Patch using a release-mode native build. `--release` is passed through to the napi CLI'
)
}
)
.option('build', {
type: 'boolean',
default: true,
description: 'Run the Next.js build step (`pnpm i` and `pnpm build`).',
})
.option('build-native', {
alias: 'native-build',
type: 'boolean',
default: true,
description: 'Run the native modules build step.',
})
.option('verbose', {
type: 'number',
choices: [0, 1, 2, 3],
count: true,
alias: 'v',
description: 'Set the verbosity level (-v: WARN, -vv: INFO, -vvv: DEBUG)',
})
.wrap(null)
.help()
.alias('help', 'h')
.demandCommand(1, 'A project directory is required.')
.strictCommands()
.parse()
const {
project: projectDir,
build,
buildNative: buildNativeEnabled,
verbose: verboseLevel,
_: buildNativeArgs,
} = argv as Options
function WARN(...args: any[]) {
verboseLevel >= 1 && console.warn(...args)
}
function INFO(...args: any[]) {
verboseLevel >= 2 && console.info(...args)
}
function DEBUG(...args: any[]) {
verboseLevel >= 3 && console.log(...args)
}
const PROJECT_DIR = path.resolve(projectDir)
const NEXT_PACKAGES = path.join(NEXT_DIR, 'packages')
function realPathIfAny(path: string): string | null {
try {
return fs.realpathSync(path)
} catch {
return null
}
}
async function copy(src: string, dst: string): Promise<void> {
const realDst = realPathIfAny(dst)
if (!realDst) {
WARN(`[x] Destination path ${dst} does not exist. Skipping copy.`)
return
}
if (realDst && realDst === src) {
WARN(
`[x] Source and destination paths are the same: ${src}. Skipping copy.`
)
return
}
if (!fs.existsSync(src)) {
WARN(`[x] Source path ${src} does not exist. Skipping copy.`)
return
}
const files = await packageFiles(src)
DEBUG(`[x] Found ${files.length} files to copy from ${src}`)
for (const file of files) {
const srcFile = path.join(src, file)
const dstFile = path.join(realDst, file)
DEBUG(`Copying ${srcFile} to ${dstFile}`)
fs.cpSync(srcFile, dstFile, {
recursive: true,
})
}
}
// --- Main execution ---
async function main(): Promise<void> {
if (!fs.existsSync(PROJECT_DIR)) {
console.error(`Error: Project directory "${PROJECT_DIR}" does not exist.`)
process.exit(1)
}
INFO(`[x] Project Directory: ${PROJECT_DIR}`)
INFO(`[x] Next.js Source: ${NEXT_PACKAGES}`)
if (build) {
exec('Install Next.js build dependencies', 'pnpm i')
exec('Build Next.js', 'pnpm run build')
}
if (buildNativeEnabled) {
INFO('Building native modules...')
await buildNative(buildNativeArgs)
}
const packagesToPatch = [
{ name: 'next', path: 'next' },
{ name: '@next/swc', path: 'next-swc' },
{ name: '@next/mdx', path: 'next-mdx' },
{ name: '@next/bundle-analyzer', path: 'next-bundle-analyzer' },
]
INFO(
`[x] Patching packages: ${packagesToPatch.map((pkg) => pkg.name).join(', ')}`
)
for (const pkg of packagesToPatch) {
await execFn(`Patching ${pkg.name}`, () =>
copy(
path.join(NEXT_PACKAGES, pkg.path),
path.join(PROJECT_DIR, 'node_modules', pkg.name)
)
)
}
console.log(`\n\x1b[1;4mPatching complete!\x1b[0m\n`)
}
main().catch((e) => {
console.error('An unexpected error occurred:')
console.error(e)
process.exit(1)
})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment