Skip to content

Commit 62afb07

Browse files
watsondmlemeshko
authored andcommitted
Remove bluebird dependency (#118097)
1 parent ab3c37e commit 62afb07

File tree

50 files changed

+610
-605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+610
-605
lines changed

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
"archiver": "^5.2.0",
194194
"axios": "^0.21.1",
195195
"base64-js": "^1.3.1",
196-
"bluebird": "3.5.5",
197196
"brace": "0.11.1",
198197
"broadcast-channel": "^4.2.0",
199198
"chalk": "^4.1.0",
@@ -494,7 +493,6 @@
494493
"@types/archiver": "^5.1.0",
495494
"@types/babel__core": "^7.1.16",
496495
"@types/base64-js": "^1.2.5",
497-
"@types/bluebird": "^3.1.1",
498496
"@types/chance": "^1.0.0",
499497
"@types/chroma-js": "^1.4.2",
500498
"@types/chromedriver": "^81.0.0",

packages/kbn-es-archiver/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUNTIME_DEPS = [
3434
"//packages/kbn-utils",
3535
"@npm//@elastic/elasticsearch",
3636
"@npm//aggregate-error",
37-
"@npm//bluebird",
3837
"@npm//chance",
3938
"@npm//globby",
4039
"@npm//json-stable-stringify",
@@ -51,7 +50,6 @@ TYPES_DEPS = [
5150
"@npm//aggregate-error",
5251
"@npm//globby",
5352
"@npm//zlib",
54-
"@npm//@types/bluebird",
5553
"@npm//@types/chance",
5654
"@npm//@types/jest",
5755
"@npm//@types/json-stable-stringify",

packages/kbn-es-archiver/src/actions/rebuild_all.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
*/
88

99
import { resolve, relative } from 'path';
10-
import { stat, Stats, rename, createReadStream, createWriteStream } from 'fs';
10+
import { Stats, createReadStream, createWriteStream } from 'fs';
11+
import { stat, rename } from 'fs/promises';
1112
import { Readable, Writable } from 'stream';
12-
import { fromNode } from 'bluebird';
1313
import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
1414
import { createPromiseFromStreams } from '@kbn/utils';
1515
import {
@@ -21,7 +21,7 @@ import {
2121
} from '../lib';
2222

2323
async function isDirectory(path: string): Promise<boolean> {
24-
const stats: Stats = await fromNode((cb) => stat(path, cb));
24+
const stats: Stats = await stat(path);
2525
return stats.isDirectory();
2626
}
2727

@@ -50,7 +50,7 @@ export async function rebuildAllAction({ dataDir, log }: { dataDir: string; log:
5050
createWriteStream(tempFile),
5151
] as [Readable, ...Writable[]]);
5252

53-
await fromNode((cb) => rename(tempFile, childPath, cb));
53+
await rename(tempFile, childPath);
5454
log.info('[%s] Rebuilt %j', archiveName, childName);
5555
}
5656
}

packages/kbn-es-archiver/src/lib/directory.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
* Side Public License, v 1.
77
*/
88

9-
import { readdir } from 'fs';
10-
import { fromNode } from 'bluebird';
9+
import { readdir } from 'fs/promises';
1110

1211
export async function readDirectory(path: string) {
13-
const allNames = await fromNode<string[]>((cb) => readdir(path, cb));
12+
const allNames = await readdir(path);
1413
return allNames.filter((name) => !name.startsWith('.'));
1514
}

packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/failure_hooks/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
import { delay } from 'bluebird';
9+
import { setTimeout as setTimeoutAsync } from 'timers/promises';
1010

1111
export default function () {
1212
return {
@@ -22,13 +22,13 @@ export default function () {
2222

2323
lifecycle.testFailure.add(async (err, test) => {
2424
log.info('testFailure %s %s', err.message, test.fullTitle());
25-
await delay(10);
25+
await setTimeoutAsync(10);
2626
log.info('testFailureAfterDelay %s %s', err.message, test.fullTitle());
2727
});
2828

2929
lifecycle.testHookFailure.add(async (err, test) => {
3030
log.info('testHookFailure %s %s', err.message, test.fullTitle());
31-
await delay(10);
31+
await setTimeoutAsync(10);
3232
log.info('testHookFailureAfterDelay %s %s', err.message, test.fullTitle());
3333
});
3434
},

packages/kbn-test/src/jest/setup/polyfills.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
* Side Public License, v 1.
77
*/
88

9-
// bluebird < v3.3.5 does not work with MutationObserver polyfill
10-
// when MutationObserver exists, bluebird avoids using node's builtin async schedulers
11-
const bluebird = require('bluebird');
12-
bluebird.Promise.setScheduler(function (fn) {
13-
global.setImmediate.call(global, fn);
14-
});
15-
169
const MutationObserver = require('mutation-observer');
1710
Object.defineProperty(window, 'MutationObserver', { value: MutationObserver });
1811

packages/kbn-test/src/mocha/junit_report_generation.test.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
*/
88

99
import { resolve } from 'path';
10-
import { readFileSync } from 'fs';
10+
import { readFile } from 'fs/promises';
11+
import { promisify } from 'util';
1112

12-
import { fromNode as fcb } from 'bluebird';
1313
import { parseString } from 'xml2js';
1414
import del from 'del';
1515
import Mocha from 'mocha';
@@ -22,6 +22,8 @@ const DURATION_REGEX = /^\d+\.\d{3}$/;
2222
const ISO_DATE_SEC_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/;
2323
const XML_PATH = getUniqueJunitReportPath(PROJECT_DIR, 'test');
2424

25+
const parseStringAsync = promisify(parseString);
26+
2527
describe('dev/mocha/junit report generation', () => {
2628
afterEach(() => {
2729
del.sync(resolve(PROJECT_DIR, 'target'));
@@ -39,7 +41,7 @@ describe('dev/mocha/junit report generation', () => {
3941

4042
mocha.addFile(resolve(PROJECT_DIR, 'test.js'));
4143
await new Promise((resolve) => mocha.run(resolve));
42-
const report = await fcb((cb) => parseString(readFileSync(XML_PATH), cb));
44+
const report = await parseStringAsync(await readFile(XML_PATH));
4345

4446
// test case results are wrapped in <testsuites></testsuites>
4547
expect(report).toEqual({

packages/kbn-utils/src/streams/map_stream.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
import { delay } from 'bluebird';
9+
import { setTimeout as setTimeoutAsync } from 'timers/promises';
1010

1111
import { createPromiseFromStreams } from './promise_from_streams';
1212
import { createListStream } from './list_stream';
@@ -39,7 +39,7 @@ describe('createMapStream()', () => {
3939
const result = await createPromiseFromStreams([
4040
createListStream([1, 2, 3]),
4141
createMapStream(async (n: number, i: number) => {
42-
await delay(n);
42+
await setTimeoutAsync(n);
4343
return n * i;
4444
}),
4545
createConcatStream([]),

src/dev/notice/bundled_notices.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@
77
*/
88

99
import { resolve } from 'path';
10-
import { readFile } from 'fs';
10+
import { readFile } from 'fs/promises';
11+
import { promisify } from 'util';
1112

12-
import { fromNode as fcb } from 'bluebird';
1313
import glob from 'glob';
1414

15+
const globAsync = promisify(glob);
16+
1517
export async function getBundledNotices(packageDirectory) {
1618
const pattern = resolve(packageDirectory, '*{LICENSE,NOTICE}*');
17-
const paths = await fcb((cb) => glob(pattern, cb));
19+
const paths = await globAsync(pattern);
1820
return Promise.all(
1921
paths.map(async (path) => ({
2022
path,
21-
text: await fcb((cb) => readFile(path, 'utf8', cb)),
23+
text: await readFile(path, 'utf8'),
2224
}))
2325
);
2426
}

src/dev/precommit_hook/get_files_for_commit.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
import SimpleGit from 'simple-git';
10-
import { fromNode as fcb } from 'bluebird';
9+
import SimpleGit from 'simple-git/promise';
1110

1211
import { REPO_ROOT } from '@kbn/utils';
1312
import { File } from '../file';
@@ -22,7 +21,7 @@ import { File } from '../file';
2221
export async function getFilesForCommit(gitRef) {
2322
const simpleGit = new SimpleGit(REPO_ROOT);
2423
const gitRefForDiff = gitRef ? gitRef : '--cached';
25-
const output = await fcb((cb) => simpleGit.diff(['--name-status', gitRefForDiff], cb));
24+
const output = await simpleGit.diff(['--name-status', gitRefForDiff]);
2625

2726
return (
2827
output

0 commit comments

Comments
 (0)