fix: remove `suppressImplicitAnyIndexErrors` from typescript settings (#5991)
This commit is contained in:
Zoltan Kochan
GitHub
parent
4e0bed9a13
commit
583e3954be
|
|
@ -13,7 +13,7 @@ const NEXT_TAG = 'next-7'
|
|||
const CLI_PKG_NAME = 'pnpm'
|
||||
|
||||
export default async (workspaceDir: string) => {
|
||||
const pnpmManifest = loadJsonFile.sync(path.join(workspaceDir, 'pnpm/package.json'))
|
||||
const pnpmManifest = loadJsonFile.sync<any>(path.join(workspaceDir, 'pnpm/package.json'))
|
||||
const pnpmVersion = pnpmManifest!['version'] // eslint-disable-line
|
||||
const pnpmMajorKeyword = `pnpm${pnpmVersion.split('.')[0]}`
|
||||
const utilsDir = path.join(workspaceDir, '__utils__')
|
||||
|
|
@ -108,8 +108,10 @@ async function updateTSConfig (
|
|||
}, { indent: 2 })
|
||||
return {
|
||||
...tsConfig,
|
||||
extends: '@pnpm/tsconfig',
|
||||
composite: true,
|
||||
compilerOptions: {
|
||||
...tsConfig['compilerOptions'],
|
||||
...(tsConfig as any)['compilerOptions'],
|
||||
rootDir: 'src',
|
||||
},
|
||||
references: references.sort((r1, r2) => r1.path.localeCompare(r2.path)),
|
||||
|
|
|
|||
|
|
@ -13,5 +13,6 @@
|
|||
{
|
||||
"path": "../lockfile/lockfile-file"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
1
.npmrc
1
.npmrc
|
|
@ -12,3 +12,4 @@ save-workspace-protocol=rolling
|
|||
save-prefix=
|
||||
resolution-mode=time-based
|
||||
auto-install-peers=true
|
||||
resolve-peers-from-workspace-root=true
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
},
|
||||
"repository": "https://github.com/pnpm/pnpm/blob/master/privatePackages/assert-project",
|
||||
"scripts": {
|
||||
"lint": "tslint -c ../../tslint.json --project .",
|
||||
"lint": "eslint src/**/*.ts test/**/*.ts",
|
||||
"lint-test": "tslint -c tslint.json --project test",
|
||||
"compile": "rimraf tsconfig.tsbuildinfo lib && tsc --build",
|
||||
"prepublishOnly": "pnpm run compile",
|
||||
|
|
|
|||
|
|
@ -24,5 +24,6 @@
|
|||
{
|
||||
"path": "../assert-store"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
"repository": "https://github.com/pnpm/pnpm/blob/master/privatePackages/assert-store",
|
||||
"scripts": {
|
||||
"compile": "tsc --build",
|
||||
"lint": "tslint -c ../../tslint.json src/**/*.ts test/**/*.ts",
|
||||
"lint": "eslint src/**/*.ts test/**/*.ts",
|
||||
"prepublishOnly": "pnpm run compile",
|
||||
"pretest": "pnpm install -C test/fixture/project --force --no-shared-workspace-lockfile",
|
||||
"test": "pnpm pretest && pnpm run compile && jest"
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
{
|
||||
"path": "../../store/cafs"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
}
|
||||
],
|
||||
"@typescript-eslint/consistent-indexed-object-style": "off",
|
||||
"@typescript-eslint/prefer-reduce-type-parameter": "off",
|
||||
"@typescript-eslint/naming-convention": "error",
|
||||
"@typescript-eslint/explicit-function-return-type": "off",
|
||||
"@typescript-eslint/no-explicit-any": "error",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
"dependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "^5.48.1",
|
||||
"@typescript-eslint/parser": "^5.48.1",
|
||||
"eslint": "^8.31.0",
|
||||
"eslint": "^8.32.0",
|
||||
"eslint-config-standard-with-typescript": "^26.0.0",
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-n": "^15.6.0",
|
||||
|
|
|
|||
|
|
@ -9,5 +9,6 @@
|
|||
"src/**/*.ts",
|
||||
"../../__typings__/**/*.d.ts"
|
||||
],
|
||||
"references": []
|
||||
"references": [],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
"@types/node": "^14.18.36"
|
||||
},
|
||||
"scripts": {
|
||||
"lint": "tslint -c ../../tslint.json --project .",
|
||||
"lint": "eslint src/**/*.ts",
|
||||
"prepublishOnly": "pnpm run compile",
|
||||
"test": "pnpm run compile",
|
||||
"compile": "rimraf tsconfig.tsbuildinfo lib && tsc --build"
|
||||
|
|
|
|||
|
|
@ -27,8 +27,13 @@ export function tempDir (chdir: boolean = true) {
|
|||
return tmpDir
|
||||
}
|
||||
|
||||
interface LocationAndManifest {
|
||||
location: string
|
||||
package: ProjectManifest
|
||||
}
|
||||
|
||||
export function preparePackages (
|
||||
pkgs: Array<{ location: string, package: ProjectManifest } | ProjectManifest>,
|
||||
pkgs: Array<LocationAndManifest | ProjectManifest>,
|
||||
opts?: {
|
||||
manifestFormat?: ManifestFormat
|
||||
tempDir?: string
|
||||
|
|
@ -40,15 +45,15 @@ export function preparePackages (
|
|||
const dirname = path.dirname(pkgTmpPath)
|
||||
const result: { [name: string]: Project } = {}
|
||||
for (const aPkg of pkgs) {
|
||||
if (typeof aPkg['location'] === 'string') {
|
||||
result[aPkg['package']['name']] = prepare(aPkg['package'], {
|
||||
if (typeof (aPkg as LocationAndManifest).location === 'string') {
|
||||
result[(aPkg as LocationAndManifest).package.name!] = prepare((aPkg as LocationAndManifest).package, {
|
||||
manifestFormat,
|
||||
tempDir: path.join(dirname, aPkg['location']),
|
||||
tempDir: path.join(dirname, (aPkg as LocationAndManifest).location),
|
||||
})
|
||||
} else {
|
||||
result[aPkg['name']] = prepare(aPkg as ProjectManifest, {
|
||||
result[(aPkg as ProjectManifest).name!] = prepare(aPkg as ProjectManifest, {
|
||||
manifestFormat,
|
||||
tempDir: path.join(dirname, aPkg['name']),
|
||||
tempDir: path.join(dirname, (aPkg as ProjectManifest).name!),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,5 +15,6 @@
|
|||
{
|
||||
"path": "../assert-project"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
},
|
||||
"repository": "https://github.com/pnpm/pnpm/blob/master/privatePackages/test-fixtures",
|
||||
"scripts": {
|
||||
"lint": "tslint -c ../../tslint.json --project .",
|
||||
"lint": "eslint src/**/*.ts",
|
||||
"compile": "rimraf tsconfig.tsbuildinfo lib && tsc --build",
|
||||
"test": "pnpm run compile"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
{
|
||||
"path": "../prepare"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
"removeComments": false,
|
||||
"sourceMap": true,
|
||||
"strict": true,
|
||||
"suppressImplicitAnyIndexErrors": true,
|
||||
"target": "es2020"
|
||||
},
|
||||
"atom": {
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
{
|
||||
"path": "../../packages/types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,5 +25,6 @@ export const TABLE_OPTIONS = {
|
|||
}
|
||||
|
||||
for (const [key, value] of Object.entries(TABLE_OPTIONS.border)) {
|
||||
// @ts-expect-error
|
||||
TABLE_OPTIONS.border[key] = chalk.grey(value)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,5 +33,6 @@
|
|||
{
|
||||
"path": "../default-reporter"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@
|
|||
"src/**/*.ts",
|
||||
"../../__typings__/**/*.d.ts"
|
||||
],
|
||||
"references": []
|
||||
"references": [],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@
|
|||
"src/**/*.ts",
|
||||
"../../__typings__/**/*.d.ts"
|
||||
],
|
||||
"references": []
|
||||
"references": [],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ export function reporterForClient (
|
|||
outputs.push(reportContext(log$, { cwd }))
|
||||
}
|
||||
|
||||
if (PRINT_EXECUTION_TIME_IN_COMMANDS[opts.cmd]) {
|
||||
if (opts.cmd in PRINT_EXECUTION_TIME_IN_COMMANDS) {
|
||||
outputs.push(reportExecutionTime(log$.executionTime))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,16 +58,16 @@ export function getPkgsDiff (
|
|||
const deprecationSet = args[1] as Set<string>
|
||||
let action: '-' | '+' | undefined
|
||||
let log!: any // eslint-disable-line
|
||||
if (rootLog['added']) {
|
||||
if ('added' in rootLog) {
|
||||
action = '+'
|
||||
log = rootLog['added']
|
||||
} else if (rootLog['removed']) {
|
||||
} else if ('removed' in rootLog) {
|
||||
action = '-'
|
||||
log = rootLog['removed']
|
||||
} else {
|
||||
return pkgsDiff
|
||||
}
|
||||
const depType = log.dependencyType || 'nodeModulesOnly'
|
||||
const depType = (log.dependencyType || 'nodeModulesOnly') as keyof typeof pkgsDiff
|
||||
const oppositeKey = `${action === '-' ? '+' : '-'}${log.name as string}`
|
||||
const previous = pkgsDiff[depType][oppositeKey]
|
||||
if (previous && previous.version === log.version) {
|
||||
|
|
@ -126,7 +126,7 @@ export function getPkgsDiff (
|
|||
const initialPackageManifest = removeOptionalFromProdDeps(packageManifests['initial'])
|
||||
const updatedPackageManifest = removeOptionalFromProdDeps(packageManifests['updated'])
|
||||
|
||||
for (const depType of ['peer', 'prod', 'optional', 'dev']) {
|
||||
for (const depType of ['peer', 'prod', 'optional', 'dev'] as const) {
|
||||
const prop = propertyByDependencyType[depType]
|
||||
const initialDeps = Object.keys(initialPackageManifest[prop] || {})
|
||||
const updatedDeps = Object.keys(updatedPackageManifest[prop] || {})
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ export function reportSummary (
|
|||
take(1),
|
||||
map(([pkgsDiff]) => {
|
||||
let msg = ''
|
||||
for (const depType of ['prod', 'optional', 'peer', 'dev', 'nodeModulesOnly']) {
|
||||
const diffs: PackageDiff[] = Object.values(pkgsDiff[depType])
|
||||
for (const depType of ['prod', 'optional', 'peer', 'dev', 'nodeModulesOnly'] as const) {
|
||||
const diffs: PackageDiff[] = Object.values(pkgsDiff[depType as keyof typeof pkgsDiff])
|
||||
if (diffs.length > 0) {
|
||||
msg += EOL
|
||||
if (opts.pnpmConfig?.global) {
|
||||
|
|
|
|||
|
|
@ -181,9 +181,10 @@ test('prints test error', (done) => {
|
|||
},
|
||||
})
|
||||
|
||||
const err = new Error('Tests failed')
|
||||
err['stage'] = 'test'
|
||||
err['code'] = 'ELIFECYCLE'
|
||||
const err = Object.assign(new Error('Tests failed'), {
|
||||
code: 'ELIFECYCLE',
|
||||
stage: 'test',
|
||||
})
|
||||
logger.error(err, err)
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
"extends": "@pnpm/tsconfig",
|
||||
"compilerOptions": {
|
||||
"outDir": "lib",
|
||||
"rootDir": "src"
|
||||
"rootDir": "src",
|
||||
"suppressImplicitAnyIndexErrors": true
|
||||
},
|
||||
"include": [
|
||||
"src/**/*.ts",
|
||||
|
|
@ -24,5 +25,6 @@
|
|||
{
|
||||
"path": "../../packages/types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ const CUSTOM_OPTION_PREFIX = 'config.'
|
|||
|
||||
function normalizeOptions (options: Record<string, unknown>, knownOptions: Set<string>) {
|
||||
const standardOptionNames = []
|
||||
const normalizedOptions = {}
|
||||
const normalizedOptions: Record<string, unknown> = {}
|
||||
for (const [optionName, optionValue] of Object.entries(options)) {
|
||||
if (optionName.startsWith(CUSTOM_OPTION_PREFIX)) {
|
||||
normalizedOptions[optionName.substring(CUSTOM_OPTION_PREFIX.length)] = optionValue
|
||||
|
|
|
|||
|
|
@ -15,5 +15,6 @@
|
|||
{
|
||||
"path": "../../workspace/find-workspace-dir"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
import normalizeRegistryUrl from 'normalize-registry-url'
|
||||
|
||||
export function getScopeRegistries (rawConfig: Object) {
|
||||
const registries = {}
|
||||
export function getScopeRegistries (rawConfig: Record<string, object>) {
|
||||
const registries: Record<string, string> = {}
|
||||
for (const configKey of Object.keys(rawConfig)) {
|
||||
if (configKey[0] === '@' && configKey.endsWith(':registry')) {
|
||||
registries[configKey.slice(0, configKey.indexOf(':'))] = normalizeRegistryUrl(rawConfig[configKey])
|
||||
registries[configKey.slice(0, configKey.indexOf(':'))] = normalizeRegistryUrl(rawConfig[configKey] as unknown as string)
|
||||
}
|
||||
}
|
||||
return registries
|
||||
|
|
|
|||
|
|
@ -262,6 +262,7 @@ export async function getConfig (
|
|||
const cwd = (cliOptions.dir && path.resolve(cliOptions.dir)) ?? npmConfig.localPrefix
|
||||
|
||||
pnpmConfig.maxSockets = npmConfig.maxsockets
|
||||
// @ts-expect-error
|
||||
delete pnpmConfig['maxsockets']
|
||||
|
||||
pnpmConfig.configDir = configDir
|
||||
|
|
@ -286,11 +287,14 @@ export async function getConfig (
|
|||
...getScopeRegistries(pnpmConfig.rawConfig),
|
||||
}
|
||||
pnpmConfig.useLockfile = (() => {
|
||||
// @ts-expect-error
|
||||
if (typeof pnpmConfig['lockfile'] === 'boolean') return pnpmConfig['lockfile']
|
||||
// @ts-expect-error
|
||||
if (typeof pnpmConfig['packageLock'] === 'boolean') return pnpmConfig['packageLock']
|
||||
return false
|
||||
})()
|
||||
pnpmConfig.useGitBranchLockfile = (() => {
|
||||
// @ts-expect-error
|
||||
if (typeof pnpmConfig['gitBranchLockfile'] === 'boolean') return pnpmConfig['gitBranchLockfile']
|
||||
return false
|
||||
})()
|
||||
|
|
@ -309,7 +313,9 @@ export async function getConfig (
|
|||
|
||||
if (cliOptions['global']) {
|
||||
let globalDirRoot
|
||||
// @ts-expect-error
|
||||
if (pnpmConfig['globalDir']) {
|
||||
// @ts-expect-error
|
||||
globalDirRoot = pnpmConfig['globalDir']
|
||||
} else {
|
||||
globalDirRoot = path.join(pnpmConfig.pnpmHomeDir, 'global')
|
||||
|
|
@ -427,6 +433,7 @@ export async function getConfig (
|
|||
}
|
||||
}
|
||||
|
||||
// @ts-expect-error
|
||||
if (pnpmConfig['shamefullyFlatten']) {
|
||||
warnings.push('The "shamefully-flatten" setting has been renamed to "shamefully-hoist". Also, in most cases you won\'t need "shamefully-hoist". Since v4, a semistrict node_modules structure is on by default (via hoist-pattern=[*]).')
|
||||
pnpmConfig.shamefullyHoist = true
|
||||
|
|
@ -437,6 +444,7 @@ export async function getConfig (
|
|||
if (!pnpmConfig.stateDir) {
|
||||
pnpmConfig.stateDir = getStateDir(process)
|
||||
}
|
||||
// @ts-expect-error
|
||||
if (pnpmConfig['hoist'] === false) {
|
||||
delete pnpmConfig.hoistPattern
|
||||
}
|
||||
|
|
@ -486,6 +494,7 @@ export async function getConfig (
|
|||
pnpmConfig.httpProxy = pnpmConfig.httpsProxy ?? getProcessEnv('http_proxy') ?? getProcessEnv('proxy')
|
||||
}
|
||||
if (!pnpmConfig.noProxy) {
|
||||
// @ts-expect-error
|
||||
pnpmConfig.noProxy = pnpmConfig['noproxy'] ?? getProcessEnv('no_proxy')
|
||||
}
|
||||
switch (pnpmConfig.nodeLinker) {
|
||||
|
|
@ -526,7 +535,7 @@ export async function getConfig (
|
|||
pnpmConfig.hooks = requireHooks(pnpmConfig.lockfileDir ?? pnpmConfig.dir, pnpmConfig)
|
||||
}
|
||||
pnpmConfig.rootProjectManifest = await safeReadProjectManifestOnly(pnpmConfig.lockfileDir ?? pnpmConfig.workspaceDir ?? pnpmConfig.dir) ?? undefined
|
||||
if (pnpmConfig.rootProjectManifest?.['workspaces']?.length && !pnpmConfig.workspaceDir) {
|
||||
if (pnpmConfig.rootProjectManifest?.workspaces?.length && !pnpmConfig.workspaceDir) {
|
||||
warnings.push('The "workspaces" field in package.json is not supported by pnpm. Create a "pnpm-workspace.yaml" file instead.')
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -588,6 +588,7 @@ test('read only supported settings from config', async () => {
|
|||
})
|
||||
|
||||
expect(config.storeDir).toEqual('__store__')
|
||||
// @ts-expect-error
|
||||
expect(config['foo']).toBeUndefined()
|
||||
expect(config.rawConfig['foo']).toEqual('bar')
|
||||
})
|
||||
|
|
@ -603,6 +604,7 @@ test('all CLI options are added to the config', async () => {
|
|||
},
|
||||
})
|
||||
|
||||
// @ts-expect-error
|
||||
expect(config['fooBar']).toEqual('qar')
|
||||
})
|
||||
|
||||
|
|
@ -858,7 +860,7 @@ test('getConfig() sets merge-git-branch-lockfiles when branch matches merge-git-
|
|||
|
||||
await fs.writeFile('.npmrc', npmrc, 'utf8')
|
||||
|
||||
getCurrentBranch['mockReturnValue']('develop')
|
||||
;(getCurrentBranch as jest.Mock).mockReturnValue('develop')
|
||||
const { config } = await getConfig({
|
||||
cliOptions: {
|
||||
global: false,
|
||||
|
|
@ -873,7 +875,7 @@ test('getConfig() sets merge-git-branch-lockfiles when branch matches merge-git-
|
|||
expect(config.mergeGitBranchLockfiles).toBe(false)
|
||||
}
|
||||
{
|
||||
getCurrentBranch['mockReturnValue']('main')
|
||||
(getCurrentBranch as jest.Mock).mockReturnValue('main')
|
||||
const { config } = await getConfig({
|
||||
cliOptions: {
|
||||
global: false,
|
||||
|
|
@ -886,7 +888,7 @@ test('getConfig() sets merge-git-branch-lockfiles when branch matches merge-git-
|
|||
expect(config.mergeGitBranchLockfiles).toBe(true)
|
||||
}
|
||||
{
|
||||
getCurrentBranch['mockReturnValue']('release/1.0.0')
|
||||
(getCurrentBranch as jest.Mock).mockReturnValue('release/1.0.0')
|
||||
const { config } = await getConfig({
|
||||
cliOptions: {
|
||||
global: false,
|
||||
|
|
|
|||
|
|
@ -36,5 +36,6 @@
|
|||
{
|
||||
"path": "../matcher"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@
|
|||
"src/**/*.ts",
|
||||
"../../__typings__/**/*.d.ts"
|
||||
],
|
||||
"references": []
|
||||
"references": [],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
{
|
||||
"path": "../../packages/types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import mem from 'mem'
|
|||
import * as execa from 'execa'
|
||||
|
||||
export function getSystemNodeVersionNonCached () {
|
||||
// @ts-expect-error
|
||||
if (process['pkg'] != null) {
|
||||
return execa.sync('node', ['--version']).stdout.toString()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,12 +8,14 @@ jest.mock('execa', () => ({
|
|||
}))
|
||||
|
||||
test('getSystemNodeVersion() executed from an executable pnpm CLI', () => {
|
||||
// @ts-expect-error
|
||||
process['pkg'] = {}
|
||||
expect(getSystemNodeVersionNonCached()).toBe('v10.0.0')
|
||||
expect(execa.sync).toHaveBeenCalledWith('node', ['--version'])
|
||||
})
|
||||
|
||||
test('getSystemNodeVersion() from a non-executable pnpm CLI', () => {
|
||||
// @ts-expect-error
|
||||
delete process['pkg']
|
||||
expect(getSystemNodeVersionNonCached()).toBe(process.version)
|
||||
})
|
||||
|
|
|
|||
|
|
@ -18,5 +18,6 @@
|
|||
{
|
||||
"path": "../../packages/types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,5 +15,6 @@
|
|||
{
|
||||
"path": "../../packages/parse-wanted-dependency"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
{
|
||||
"path": "../../packages/types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ export async function configSet (opts: ConfigCommandOptions, key: string, value:
|
|||
await writeIniFile(configPath, settings)
|
||||
}
|
||||
|
||||
async function safeReadIniFile (configPath: string) {
|
||||
async function safeReadIniFile (configPath: string): Promise<Record<string, unknown>> {
|
||||
try {
|
||||
return await readIniFile(configPath)
|
||||
return await readIniFile(configPath) as Record<string, unknown>
|
||||
} catch (err: any) { // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
if (err.code === 'ENOENT') return {}
|
||||
throw err
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@
|
|||
{
|
||||
"path": "../config"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ export async function fetchNode (fetch: FetchFromRegistry, version: string, targ
|
|||
})
|
||||
const cafs = createCafsStore(opts.cafsDir)
|
||||
const fetchTarball = pickFetcher(fetchers, { tarball })
|
||||
const { filesIndex } = await fetchTarball(cafs, { tarball }, {
|
||||
const { filesIndex } = await fetchTarball(cafs, { tarball } as any, { // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
lockfileDir: process.cwd(),
|
||||
})
|
||||
await cafs.importPackage(targetDir, {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ const fetchMock = jest.fn(async (url: string) => {
|
|||
})
|
||||
|
||||
beforeEach(() => {
|
||||
isNonGlibcLinux['mockReturnValue'](Promise.resolve(false))
|
||||
(isNonGlibcLinux as jest.Mock).mockReturnValue(Promise.resolve(false))
|
||||
fetchMock.mockClear()
|
||||
})
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ test('install Node using the default node mirror', async () => {
|
|||
})
|
||||
|
||||
test('install Node using a custom node mirror', async () => {
|
||||
isNonGlibcLinux['mockReturnValue'](Promise.resolve(true))
|
||||
(isNonGlibcLinux as jest.Mock).mockReturnValue(Promise.resolve(true))
|
||||
tempDir()
|
||||
|
||||
const opts: FetchNodeOptions = {
|
||||
|
|
|
|||
|
|
@ -33,5 +33,6 @@
|
|||
{
|
||||
"path": "../../store/create-cafs-store"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,6 @@
|
|||
{
|
||||
"path": "../node.fetcher"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,5 +36,6 @@
|
|||
{
|
||||
"path": "../node.resolver"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,9 +47,10 @@ export async function buildModules (
|
|||
}
|
||||
// postinstall hooks
|
||||
|
||||
const buildDepOpts = { ...opts, warn }
|
||||
if (opts.hoistedLocations) {
|
||||
buildDepOpts['builtHoistedDeps'] = {}
|
||||
const buildDepOpts = {
|
||||
...opts,
|
||||
builtHoistedDeps: opts.hoistedLocations ? {} : undefined,
|
||||
warn,
|
||||
}
|
||||
const chunks = buildSequence(depGraph, rootDepPaths)
|
||||
const groups = chunks.map((chunk) => {
|
||||
|
|
|
|||
|
|
@ -36,5 +36,6 @@
|
|||
{
|
||||
"path": "../lifecycle"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json'
|
|||
import exists from 'path-exists'
|
||||
import { runLifecycleHook, RunLifecycleHookOptions } from './runLifecycleHook'
|
||||
import { runLifecycleHooksConcurrently, RunLifecycleHooksConcurrentlyOptions } from './runLifecycleHooksConcurrently'
|
||||
import { PackageScripts } from '@pnpm/types'
|
||||
|
||||
export function makeNodeRequireOption (modulePath: string) {
|
||||
let { NODE_OPTIONS } = process.env
|
||||
|
|
@ -51,9 +52,9 @@ export async function runPostinstallHooks (
|
|||
*/
|
||||
async function checkBindingGyp (
|
||||
root: string,
|
||||
scripts: {}
|
||||
scripts: PackageScripts
|
||||
) {
|
||||
if (await exists(path.join(root, 'binding.gyp'))) {
|
||||
scripts['install'] = 'node-gyp rebuild'
|
||||
scripts.install = 'node-gyp rebuild'
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,5 +30,6 @@
|
|||
{
|
||||
"path": "../../store/store-controller-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ export async function extendRebuildOptions (
|
|||
): Promise<StrictRebuildOptions> {
|
||||
if (opts) {
|
||||
for (const key in opts) {
|
||||
if (opts[key] === undefined) {
|
||||
delete opts[key]
|
||||
if (opts[key as keyof RebuildOptions] === undefined) {
|
||||
delete opts[key as keyof RebuildOptions]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,5 +81,6 @@
|
|||
{
|
||||
"path": "../lifecycle"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -436,7 +436,7 @@ test('pnpm exec on single project should return non-zero exit code when the proc
|
|||
selectedProjectsGraph: {},
|
||||
}, ['node'])
|
||||
|
||||
expect(runResult['exitCode']).toBe(1)
|
||||
expect(runResult).toHaveProperty(['exitCode'], 1)
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -54,5 +54,6 @@
|
|||
{
|
||||
"path": "../lifecycle"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,5 +24,6 @@
|
|||
{
|
||||
"path": "../lifecycle"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@
|
|||
"src/**/*.ts",
|
||||
"../../__typings__/**/*.d.ts"
|
||||
],
|
||||
"references": []
|
||||
"references": [],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@
|
|||
{
|
||||
"path": "../fetcher-base"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,6 @@
|
|||
{
|
||||
"path": "../../store/cafs-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,5 +24,6 @@
|
|||
{
|
||||
"path": "../fetcher-base"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ export function pickFetcher (fetcherByHostingType: Partial<Fetchers>, resolution
|
|||
}
|
||||
}
|
||||
|
||||
const fetch = fetcherByHostingType[fetcherType!]
|
||||
const fetch = fetcherByHostingType[fetcherType! as keyof Fetchers]
|
||||
|
||||
if (!fetch) {
|
||||
throw new Error(`Fetching for dependency type "${resolution.type ?? 'undefined'}" is not supported`)
|
||||
|
|
|
|||
|
|
@ -15,5 +15,6 @@
|
|||
{
|
||||
"path": "../fetcher-base"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ async function fetchFromLocalTarball (
|
|||
sri: err['sri'],
|
||||
url: tarball,
|
||||
})
|
||||
// @ts-expect-error
|
||||
error['resource'] = tarball
|
||||
throw error
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,5 +39,6 @@
|
|||
{
|
||||
"path": "../fetcher-base"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,5 +15,6 @@
|
|||
{
|
||||
"path": "../../pkg-manifest/read-project-manifest"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@
|
|||
"src/**/*.ts",
|
||||
"../../__typings__/**/*.d.ts"
|
||||
],
|
||||
"references": []
|
||||
"references": [],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
{
|
||||
"path": "../../__utils__/prepare"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,12 +99,12 @@ async function tryImportIndexedDir (importFile: ImportFile, newDir: string, file
|
|||
|
||||
function getUniqueFileMap (fileMap: Record<string, string>) {
|
||||
const lowercaseFiles = new Map<string, string>()
|
||||
const conflictingFileNames = {}
|
||||
const uniqueFileMap = {}
|
||||
const conflictingFileNames: Record<string, string> = {}
|
||||
const uniqueFileMap: Record<string, string> = {}
|
||||
for (const filename of Object.keys(fileMap).sort()) {
|
||||
const lowercaseFilename = filename.toLowerCase()
|
||||
if (lowercaseFiles.has(lowercaseFilename)) {
|
||||
conflictingFileNames[filename] = lowercaseFiles.get(lowercaseFilename)
|
||||
conflictingFileNames[filename] = lowercaseFiles.get(lowercaseFilename)!
|
||||
continue
|
||||
}
|
||||
lowercaseFiles.set(lowercaseFilename, filename)
|
||||
|
|
|
|||
|
|
@ -128,9 +128,7 @@ test('packageImportMethod=hardlink: fall back to copying if hardlinking fails',
|
|||
const importPackage = createIndexedPkgImporter('hardlink')
|
||||
fsMock.promises.link = jest.fn((src: string, dest: string) => {
|
||||
if (dest.endsWith('license')) {
|
||||
const err = new Error('')
|
||||
err['code'] = 'EEXIST'
|
||||
throw err
|
||||
throw Object.assign(new Error(''), { code: 'EEXIST' })
|
||||
}
|
||||
throw new Error('This file system does not support hard linking')
|
||||
})
|
||||
|
|
@ -207,9 +205,7 @@ test('packageImportMethod=hardlink links packages when they are not found', asyn
|
|||
fsMock.promises.rename = jest.fn()
|
||||
fsMock.promises.stat = jest.fn((file) => {
|
||||
if (file === path.join('project/package', 'package.json')) {
|
||||
const err = new Error()
|
||||
err['code'] = 'ENOENT'
|
||||
throw err
|
||||
throw Object.assign(new Error(), { code: 'ENOENT' })
|
||||
}
|
||||
return { ino: 0 }
|
||||
})
|
||||
|
|
|
|||
|
|
@ -18,5 +18,6 @@
|
|||
{
|
||||
"path": "../../store/store-controller-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@
|
|||
"src/**/*.ts",
|
||||
"../../__typings__/**/*.d.ts"
|
||||
],
|
||||
"references": []
|
||||
"references": [],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,6 @@
|
|||
{
|
||||
"path": "../../packages/types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,16 +60,16 @@ export function requireHooks (
|
|||
filterLog: [],
|
||||
readPackage: [],
|
||||
}
|
||||
for (const hookName of ['readPackage', 'afterAllResolved']) {
|
||||
for (const hookName of ['readPackage', 'afterAllResolved'] as const) {
|
||||
if (globalHooks[hookName]) {
|
||||
const globalHook = globalHooks[hookName]
|
||||
const context = createReadPackageHookContext(globalPnpmfile.filename, prefix, hookName)
|
||||
cookedHooks[hookName].push((pkg: object) => globalHook(pkg, context))
|
||||
cookedHooks[hookName]!.push((pkg: object) => globalHook!(pkg as any, context)) // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
}
|
||||
if (hooks[hookName]) {
|
||||
const hook = hooks[hookName]
|
||||
const context = createReadPackageHookContext(pnpmFile.filename, prefix, hookName)
|
||||
cookedHooks[hookName].push((pkg: object) => hook(pkg, context))
|
||||
cookedHooks[hookName]!.push((pkg: object) => hook!(pkg as any, context)) // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
}
|
||||
}
|
||||
if (globalHooks.filterLog != null) {
|
||||
|
|
|
|||
|
|
@ -30,5 +30,6 @@
|
|||
{
|
||||
"path": "../../store/store-controller-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@ function extendPkgHook (extensionsByPkgName: Record<string, PackageExtensionMatc
|
|||
function extendPkg (manifest: PackageManifest, extensions: PackageExtensionMatch[]) {
|
||||
for (const { range, packageExtension } of extensions) {
|
||||
if (range != null && !semver.satisfies(manifest.version, range)) continue
|
||||
for (const field of ['dependencies', 'optionalDependencies', 'peerDependencies', 'peerDependenciesMeta']) {
|
||||
for (const field of ['dependencies', 'optionalDependencies', 'peerDependencies', 'peerDependenciesMeta'] as const) {
|
||||
if (!packageExtension[field]) continue
|
||||
manifest[field] = {
|
||||
...packageExtension[field],
|
||||
...manifest[field],
|
||||
}
|
||||
} as any // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import { ProjectManifest } from '@pnpm/types'
|
||||
import { createPeerDependencyPatcher } from '../lib/createPeerDependencyPatcher'
|
||||
|
||||
test('createPeerDependencyPatcher() ignores missing', () => {
|
||||
|
|
@ -9,8 +10,8 @@ test('createPeerDependencyPatcher() ignores missing', () => {
|
|||
foo: '*',
|
||||
bar: '*',
|
||||
},
|
||||
})
|
||||
expect(patchedPkg['peerDependenciesMeta']).toStrictEqual({
|
||||
}) as ProjectManifest
|
||||
expect(patchedPkg.peerDependenciesMeta).toStrictEqual({
|
||||
foo: {
|
||||
optional: true,
|
||||
},
|
||||
|
|
@ -26,8 +27,8 @@ test('createPeerDependencyPatcher() pattern matches to ignore missing', () => {
|
|||
foobar: '*',
|
||||
bar: '*',
|
||||
},
|
||||
})
|
||||
expect(patchedPkg['peerDependenciesMeta']).toStrictEqual({
|
||||
}) as ProjectManifest
|
||||
expect(patchedPkg.peerDependenciesMeta).toStrictEqual({
|
||||
foobar: {
|
||||
optional: true,
|
||||
},
|
||||
|
|
@ -49,8 +50,8 @@ test('createPeerDependencyPatcher() extends peer ranges', () => {
|
|||
qar: '*',
|
||||
baz: '1',
|
||||
},
|
||||
})
|
||||
expect(patchedPkg['peerDependencies']).toStrictEqual({
|
||||
}) as ProjectManifest
|
||||
expect(patchedPkg.peerDependencies).toStrictEqual({
|
||||
foo: '0 || 1',
|
||||
bar: '0',
|
||||
qar: '*',
|
||||
|
|
@ -69,8 +70,8 @@ test('createPeerDependencyPatcher() ignores peer versions from allowAny', () =>
|
|||
qar: '2',
|
||||
baz: '2',
|
||||
},
|
||||
})
|
||||
expect(patchedPkg['peerDependencies']).toStrictEqual({
|
||||
}) as ProjectManifest
|
||||
expect(patchedPkg.peerDependencies).toStrictEqual({
|
||||
foo: '*',
|
||||
bar: '*',
|
||||
qar: '2',
|
||||
|
|
@ -102,8 +103,8 @@ test('createPeerDependencyPatcher() does not create duplicate extended ranges',
|
|||
// double apply the same patch to the same package
|
||||
// this can occur in a monorepo when several packages
|
||||
// all try to apply the same patch
|
||||
const patchedAgainPkg = patcher(await patchedPkg)
|
||||
expect(patchedAgainPkg['peerDependencies']).toStrictEqual({
|
||||
const patchedAgainPkg = patcher(await patchedPkg) as ProjectManifest
|
||||
expect(patchedAgainPkg.peerDependencies).toStrictEqual({
|
||||
// the patch is applied only once (not 0 || 1 || 1)
|
||||
foo: '0 || 1',
|
||||
same: '12',
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@
|
|||
{
|
||||
"path": "../../packages/types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import path from 'path'
|
||||
import { Lockfile } from '@pnpm/lockfile-types'
|
||||
import { Lockfile, TarballResolution } from '@pnpm/lockfile-types'
|
||||
import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
|
||||
import { lockfileWalkerGroupImporterSteps, LockfileWalkerStep } from '@pnpm/lockfile-walker'
|
||||
import { DependenciesField } from '@pnpm/types'
|
||||
|
|
@ -29,7 +29,7 @@ export async function lockfileToAuditTree (
|
|||
}
|
||||
): Promise<AuditTree> {
|
||||
const importerWalkers = lockfileWalkerGroupImporterSteps(lockfile, Object.keys(lockfile.importers), { include: opts?.include })
|
||||
const dependencies = {}
|
||||
const dependencies: Record<string, AuditNode> = {}
|
||||
await Promise.all(
|
||||
importerWalkers.map(async (importerWalker) => {
|
||||
const importerDeps = lockfileToAuditNode(importerWalker.step)
|
||||
|
|
@ -39,6 +39,7 @@ export async function lockfileToAuditTree (
|
|||
const { manifest } = await readProjectManifest(path.join(opts.lockfileDir, importerWalker.importerId))
|
||||
dependencies[depName] = {
|
||||
dependencies: importerDeps,
|
||||
dev: false,
|
||||
requires: toRequires(importerDeps),
|
||||
version: manifest.version ?? '0.0.0',
|
||||
}
|
||||
|
|
@ -59,14 +60,14 @@ export async function lockfileToAuditTree (
|
|||
return auditTree
|
||||
}
|
||||
|
||||
function lockfileToAuditNode (step: LockfileWalkerStep) {
|
||||
const dependencies = {}
|
||||
function lockfileToAuditNode (step: LockfileWalkerStep): Record<string, AuditNode> {
|
||||
const dependencies: Record<string, AuditNode> = {}
|
||||
for (const { depPath, pkgSnapshot, next } of step.dependencies) {
|
||||
const { name, version } = nameVerFromPkgSnapshot(depPath, pkgSnapshot)
|
||||
const subdeps = lockfileToAuditNode(next())
|
||||
const dep: AuditNode = {
|
||||
dev: pkgSnapshot.dev === true,
|
||||
integrity: pkgSnapshot.resolution['integrity'],
|
||||
integrity: (pkgSnapshot.resolution as TarballResolution).integrity,
|
||||
version,
|
||||
}
|
||||
if (Object.keys(subdeps).length > 0) {
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ describe('audit', () => {
|
|||
version: '1.0.0',
|
||||
},
|
||||
},
|
||||
dev: false,
|
||||
requires: {
|
||||
foo: '1.0.0',
|
||||
},
|
||||
|
|
@ -125,6 +126,7 @@ describe('audit', () => {
|
|||
version: '1.0.0',
|
||||
},
|
||||
},
|
||||
dev: false,
|
||||
requires: {
|
||||
foo: '1.0.0',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -45,5 +45,6 @@
|
|||
{
|
||||
"path": "../lockfile-walker"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,5 +33,6 @@
|
|||
{
|
||||
"path": "../lockfile-walker"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ function revertProjectSnapshot (from: InlineSpecifiersProjectSnapshot): ProjectS
|
|||
}
|
||||
|
||||
function mapValues<T, U> (obj: Record<string, T>, mapper: (val: T, key: string) => U): Record<string, U> {
|
||||
const result = {}
|
||||
const result: Record<string, U> = {}
|
||||
for (const [key, value] of Object.entries(obj)) {
|
||||
result[key] = mapper(value, key)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ export function createLockfileObject (
|
|||
specifiers: {},
|
||||
}
|
||||
return acc
|
||||
}, {})
|
||||
}, {} as Lockfile['importers'])
|
||||
return {
|
||||
importers,
|
||||
lockfileVersion: opts.lockfileVersion || LOCKFILE_VERSION,
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@ export function sortLockfileKeys (lockfile: LockfileFile) {
|
|||
})
|
||||
}
|
||||
}
|
||||
for (const key of ['specifiers', 'dependencies', 'devDependencies', 'optionalDependencies', 'time']) {
|
||||
for (const key of ['specifiers', 'dependencies', 'devDependencies', 'optionalDependencies', 'time'] as const) {
|
||||
if (!lockfile[key]) continue
|
||||
lockfile[key] = sortKeys(lockfile[key])
|
||||
lockfile[key] = sortKeys(lockfile[key]!)
|
||||
}
|
||||
return sortKeys(lockfile, { compare: compareRootKeys })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,9 +177,8 @@ function pruneTimeInLockfileV6 (time: Record<string, string>, importers: Record<
|
|||
for (const importer of Object.values(importers)) {
|
||||
for (const depType of DEPENDENCIES_FIELDS) {
|
||||
for (let [depName, ref] of Object.entries(importer[depType] ?? {})) {
|
||||
if (ref['version']) {
|
||||
ref = ref['version']
|
||||
}
|
||||
// @ts-expect-error
|
||||
if (ref['version']) ref = ref['version']
|
||||
const suffixStart = ref.indexOf('(')
|
||||
const refWithoutPeerSuffix = suffixStart === -1 ? ref : ref.slice(0, suffixStart)
|
||||
const depPath = refToRelative(refWithoutPeerSuffix, depName)
|
||||
|
|
@ -212,9 +211,8 @@ function pruneTime (time: Record<string, string>, importers: Record<string, Proj
|
|||
for (const importer of Object.values(importers)) {
|
||||
for (const depType of DEPENDENCIES_FIELDS) {
|
||||
for (let [depName, ref] of Object.entries(importer[depType] ?? {})) {
|
||||
if (ref['version']) {
|
||||
ref = ref['version']
|
||||
}
|
||||
// @ts-expect-error
|
||||
if (ref['version']) ref = ref['version']
|
||||
const suffixStart = ref.indexOf('_')
|
||||
const refWithoutPeerSuffix = suffixStart === -1 ? ref : ref.slice(0, suffixStart)
|
||||
const depPath = dp.refToRelative(refWithoutPeerSuffix, depName)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ jest.mock('@pnpm/git-utils', () => ({ getCurrentBranch: jest.fn() }))
|
|||
|
||||
describe('lockfileName', () => {
|
||||
afterEach(() => {
|
||||
getCurrentBranch['mockReset']()
|
||||
(getCurrentBranch as jest.Mock).mockReset()
|
||||
})
|
||||
|
||||
test('returns default lockfile name if useGitBranchLockfile is off', async () => {
|
||||
|
|
@ -14,17 +14,17 @@ describe('lockfileName', () => {
|
|||
})
|
||||
|
||||
test('returns git branch lockfile name', async () => {
|
||||
getCurrentBranch['mockReturnValue']('main')
|
||||
(getCurrentBranch as jest.Mock).mockReturnValue('main')
|
||||
await expect(getWantedLockfileName({ useGitBranchLockfile: true })).resolves.toBe('pnpm-lock.main.yaml')
|
||||
})
|
||||
|
||||
test('returns git branch lockfile name when git branch contains clashes', async () => {
|
||||
getCurrentBranch['mockReturnValue']('a/b/c')
|
||||
(getCurrentBranch as jest.Mock).mockReturnValue('a/b/c')
|
||||
await expect(getWantedLockfileName({ useGitBranchLockfile: true })).resolves.toBe('pnpm-lock.a!b!c.yaml')
|
||||
})
|
||||
|
||||
test('returns git branch lockfile name when git branch contains uppercase', async () => {
|
||||
getCurrentBranch['mockReturnValue']('aBc')
|
||||
(getCurrentBranch as jest.Mock).mockReturnValue('aBc')
|
||||
await expect(getWantedLockfileName({ useGitBranchLockfile: true })).resolves.toBe('pnpm-lock.abc.yaml')
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ test('existsWantedLockfile()', async () => {
|
|||
})
|
||||
|
||||
test('readWantedLockfile() when useGitBranchLockfile', async () => {
|
||||
getCurrentBranch['mockReturnValue']('branch')
|
||||
(getCurrentBranch as jest.Mock).mockReturnValue('branch')
|
||||
const lockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
||||
ignoreIncompatible: false,
|
||||
})
|
||||
|
|
@ -236,7 +236,7 @@ test('readWantedLockfile() when useGitBranchLockfile', async () => {
|
|||
})
|
||||
|
||||
test('readWantedLockfile() when useGitBranchLockfile and mergeGitBranchLockfiles', async () => {
|
||||
getCurrentBranch['mockReturnValue']('branch')
|
||||
(getCurrentBranch as jest.Mock).mockReturnValue('branch')
|
||||
const lockfile = await readWantedLockfile(path.join('fixtures', '6'), {
|
||||
ignoreIncompatible: false,
|
||||
useGitBranchLockfile: true,
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ test('writeLockfiles() does not fail if the lockfile has undefined properties',
|
|||
|
||||
test('writeLockfiles() when useGitBranchLockfile', async () => {
|
||||
const branchName: string = 'branch'
|
||||
getCurrentBranch['mockReturnValue'](branchName)
|
||||
;(getCurrentBranch as jest.Mock).mockReturnValue(branchName)
|
||||
const projectPath = tempy.directory()
|
||||
const wantedLockfile = {
|
||||
importers: {
|
||||
|
|
|
|||
|
|
@ -30,5 +30,6 @@
|
|||
{
|
||||
"path": "../merge-lockfile-changes"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@
|
|||
{
|
||||
"path": "../lockfile-utils"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ export interface PackageSnapshot {
|
|||
}
|
||||
transitivePeerDependencies?: string[]
|
||||
bundledDependencies?: string[]
|
||||
engines?: {
|
||||
engines?: Record<string, string> & {
|
||||
node: string
|
||||
}
|
||||
os?: string[]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"extends": "@pnpm/tsconfig",
|
||||
"composite": true,
|
||||
"compilerOptions": {
|
||||
"outDir": "lib",
|
||||
"rootDir": "src"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import path from 'path'
|
||||
import { Lockfile } from '@pnpm/lockfile-types'
|
||||
import { Lockfile, TarballResolution } from '@pnpm/lockfile-types'
|
||||
import { depPathToFilename } from '@pnpm/dependency-path'
|
||||
|
||||
type GetLocalLocations = (depPath: string, pkgName: string) => string[]
|
||||
|
|
@ -19,7 +19,7 @@ export function extendProjectsWithTargetDirs<T> (
|
|||
Object.fromEntries(projects.map((project) => [project.id, { ...project, targetDirs: [] as string[] }]))
|
||||
Object.entries(lockfile.packages ?? {})
|
||||
.forEach(([depPath, pkg]) => {
|
||||
if (pkg.resolution?.['type'] !== 'directory') return
|
||||
if ((pkg.resolution as TarballResolution)?.type !== 'directory') return
|
||||
const pkgId = pkg.id ?? depPath
|
||||
const importerId = pkgId.replace(/^file:/, '')
|
||||
if (projectsById[importerId] == null) return
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import url from 'url'
|
||||
import { PackageSnapshot } from '@pnpm/lockfile-types'
|
||||
import { PackageSnapshot, TarballResolution } from '@pnpm/lockfile-types'
|
||||
import { Resolution } from '@pnpm/resolver-base'
|
||||
import { Registries } from '@pnpm/types'
|
||||
import * as dp from '@pnpm/dependency-path'
|
||||
|
|
@ -11,18 +11,21 @@ export function pkgSnapshotToResolution (
|
|||
pkgSnapshot: PackageSnapshot,
|
||||
registries: Registries
|
||||
): Resolution {
|
||||
if (pkgSnapshot.resolution['type'] || pkgSnapshot.resolution['tarball']?.startsWith('file:')) {
|
||||
if (
|
||||
Boolean((pkgSnapshot.resolution as TarballResolution).type) ||
|
||||
(pkgSnapshot.resolution as TarballResolution).tarball?.startsWith('file:')
|
||||
) {
|
||||
return pkgSnapshot.resolution as Resolution
|
||||
}
|
||||
const { name } = nameVerFromPkgSnapshot(depPath, pkgSnapshot)
|
||||
const registry: string = pkgSnapshot.resolution['registry'] ||
|
||||
const registry: string = (pkgSnapshot.resolution as TarballResolution).registry || // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing
|
||||
(name[0] === '@' && registries[name.split('/')[0]]) ||
|
||||
registries.default
|
||||
let tarball!: string
|
||||
if (!pkgSnapshot.resolution['tarball']) {
|
||||
if (!(pkgSnapshot.resolution as TarballResolution).tarball) {
|
||||
tarball = getTarball(registry)
|
||||
} else {
|
||||
tarball = new url.URL(pkgSnapshot.resolution['tarball'],
|
||||
tarball = new url.URL((pkgSnapshot.resolution as TarballResolution).tarball,
|
||||
registry.endsWith('/') ? registry : `${registry}/`
|
||||
).toString()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@
|
|||
{
|
||||
"path": "../lockfile-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,6 @@
|
|||
{
|
||||
"path": "../lockfile-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { Lockfile } from '@pnpm/lockfile-types'
|
||||
import { Lockfile, PackageSnapshot, PackageSnapshots } from '@pnpm/lockfile-types'
|
||||
import comverToSemver from 'comver-to-semver'
|
||||
import semver from 'semver'
|
||||
|
||||
|
|
@ -14,13 +14,13 @@ export function mergeLockfileChanges (ours: Lockfile, theirs: Lockfile) {
|
|||
newLockfile.importers[importerId] = {
|
||||
specifiers: {},
|
||||
}
|
||||
for (const key of ['dependencies', 'devDependencies', 'optionalDependencies']) {
|
||||
for (const key of ['dependencies', 'devDependencies', 'optionalDependencies'] as const) {
|
||||
newLockfile.importers[importerId][key] = mergeDict(
|
||||
ours.importers[importerId]?.[key] ?? {},
|
||||
theirs.importers[importerId]?.[key] ?? {},
|
||||
mergeVersions
|
||||
)
|
||||
if (Object.keys(newLockfile.importers[importerId][key]).length === 0) {
|
||||
if (Object.keys(newLockfile.importers[importerId][key] ?? {}).length === 0) {
|
||||
delete newLockfile.importers[importerId][key]
|
||||
}
|
||||
}
|
||||
|
|
@ -31,7 +31,7 @@ export function mergeLockfileChanges (ours: Lockfile, theirs: Lockfile) {
|
|||
)
|
||||
}
|
||||
|
||||
const packages = {}
|
||||
const packages: PackageSnapshots = {}
|
||||
for (const depPath of Array.from(new Set([...Object.keys(ours.packages ?? {}), ...Object.keys(theirs.packages ?? {})]))) {
|
||||
const ourPkg = ours.packages?.[depPath]
|
||||
const theirPkg = theirs.packages?.[depPath]
|
||||
|
|
@ -39,17 +39,17 @@ export function mergeLockfileChanges (ours: Lockfile, theirs: Lockfile) {
|
|||
...ourPkg,
|
||||
...theirPkg,
|
||||
}
|
||||
for (const key of ['dependencies', 'optionalDependencies']) {
|
||||
for (const key of ['dependencies', 'optionalDependencies'] as const) {
|
||||
pkg[key] = mergeDict(
|
||||
ourPkg?.[key] ?? {},
|
||||
theirPkg?.[key] ?? {},
|
||||
mergeVersions
|
||||
)
|
||||
if (Object.keys(pkg[key]).length === 0) {
|
||||
if (Object.keys(pkg[key] ?? {}).length === 0) {
|
||||
delete pkg[key]
|
||||
}
|
||||
}
|
||||
packages[depPath] = pkg
|
||||
packages[depPath] = pkg as PackageSnapshot
|
||||
}
|
||||
newLockfile.packages = packages
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ function mergeDict<T> (
|
|||
theirDict: Record<string, T>,
|
||||
valueMerger: ValueMerger<T>
|
||||
) {
|
||||
const newDict = {}
|
||||
const newDict: Record<string, T> = {}
|
||||
for (const key of Object.keys(ourDict).concat(Object.keys(theirDict))) {
|
||||
const changedValue = valueMerger(
|
||||
ourDict[key],
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
{
|
||||
"path": "../lockfile-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
"extends": "@pnpm/tsconfig",
|
||||
"compilerOptions": {
|
||||
"outDir": "lib",
|
||||
"rootDir": "src"
|
||||
"rootDir": "src",
|
||||
"suppressImplicitAnyIndexErrors": true
|
||||
},
|
||||
"include": [
|
||||
"src/**/*.ts",
|
||||
|
|
@ -42,5 +43,6 @@
|
|||
{
|
||||
"path": "../lockfile-file"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,18 +52,18 @@ export function pruneLockfile (
|
|||
const optionalDependencies = Object.keys(pkg.optionalDependencies ?? {})
|
||||
const dependencies = difference(Object.keys(pkg.dependencies ?? {}), optionalDependencies)
|
||||
const devDependencies = difference(difference(Object.keys(pkg.devDependencies ?? {}), optionalDependencies), dependencies)
|
||||
const allDeps = [
|
||||
const allDeps = new Set([
|
||||
...optionalDependencies,
|
||||
...devDependencies,
|
||||
...dependencies,
|
||||
]
|
||||
])
|
||||
const specifiers: ResolvedDependencies = {}
|
||||
const lockfileDependencies: ResolvedDependencies = {}
|
||||
const lockfileOptionalDependencies: ResolvedDependencies = {}
|
||||
const lockfileDevDependencies: ResolvedDependencies = {}
|
||||
|
||||
Object.entries(lockfileSpecs).forEach(([depName, spec]) => {
|
||||
if (!allDeps.includes(depName)) return
|
||||
if (!allDeps.has(depName)) return
|
||||
specifiers[depName] = spec
|
||||
if (importer.dependencies?.[depName]) {
|
||||
lockfileDependencies[depName] = importer.dependencies[depName]
|
||||
|
|
@ -79,7 +79,7 @@ export function pruneLockfile (
|
|||
!lockfileDependencies[alias] && dep.startsWith('link:') &&
|
||||
// If the linked dependency was removed from package.json
|
||||
// then it is removed from pnpm-lock.yaml as well
|
||||
!(lockfileSpecs[alias] && !allDeps[alias])
|
||||
!(lockfileSpecs[alias] && !allDeps.has(alias))
|
||||
) {
|
||||
lockfileDependencies[alias] = dep
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,5 +21,6 @@
|
|||
{
|
||||
"path": "../lockfile-types"
|
||||
}
|
||||
]
|
||||
],
|
||||
"composite": true
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue