diff --git a/packages/default-reporter/package.json b/packages/default-reporter/package.json index 2bad96acf4..9955713e42 100644 --- a/packages/default-reporter/package.json +++ b/packages/default-reporter/package.json @@ -62,10 +62,9 @@ }, "devDependencies": { "@pnpm/logger": "^2.1.0", - "@types/delay": "^2.0.1", "@types/load-json-file": "^2.0.7", "@types/tape": "^4.2.30", - "delay": "3.0.0", + "delay": "4.0.0", "ghooks": "^2.0.0", "load-json-file": "^5.0.0", "mos-tap-diff": "^1.0.0", diff --git a/packages/default-reporter/shrinkwrap.yaml b/packages/default-reporter/shrinkwrap.yaml index 1d6134b872..a42eedd75c 100644 --- a/packages/default-reporter/shrinkwrap.yaml +++ b/packages/default-reporter/shrinkwrap.yaml @@ -24,10 +24,9 @@ dependencies: zen-push: 0.2.1 devDependencies: '@pnpm/logger': 2.1.0 - '@types/delay': 2.0.1 '@types/load-json-file': 2.0.7 '@types/tape': 4.2.32 - delay: 3.0.0 + delay: 4.0.0 ghooks: 2.0.4 load-json-file: 5.0.0 mos-tap-diff: 1.0.0 @@ -88,10 +87,6 @@ packages: dev: false resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/delay/2.0.1: - dev: true - resolution: - integrity: sha512-D1/YuYOcdOIdaQnaiUJ77VcilVvESkynw79CtGqpjkXyv4OUezEVZtdXnSOwXL8Zcelu66QbyC8QQcVQ/ZPdig== /@types/fs-extra/5.0.4: dependencies: '@types/node': 10.9.4 @@ -504,12 +499,12 @@ packages: dev: true resolution: integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - /delay/3.0.0: + /delay/4.0.0: dev: true engines: node: '>=6' resolution: - integrity: sha512-6d9nF+lHG/HOZTmX/8/FgWm5UZQUF5O2SnnUvBZail1ESK1QixrmFn7vaW9hycz0/uwcmkqLyHDER+/AgCxbsQ== + integrity: sha512-M5om7qDqgWbLauRFlGgcfVEmQpHJMs24NL0I/dqahsESNdJrRiLuAodrsC1vV1YL5+yC2kh6k8vANWNKvYMd6A== /detect-indent/5.0.0: dev: true engines: @@ -1870,7 +1865,6 @@ specifiers: '@pnpm/logger': ^2.1.0 '@pnpm/types': ^1.7.0 '@types/common-tags': ^1.2.5 - '@types/delay': ^2.0.1 '@types/load-json-file': ^2.0.7 '@types/node': ^9.3.0 || 10 '@types/ramda': 0.25.34 @@ -1881,7 +1875,7 @@ specifiers: chalk: 2.4.1 cli-cursor: 2.1.0 common-tags: 1.8.0 - delay: 3.0.0 + delay: 4.0.0 ghooks: ^2.0.0 load-json-file: ^5.0.0 mos-tap-diff: ^1.0.0 diff --git a/packages/default-reporter/test/index.ts b/packages/default-reporter/test/index.ts index acd5753094..50ecacc79c 100644 --- a/packages/default-reporter/test/index.ts +++ b/packages/default-reporter/test/index.ts @@ -3,7 +3,7 @@ import {PnpmConfigs} from '@pnpm/config' import logger, { createStreamParser, } from '@pnpm/logger' -import delay = require('delay') +import delay from 'delay' import test = require('tape') import normalizeNewline = require('normalize-newline') import {toOutput$} from 'pnpm-default-reporter' diff --git a/packages/pnpm/package.json b/packages/pnpm/package.json index 2aadd48bcf..326423a50b 100644 --- a/packages/pnpm/package.json +++ b/packages/pnpm/package.json @@ -41,7 +41,7 @@ "chalk": "2.4.1", "common-tags": "1.8.0", "cross-spawn": "6.0.5", - "delay": "3.0.0", + "delay": "4.0.0", "diable": "4.0.1", "execa": "1.0.0", "find-packages": "2.2.0", diff --git a/packages/pnpm/shrinkwrap.yaml b/packages/pnpm/shrinkwrap.yaml index 3d27bb39d5..d85176731c 100644 --- a/packages/pnpm/shrinkwrap.yaml +++ b/packages/pnpm/shrinkwrap.yaml @@ -20,7 +20,7 @@ dependencies: chalk: 2.4.1 common-tags: 1.8.0 cross-spawn: 6.0.5 - delay: 3.0.0 + delay: 4.0.0 diable: 4.0.1 execa: 1.0.0 find-packages: 2.2.0 @@ -1561,12 +1561,12 @@ packages: dev: true resolution: integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - /delay/3.0.0: + /delay/4.0.0: dev: false engines: node: '>=6' resolution: - integrity: sha512-6d9nF+lHG/HOZTmX/8/FgWm5UZQUF5O2SnnUvBZail1ESK1QixrmFn7vaW9hycz0/uwcmkqLyHDER+/AgCxbsQ== + integrity: sha512-M5om7qDqgWbLauRFlGgcfVEmQpHJMs24NL0I/dqahsESNdJrRiLuAodrsC1vV1YL5+yC2kh6k8vANWNKvYMd6A== /delayed-stream/1.0.0: engines: node: '>=0.4.0' @@ -5956,7 +5956,7 @@ specifiers: common-tags: 1.8.0 cross-spawn: 6.0.5 deep-require-cwd: ^1.0.0 - delay: 3.0.0 + delay: 4.0.0 diable: 4.0.1 execa: 1.0.0 exists-link: ^2.0.0 diff --git a/packages/pnpm/src/cmd/server/stop.ts b/packages/pnpm/src/cmd/server/stop.ts index feb9ec6078..3d8ca03e80 100644 --- a/packages/pnpm/src/cmd/server/stop.ts +++ b/packages/pnpm/src/cmd/server/stop.ts @@ -1,7 +1,7 @@ import {storeLogger} from '@pnpm/logger' import {connectStoreController} from '@pnpm/server' import storePath from '@pnpm/store-path' -import delay = require('delay') +import delay from 'delay' import path = require('path') import processExists = require('process-exists') import killcb = require('tree-kill') diff --git a/packages/pnpm/src/createStoreController.ts b/packages/pnpm/src/createStoreController.ts index 88496cce3b..689eb93bd0 100644 --- a/packages/pnpm/src/createStoreController.ts +++ b/packages/pnpm/src/createStoreController.ts @@ -1,7 +1,7 @@ import logger from '@pnpm/logger' import {connectStoreController} from '@pnpm/server' import storePath from '@pnpm/store-path' -import delay = require('delay') +import delay from 'delay' import fs = require('mz/fs') import {StoreController} from 'package-store' import path = require('path') diff --git a/packages/pnpm/test/server.ts b/packages/pnpm/test/server.ts index 4bc93ae21f..c95019de1e 100644 --- a/packages/pnpm/test/server.ts +++ b/packages/pnpm/test/server.ts @@ -1,6 +1,6 @@ import byline = require('byline') import { ChildProcess } from 'child_process' -import delay = require('delay') +import delay from 'delay' import isWindows = require('is-windows') import pAny = require('p-any') import path = require('path') @@ -252,7 +252,7 @@ async function testParallelServerStart ( } const timeoutMillis = options.timeoutMillis || 10000 - let timeoutPromise = delay(timeoutMillis) + let timeoutPromise: { clear: Function } | null = delay(timeoutMillis) await pAny([ (async () => { await completedPromise diff --git a/packages/pnpm/typings/local.d.ts b/packages/pnpm/typings/local.d.ts index c77a21773b..ac694c71c1 100644 --- a/packages/pnpm/typings/local.d.ts +++ b/packages/pnpm/typings/local.d.ts @@ -1,8 +1,3 @@ -declare module 'delay' { - const anything: any; - export = anything; -} - declare module 'proper-lockfile' { const anything: any; export = anything; diff --git a/renovate.json b/renovate.json index 93f58ecaf1..4cdda114a2 100644 --- a/renovate.json +++ b/renovate.json @@ -7,10 +7,6 @@ "packageNames": ["@types/ramda"], "allowedVersions": "0.25.34" }, - { - "packageNames": ["delay"], - "allowedVersions": "3.0.0" - }, { "packageNames": ["got"], "allowedVersions": "<=8"