Skip to content

Commit

Permalink
chore(deps): replace is-ci by ci-info (#5862)
Browse files Browse the repository at this point in the history
  • Loading branch information
paescuj committed Jan 1, 2023
1 parent ee08182 commit 08ceaf3
Show file tree
Hide file tree
Showing 18 changed files with 46 additions and 60 deletions.
10 changes: 10 additions & 0 deletions .changeset/heavy-camels-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@pnpm/plugin-commands-installation": patch
"@pnpm/plugin-commands-publishing": patch
"@pnpm/filter-workspace-packages": patch
"@pnpm/get-context": patch
"@pnpm/core": patch
"pnpm": patch
---

replace dependency `is-ci` by `ci-info` (`is-ci` is just a simple wrapper around `ci-info`).
3 changes: 1 addition & 2 deletions pkg-manager/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,16 @@
"@pnpm/store-path": "workspace:*",
"@pnpm/test-fixtures": "workspace:*",
"@types/fs-extra": "^9.0.13",
"@types/is-ci": "^3.0.0",
"@types/is-windows": "^1.0.0",
"@types/normalize-path": "^3.0.0",
"@types/ramda": "0.28.20",
"@types/semver": "7.3.13",
"@types/sinon": "^10.0.13",
"@yarnpkg/core": "4.0.0-rc.27",
"ci-info": "^3.7.0",
"deep-require-cwd": "1.0.0",
"execa": "npm:safe-execa@0.1.2",
"exists-link": "2.0.0",
"is-ci": "^3.0.1",
"is-windows": "^1.0.2",
"nock": "13.2.9",
"path-name": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/core/test/breakingChanges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PnpmError } from '@pnpm/error'
import { prepareEmpty, preparePackages } from '@pnpm/prepare'
import { addDependenciesToPackage, install } from '@pnpm/core'
import rimraf from '@zkochan/rimraf'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import { testDefaults } from './utils'

test('fail on non-compatible node_modules', async () => {
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/core/test/install/deepRecursive.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { prepareEmpty } from '@pnpm/prepare'
import { addDependenciesToPackage } from '@pnpm/core'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import exists from 'path-exists'
import { testDefaults } from '../utils'

Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/core/test/install/fromRepo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
addDependenciesToPackage,
install,
} from '@pnpm/core'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import exists from 'path-exists'
import sinon from 'sinon'
import { testDefaults } from '../utils'
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/core/test/install/misc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
} from '@pnpm/core'
import rimraf from '@zkochan/rimraf'
import execa from 'execa'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import isWindows from 'is-windows'
import exists from 'path-exists'
import semver from 'semver'
Expand Down
3 changes: 1 addition & 2 deletions pkg-manager/get-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"homepage": "https://github.com/pnpm/pnpm/blob/main/pkg-manager/get-context#readme",
"devDependencies": {
"@pnpm/get-context": "workspace:*",
"@types/is-ci": "^3.0.0",
"@types/ramda": "0.28.20"
},
"peerDependencies": {
Expand All @@ -45,7 +44,7 @@
"@pnpm/read-projects-context": "workspace:*",
"@pnpm/types": "workspace:*",
"@zkochan/rimraf": "^2.1.2",
"is-ci": "^3.0.1",
"ci-info": "^3.7.0",
"path-absolute": "^1.0.1",
"ramda": "npm:@pnpm/ramda@0.28.1"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/get-context/src/readLockfiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
readWantedLockfileAndAutofixConflicts,
} from '@pnpm/lockfile-file'
import { logger } from '@pnpm/logger'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import clone from 'ramda/src/clone'
import equals from 'ramda/src/equals'

Expand Down
3 changes: 1 addition & 2 deletions pkg-manager/plugin-commands-installation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"@pnpm/prepare": "workspace:*",
"@pnpm/registry-mock": "3.2.0",
"@pnpm/test-fixtures": "workspace:*",
"@types/is-ci": "^3.0.0",
"@types/proxyquire": "^1.3.28",
"@types/ramda": "0.28.20",
"@types/sinon": "^10.0.13",
Expand Down Expand Up @@ -90,8 +89,8 @@
"@zkochan/table": "^1.0.0",
"@zkochan/which": "^2.0.3",
"chalk": "^4.1.2",
"ci-info": "^3.7.0",
"enquirer": "^2.3.6",
"is-ci": "^3.0.1",
"is-subdir": "^1.2.0",
"load-json-file": "^6.2.0",
"mem": "^8.1.1",
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/plugin-commands-installation/src/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { FILTERING, OPTIONS, OUTPUT_OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/com
import { Config, types as allTypes } from '@pnpm/config'
import { WANTED_LOCKFILE } from '@pnpm/constants'
import { CreateStoreControllerOptions } from '@pnpm/store-connection-manager'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import pick from 'ramda/src/pick'
import renderHelp from 'render-help'
import { installDeps } from './installDeps'
Expand Down
58 changes: 20 additions & 38 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions pnpm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
"@pnpm/workspace.pkgs-graph": "workspace:*",
"@pnpm/write-project-manifest": "workspace:*",
"@types/cross-spawn": "^6.0.2",
"@types/is-ci": "^3.0.0",
"@types/is-windows": "^1.0.0",
"@types/pnpm__byline": "npm:@types/byline@^4.2.33",
"@types/ramda": "0.28.20",
Expand All @@ -77,6 +76,7 @@
"@zkochan/retry": "^0.2.0",
"@zkochan/rimraf": "^2.1.2",
"chalk": "^4.1.2",
"ci-info": "^3.7.0",
"cross-spawn": "^7.0.3",
"cross-var-no-babel": "^1.2.0",
"deep-require-cwd": "1.0.0",
Expand All @@ -85,7 +85,6 @@
"esbuild": "^0.15.18",
"execa": "npm:safe-execa@0.1.2",
"exists-link": "2.0.0",
"is-ci": "^3.0.1",
"is-windows": "^1.0.2",
"load-json-file": "^6.2.0",
"loud-rejection": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion pnpm/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { pnpmCmds, rcOptionsTypes } from './cmd'
import { formatUnknownOptionsError } from './formatError'
import { parseCliArgs } from './parseCliArgs'
import { initReporter, ReporterType } from './reporter'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import path from 'path'
import isEmpty from 'ramda/src/isEmpty'
import stripAnsi from 'strip-ansi'
Expand Down
2 changes: 1 addition & 1 deletion pnpm/test/recursive/misc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import path from 'path'
import { prepare, preparePackages } from '@pnpm/prepare'
import { Lockfile } from '@pnpm/lockfile-types'
import readYamlFile from 'read-yaml-file'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import isWindows from 'is-windows'
import writeYamlFile from 'write-yaml-file'
import {
Expand Down
3 changes: 1 addition & 2 deletions releasing/plugin-commands-publishing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@
"@pnpm/prepare": "workspace:*",
"@pnpm/registry-mock": "3.2.0",
"@types/cross-spawn": "^6.0.2",
"@types/is-ci": "^3.0.0",
"@types/is-windows": "^1.0.0",
"@types/npm-packlist": "^3.0.0",
"@types/proxyquire": "^1.3.28",
"@types/ramda": "0.28.20",
"@types/sinon": "^10.0.13",
"@types/tar": "^6.1.3",
"@types/tar-stream": "^2.2.2",
"ci-info": "^3.7.0",
"cross-spawn": "^7.0.3",
"is-ci": "^3.0.1",
"is-windows": "^1.0.2",
"load-json-file": "^6.2.0",
"path-exists": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion releasing/plugin-commands-publishing/test/publish.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { existsSync, promises as fs } from 'fs'
import path from 'path'
import execa from 'execa'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import isWindows from 'is-windows'
import { pack, publish } from '@pnpm/plugin-commands-publishing'
import { prepare, preparePackages } from '@pnpm/prepare'
Expand Down
3 changes: 1 addition & 2 deletions workspace/filter-workspace-packages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@
},
"devDependencies": {
"@pnpm/filter-workspace-packages": "workspace:*",
"@types/is-ci": "^3.0.0",
"@types/is-windows": "^1.0.0",
"@types/micromatch": "^4.0.2",
"@types/ramda": "0.28.20",
"@types/touch": "^3.1.2",
"is-ci": "^3.0.1",
"ci-info": "^3.7.0",
"is-windows": "^1.0.2",
"tempy": "^1.0.1",
"touch": "3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion workspace/filter-workspace-packages/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { filterWorkspacePackages, PackageGraph } from '@pnpm/filter-workspace-pa
import './parsePackageSelector'
import fs from 'fs'
import execa from 'execa'
import isCI from 'is-ci'
import { isCI } from 'ci-info'
import isWindows from 'is-windows'
import path from 'path'
import omit from 'ramda/src/omit'
Expand Down

0 comments on commit 08ceaf3

Please sign in to comment.