Unverified Commit 172fd6a5 authored by Marcos Hernanz's avatar Marcos Hernanz Committed by GitHub

fix(typescript): support aliased CLI entry points

parent 2f84a1f2
...@@ -32,8 +32,14 @@ export function getTypeScriptPackageInfo( ...@@ -32,8 +32,14 @@ export function getTypeScriptPackageInfo(
} }
const packageDir = path.dirname(packageJsonPath) const packageDir = path.dirname(packageJsonPath)
const apiPath = path.join(packageDir, 'lib', 'typescript.js') const apiPath = path.join(packageDir, 'lib', 'typescript.js')
const bin = packageJson.bin
const tscBin = const tscBin =
typeof packageJson.bin === 'string' ? packageJson.bin : packageJson.bin?.tsc typeof bin === 'string'
? bin
: (bin?.tsc ??
(bin && Object.keys(bin).length === 1
? Object.values(bin)[0]
: undefined))
const tscBinPath = tscBin ? path.resolve(packageDir, tscBin) : undefined const tscBinPath = tscBin ? path.resolve(packageDir, tscBin) : undefined
let tscPath = tscBinPath let tscPath = tscBinPath
......
...@@ -117,8 +117,14 @@ export async function verifyAndRunTypeScript({ ...@@ -117,8 +117,14 @@ export async function verifyAndRunTypeScript({
throw getTypeScriptApiMissingError(installedTypeScript.version) throw getTypeScriptApiMissingError(installedTypeScript.version)
} }
const typeScriptRequirement =
useTypeScriptCli && installedTypeScript?.tscPath
? undefined
: useTypeScriptCli
? typescriptCliPackage
: typescriptApiPackage
const requiredPackages: MissingDependency[] = [ const requiredPackages: MissingDependency[] = [
useTypeScriptCli ? typescriptCliPackage : typescriptApiPackage, ...(typeScriptRequirement ? [typeScriptRequirement] : []),
...requiredTypePackages, ...requiredTypePackages,
] ]
......
...@@ -169,4 +169,28 @@ describe('TypeScript CLI backend', () => { ...@@ -169,4 +169,28 @@ describe('TypeScript CLI backend', () => {
expect(await next.hasFile('.next/cache/.tsbuildinfo')).toBe(true) expect(await next.hasFile('.next/cache/.tsbuildinfo')).toBe(true)
}) })
}) })
describe('aliased TypeScript 6 compatibility package', () => {
const { next, skipped } = nextTestSetup({
files: __dirname,
skipStart: true,
skipDeployment: true,
dependencies: {
typescript: 'npm:@typescript/typescript6@6.0.2',
},
})
if (skipped) return
it("uses the package's sole CLI entry point", async () => {
const result = await next.build()
expect(result.exitCode).toBe(0)
expect(result.cliOutput).not.toContain(
'do not have the required package(s) installed'
)
expect(result.cliOutput).not.toContain('Installing dependencies')
expect(await next.hasFile('.next/cache/.tsbuildinfo')).toBe(true)
})
})
}) })
{
"name": "@typescript/typescript6",
"version": "6.0.2-test",
"bin": {
"tsc6": "./bin/tsc6"
}
}
...@@ -90,4 +90,21 @@ describe('TypeScript CLI config metadata', () => { ...@@ -90,4 +90,21 @@ describe('TypeScript CLI config metadata', () => {
), ),
}) })
}) })
it('uses the sole CLI entry from an aliased TypeScript package', () => {
const packageDir = path.join(testDir, 'node_modules/typescript')
rmSync(packageDir, { force: true, recursive: true })
cpSync(
path.join(__dirname, 'fixture/typescript-aliased-package'),
packageDir,
{ recursive: true }
)
const packageInfo = getTypeScriptPackageInfo(testDir)
expect(packageInfo).toMatchObject({
version: '6.0.2-test',
tscPath: realpathSync(path.join(packageDir, 'bin/tsc6')),
})
})
}) })
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