diff --git a/lib/manager/common.ts b/lib/manager/common.ts index 64e820e9300ff7..1cb67931e68cba 100644 --- a/lib/manager/common.ts +++ b/lib/manager/common.ts @@ -90,7 +90,7 @@ export interface PackageFile> packageFile?: string; packageJsonName?: string; packageJsonType?: 'app' | 'library'; - packageJsonVersion?: string; + packageFileVersion?: string; parent?: string; skipInstalls?: boolean; yarnrc?: string; @@ -115,7 +115,7 @@ export interface Package extends ManagerData { // npm manager bumpVersion?: ReleaseType | string; npmPackageAlias?: boolean; - packageJsonVersion?: string; + packageFileVersion?: string; gitRef?: boolean; sourceUrl?: string; githubRepo?: string; diff --git a/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap b/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap index 2348619b2935c3..0561a3cab00353 100644 --- a/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap +++ b/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap @@ -17,9 +17,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": undefined, "packageJsonName": undefined, "packageJsonType": "app", - "packageJsonVersion": undefined, "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -133,9 +133,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": undefined, "packageJsonName": undefined, "packageJsonType": "library", - "packageJsonVersion": undefined, "pnpmShrinkwrap": undefined, "skipInstalls": false, "yarnLock": undefined, @@ -295,9 +295,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": undefined, "packageJsonName": undefined, "packageJsonType": "app", - "packageJsonVersion": undefined, "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -343,9 +343,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": undefined, "packageJsonName": undefined, "packageJsonType": "app", - "packageJsonVersion": undefined, "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -408,9 +408,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": undefined, "packageJsonName": undefined, "packageJsonType": "library", - "packageJsonVersion": undefined, "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -467,9 +467,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": undefined, "packageJsonName": undefined, "packageJsonType": "library", - "packageJsonVersion": undefined, "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -602,9 +602,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": "1.0.0", "packageJsonName": "renovate", "packageJsonType": "app", - "packageJsonVersion": "1.0.0", "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -737,9 +737,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": "1.0.0", "packageJsonName": "renovate", "packageJsonType": "app", - "packageJsonVersion": "1.0.0", "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -872,9 +872,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": "1.0.0", "packageJsonName": "renovate", "packageJsonType": "app", - "packageJsonVersion": "1.0.0", "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": "yarn.lock", @@ -893,9 +893,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": "0.0.8", "packageJsonName": "@a/b", "packageJsonType": "app", - "packageJsonVersion": "0.0.8", "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -1030,9 +1030,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": "1.0.0", "packageJsonName": "renovate", "packageJsonType": "app", - "packageJsonVersion": "1.0.0", "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -1051,9 +1051,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": "0.0.8", "packageJsonName": "@a/b", "packageJsonType": "app", - "packageJsonVersion": "0.0.8", "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, @@ -1188,9 +1188,9 @@ Object { "lernaPackages": undefined, "npmLock": undefined, "npmrc": undefined, + "packageFileVersion": "1.0.0", "packageJsonName": "renovate", "packageJsonType": "app", - "packageJsonVersion": "1.0.0", "pnpmShrinkwrap": undefined, "skipInstalls": true, "yarnLock": undefined, diff --git a/lib/manager/npm/extract/index.ts b/lib/manager/npm/extract/index.ts index af87571eb37ca8..0532e1cb86dcfe 100644 --- a/lib/manager/npm/extract/index.ts +++ b/lib/manager/npm/extract/index.ts @@ -64,7 +64,7 @@ export async function extractPackageFile( logger.debug( `npm file ${fileName} has name ${JSON.stringify(packageJsonName)}` ); - const packageJsonVersion = packageJson.version; + const packageFileVersion = packageJson.version; let yarnWorkspacesPackages: string[]; if (is.array(packageJson.workspaces)) { yarnWorkspacesPackages = packageJson.workspaces; @@ -325,7 +325,7 @@ export async function extractPackageFile( if ( !( packageJsonName || - packageJsonVersion || + packageFileVersion || npmrc || lernaDir || yarnWorkspacesPackages @@ -352,7 +352,7 @@ export async function extractPackageFile( return { deps, packageJsonName, - packageJsonVersion, + packageFileVersion, packageJsonType, npmrc, ignoreNpmrcFile, diff --git a/lib/manager/npm/update.ts b/lib/manager/npm/update.ts index 7eed581aec6105..9ec6d21a43751f 100644 --- a/lib/manager/npm/update.ts +++ b/lib/manager/npm/update.ts @@ -91,7 +91,7 @@ export function updateDependency({ logger.trace('Version is already updated'); return bumpPackageVersion( fileContent, - upgrade.packageJsonVersion, + upgrade.packageFileVersion, upgrade.bumpVersion ); } @@ -182,7 +182,7 @@ export function updateDependency({ } return bumpPackageVersion( newFileContent, - upgrade.packageJsonVersion, + upgrade.packageFileVersion, upgrade.bumpVersion ); } catch (err) { diff --git a/lib/workers/repository/extract/__snapshots__/manager-files.spec.ts.snap b/lib/workers/repository/extract/__snapshots__/manager-files.spec.ts.snap index 820b3ed43be33d..d6d8b83fa14de3 100644 --- a/lib/workers/repository/extract/__snapshots__/manager-files.spec.ts.snap +++ b/lib/workers/repository/extract/__snapshots__/manager-files.spec.ts.snap @@ -21,9 +21,9 @@ Array [ "npmLock": undefined, "npmrc": undefined, "packageFile": "package.json", + "packageFileVersion": undefined, "packageJsonName": undefined, "packageJsonType": "app", - "packageJsonVersion": undefined, "pnpmShrinkwrap": undefined, "skipInstalls": undefined, "yarnLock": undefined,