Skip to content

Commit

Permalink
refactor: convert all path to upath (#7712)
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed Nov 12, 2020
1 parent 14fd32a commit 5d99ff9
Show file tree
Hide file tree
Showing 44 changed files with 98 additions and 95 deletions.
10 changes: 5 additions & 5 deletions lib/config/file.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import path from 'path';
import upath from 'upath';
import customConfig from './config/__fixtures__/file';
import * as file from './file';

Expand All @@ -11,7 +11,7 @@ describe('config/file', () => {
);
});
it('parses custom config file', () => {
const configFile = path.resolve(
const configFile = upath.resolve(
__dirname,
'./config/__fixtures__/file.js'
);
Expand All @@ -20,7 +20,7 @@ describe('config/file', () => {
);
});
it('migrates', () => {
const configFile = path.resolve(
const configFile = upath.resolve(
__dirname,
'./config/__fixtures__/file2.js'
);
Expand All @@ -29,7 +29,7 @@ describe('config/file', () => {
expect(res.rangeStrategy).toEqual('bump');
});
it('informs user when error in parsing config.js', () => {
const configFile = path.resolve(
const configFile = upath.resolve(
__dirname,
'./config/__fixtures__/file3.ts'
);
Expand All @@ -53,7 +53,7 @@ describe('config/file', () => {
});
});
it('handles when invalid file location is provided', () => {
const configFile = path.resolve(
const configFile = upath.resolve(
__dirname,
'./config/__fixtures__/file4.ts'
);
Expand Down
4 changes: 2 additions & 2 deletions lib/config/file.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import path from 'path';
import upath from 'upath';
import { logger } from '../logger';
import { RenovateConfig } from './common';
import { migrateConfig } from './migration';

export function getConfig(env: NodeJS.ProcessEnv): RenovateConfig {
let configFile = env.RENOVATE_CONFIG_FILE || 'config';
if (!path.isAbsolute(configFile)) {
if (!upath.isAbsolute(configFile)) {
configFile = `${process.cwd()}/${configFile}`;
logger.debug('Checking for config file in ' + configFile);
}
Expand Down
6 changes: 3 additions & 3 deletions lib/config/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path from 'path';
import upath from 'upath';
import { readFile } from '../util/fs';
import getArgv from './config/__fixtures__/argv';
import { getConfig } from './defaults';
Expand Down Expand Up @@ -62,7 +62,7 @@ describe('config/index', () => {
expect(parsedConfig).not.toContainKey('configFile');
});
it('supports config.force', async () => {
const configPath = path.join(
const configPath = upath.join(
__dirname,
'config/__fixtures__/withForce.js'
);
Expand All @@ -82,7 +82,7 @@ describe('config/index', () => {
]);
});
it('reads private key from file', async () => {
const privateKeyPath = path.join(
const privateKeyPath = upath.join(
__dirname,
'keys/__fixtures__/private.pem'
);
Expand Down
2 changes: 1 addition & 1 deletion lib/datasource/maven/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'fs';
import { resolve } from 'path';
import nock from 'nock';
import { resolve } from 'upath';
import { Release, getPkgReleases } from '..';
import { EXTERNAL_HOST_ERROR } from '../../constants/error-messages';
import * as hostRules from '../../util/host-rules';
Expand Down
6 changes: 3 additions & 3 deletions lib/datasource/sbt-package/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import fs from 'fs';
import path from 'path';
import nock from 'nock';
import upath from 'upath';
import { getPkgReleases } from '..';
import * as mavenVersioning from '../../versioning/maven';
import { MAVEN_REPO } from '../maven/common';
import { parseIndexDir } from '../sbt-plugin/util';
import * as sbtPlugin from '.';

const mavenIndexHtml = fs.readFileSync(
path.resolve(__dirname, `./__fixtures__/maven-index.html`),
upath.resolve(__dirname, `./__fixtures__/maven-index.html`),
'utf8'
);

const sbtPluginIndex = fs.readFileSync(
path.resolve(__dirname, `./__fixtures__/sbt-plugins-index.html`),
upath.resolve(__dirname, `./__fixtures__/sbt-plugins-index.html`),
'utf8'
);

Expand Down
6 changes: 3 additions & 3 deletions lib/datasource/sbt-plugin/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import fs from 'fs';
import path from 'path';
import nock from 'nock';
import upath from 'upath';
import { getPkgReleases } from '..';
import * as mavenVersioning from '../../versioning/maven';
import { MAVEN_REPO } from '../maven/common';
import { parseIndexDir } from './util';
import * as sbtPlugin from '.';

const mavenIndexHtml = fs.readFileSync(
path.resolve(__dirname, `./__fixtures__/maven-index.html`),
upath.resolve(__dirname, `./__fixtures__/maven-index.html`),
'utf8'
);

const sbtPluginIndex = fs.readFileSync(
path.resolve(__dirname, `./__fixtures__/sbt-plugins-index.html`),
upath.resolve(__dirname, `./__fixtures__/sbt-plugins-index.html`),
'utf8'
);

Expand Down
2 changes: 1 addition & 1 deletion lib/manager/bazel/update.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { Readable } from 'stream';
import { resolve } from 'upath';
import * as httpMock from '../../../test/httpMock';
import { UpdateType } from '../../config';
import { updateDependency } from './update';
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/cdnurl/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';
import { extractPackageFile } from '.';

const input = readFileSync(
Expand Down
7 changes: 4 additions & 3 deletions lib/manager/cocoapods/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import path from 'path';
import fs from 'fs-extra';
import upath from 'upath';

import { extractPackageFile } from '.';

const simplePodfile = fs.readFileSync(
path.resolve(__dirname, './__fixtures__/Podfile.simple'),
upath.resolve(__dirname, './__fixtures__/Podfile.simple'),
'utf-8'
);

const complexPodfile = fs.readFileSync(
path.resolve(__dirname, './__fixtures__/Podfile.complex'),
upath.resolve(__dirname, './__fixtures__/Podfile.complex'),
'utf-8'
);

Expand Down
2 changes: 1 addition & 1 deletion lib/manager/deps-edn/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-template-curly-in-string */
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';
import { extractPackageFile } from './extract';

const depsEdn = readFileSync(
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/droneci/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';

import { extractPackageFile } from './extract';

Expand Down
2 changes: 1 addition & 1 deletion lib/manager/gradle-wrapper/artifacts-real.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { resolve } from 'path';
import { readFile, readFileSync } from 'fs-extra';
import Git from 'simple-git';
import { resolve } from 'upath';
import * as httpMock from '../../../test/httpMock';
import { getName, git, partial } from '../../../test/util';
import { setUtilConfig } from '../../util';
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/gradle-wrapper/artifacts.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint jest/no-standalone-expect: 0 */
import { exec as _exec } from 'child_process';
import { resolve } from 'path';
import { readFile } from 'fs-extra';
import { resolve } from 'upath';
import { envMock, mockExecAll } from '../../../test/execUtil';
import * as httpMock from '../../../test/httpMock';
import {
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/gradle-wrapper/artifacts.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { resolve } from 'path';
import { stat } from 'fs-extra';
import { resolve } from 'upath';
import { logger } from '../../logger';
import { ExecOptions, exec } from '../../util/exec';
import { readLocalFile, writeLocalFile } from '../../util/fs';
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/gradle-wrapper/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';
import { extractPackageFile } from './extract';

const propertiesFile1 = readFileSync(
Expand Down
4 changes: 2 additions & 2 deletions lib/manager/gradle/gradle-updates-report.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as path from 'path';
import * as fs from 'fs-extra';
import tmp, { DirectoryResult } from 'tmp-promise';
import * as upath from 'upath';
import { getName } from '../../../test/util';
import { exec } from '../../util/exec';
import { ifSystemSupportsGradle } from './__testutil__/gradle';
Expand Down Expand Up @@ -32,7 +32,7 @@ describe(getName(__filename), () => {
);
await createRenovateGradlePlugin(workingDir.path);

const gradlew = path.join(workingDir.path, 'gradlew');
const gradlew = upath.join(workingDir.path, 'gradlew');
await exec(`${gradlew} ${GRADLE_DEPENDENCY_REPORT_OPTIONS}`, {
cwd: workingDir.path,
extraEnv,
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/gradle/gradle-updates-report.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { join } from 'path';
import { exists, readFile, writeFile } from 'fs-extra';
import { join } from 'upath';
import * as datasourceSbtPackage from '../../datasource/sbt-package';
import { logger } from '../../logger';

Expand Down
2 changes: 1 addition & 1 deletion lib/manager/html/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';
import { extractPackageFile } from '.';

const sample = readFileSync(
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/leiningen/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-template-curly-in-string */
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';
import * as datasourceClojure from '../../datasource/clojure';
import { extractFromVectors, extractPackageFile, trimAtKey } from './extract';

Expand Down
2 changes: 1 addition & 1 deletion lib/manager/maven/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-template-curly-in-string */
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';
import { extractPackage } from './extract';

const minimumContent = readFileSync(
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/maven/extract.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { basename, dirname, join, normalize } from 'path';
import is from '@sindresorhus/is';
import { basename, dirname, join, normalize } from 'upath';
import { XmlDocument, XmlElement } from 'xmldoc';
import * as datasourceMaven from '../../datasource/maven';
import { MAVEN_REPO } from '../../datasource/maven/common';
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/meteor/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { resolve } from 'upath';
import { extractPackageFile } from './extract';

function readFixture(fixture: string) {
Expand Down
4 changes: 2 additions & 2 deletions lib/manager/mix/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path';
import fs from 'fs-extra';
import upath from 'upath';
import { extractPackageFile } from '.';

const sample = fs.readFileSync(
path.resolve(__dirname, './__fixtures__/mix.exs'),
upath.resolve(__dirname, './__fixtures__/mix.exs'),
'utf-8'
);

Expand Down
4 changes: 2 additions & 2 deletions lib/manager/npm/extract/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync } from 'fs';
import path from 'path';
import upath from 'upath';
import { getConfig } from '../../../config/defaults';
import * as _fs from '../../../util/fs';
import * as npmExtract from '.';
Expand All @@ -11,7 +11,7 @@ const defaultConfig = getConfig();

function readFixture(fixture: string) {
return readFileSync(
path.resolve(__dirname, `../__fixtures__/${fixture}`),
upath.resolve(__dirname, `../__fixtures__/${fixture}`),
'utf8'
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/npm/extract/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { dirname } from 'path';
import is from '@sindresorhus/is';
import { dirname } from 'upath';
import validateNpmPackageName from 'validate-npm-package-name';
import { CONFIG_VALIDATION } from '../../../constants/error-messages';
import * as datasourceGithubTags from '../../../datasource/github-tags';
Expand Down
9 changes: 5 additions & 4 deletions lib/manager/npm/extract/monorepo.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import path from 'path';
import is from '@sindresorhus/is';

import minimatch from 'minimatch';
import upath from 'upath';
import { logger } from '../../../logger';
Expand All @@ -27,7 +25,7 @@ export function detectMonorepos(packageFiles: Partial<PackageFile>[]): void {
lernaPackages,
yarnWorkspacesPackages,
} = p;
const basePath = path.dirname(packageFile);
const basePath = upath.dirname(packageFile);
const packages = yarnWorkspacesPackages || lernaPackages;
if (packages?.length) {
logger.debug(
Expand All @@ -39,7 +37,10 @@ export function detectMonorepos(packageFiles: Partial<PackageFile>[]): void {
: [packages]
).map((pattern) => upath.join(basePath, pattern));
const internalPackageFiles = packageFiles.filter((sp) =>
matchesAnyPattern(path.dirname(sp.packageFile), internalPackagePatterns)
matchesAnyPattern(
upath.dirname(sp.packageFile),
internalPackagePatterns
)
);
const internalPackageNames = internalPackageFiles
.map((sp) => sp.packageJsonName)
Expand Down
13 changes: 6 additions & 7 deletions lib/manager/npm/post-update/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import path from 'path';
import is from '@sindresorhus/is';
import { parseSyml } from '@yarnpkg/parsers';
import upath from 'upath';
Expand Down Expand Up @@ -146,7 +145,7 @@ export async function writeExistingFiles(
for (const packageFile of npmFiles) {
const basedir = upath.join(
config.localDir,
path.dirname(packageFile.packageFile)
upath.dirname(packageFile.packageFile)
);
const npmrc: string = packageFile.npmrc || config.npmrc;
const npmrcFilename = upath.join(basedir, '.npmrc');
Expand Down Expand Up @@ -482,15 +481,15 @@ export async function getAdditionalFiles(
logger.warn({ err }, 'Error getting token for packageFile');
}
for (const lockFile of dirs.npmLockDirs) {
const lockFileDir = path.dirname(lockFile);
const lockFileDir = upath.dirname(lockFile);
const fullLockFileDir = upath.join(config.localDir, lockFileDir);
const npmrcContent = await getNpmrcContent(fullLockFileDir);
await updateNpmrcContent(
fullLockFileDir,
npmrcContent,
additionalNpmrcContent
);
const fileName = path.basename(lockFile);
const fileName = upath.basename(lockFile);
logger.debug(`Generating ${fileName} for ${lockFileDir}`);
const upgrades = config.upgrades.filter(
(upgrade) => upgrade.npmLock === lockFile
Expand Down Expand Up @@ -545,7 +544,7 @@ export async function getAdditionalFiles(
}

for (const lockFile of dirs.yarnLockDirs) {
const lockFileDir = path.dirname(lockFile);
const lockFileDir = upath.dirname(lockFile);
const fullLockFileDir = upath.join(config.localDir, lockFileDir);
const npmrcContent = await getNpmrcContent(fullLockFileDir);
await updateNpmrcContent(
Expand Down Expand Up @@ -612,7 +611,7 @@ export async function getAdditionalFiles(
}

for (const lockFile of dirs.pnpmShrinkwrapDirs) {
const lockFileDir = path.dirname(lockFile);
const lockFileDir = upath.dirname(lockFile);
const fullLockFileDir = upath.join(config.localDir, lockFileDir);
const npmrcContent = await getNpmrcContent(fullLockFileDir);
await updateNpmrcContent(
Expand Down Expand Up @@ -678,7 +677,7 @@ export async function getAdditionalFiles(
let lockFile: string;
logger.debug(`Finding package.json for lerna directory "${lernaDir}"`);
const lernaPackageFile = packageFiles.npm.find(
(p) => path.dirname(p.packageFile) === lernaDir
(p) => upath.dirname(p.packageFile) === lernaDir
);
if (!lernaPackageFile) {
logger.debug('No matching package.json found');
Expand Down
Loading

0 comments on commit 5d99ff9

Please sign in to comment.