Skip to content

Commit edeb561

Browse files
authored
fix: update dependency mkdirp to 1.x (#5748)
1 parent 0aba8a2 commit edeb561

File tree

4 files changed

+101
-25
lines changed

4 files changed

+101
-25
lines changed

package-lock.json

+85-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"dotenv": "^6.2.0",
104104
"glob": "^7.1.2",
105105
"js-yaml": "^3.13.1",
106-
"mkdirp": "^0.5.1",
106+
"mkdirp": "^1.0.3",
107107
"reflect-metadata": "^0.1.13",
108108
"sha.js": "^2.4.11",
109109
"tslib": "^1.9.0",

src/commands/CommandUtils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class CommandUtils {
1111
* Creates directories recursively.
1212
*/
1313
static createDirectories(directory: string) {
14-
return new Promise((ok, fail) => mkdirp(directory, (err: any) => err ? fail(err) : ok()));
14+
return mkdirp(directory);
1515
}
1616

1717
/**

src/driver/sqlite/SqliteDriver.ts

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError";
2-
import {SqliteQueryRunner} from "./SqliteQueryRunner";
3-
import {DriverOptionNotSetError} from "../../error/DriverOptionNotSetError";
4-
import {PlatformTools} from "../../platform/PlatformTools";
5-
import {Connection} from "../../connection/Connection";
6-
import {SqliteConnectionOptions} from "./SqliteConnectionOptions";
7-
import {ColumnType} from "../types/ColumnTypes";
8-
import {QueryRunner} from "../../query-runner/QueryRunner";
9-
import {AbstractSqliteDriver} from "../sqlite-abstract/AbstractSqliteDriver";
1+
import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError";
2+
import { SqliteQueryRunner } from "./SqliteQueryRunner";
3+
import { DriverOptionNotSetError } from "../../error/DriverOptionNotSetError";
4+
import { PlatformTools } from "../../platform/PlatformTools";
5+
import { Connection } from "../../connection/Connection";
6+
import { SqliteConnectionOptions } from "./SqliteConnectionOptions";
7+
import { ColumnType } from "../types/ColumnTypes";
8+
import { QueryRunner } from "../../query-runner/QueryRunner";
9+
import { AbstractSqliteDriver } from "../sqlite-abstract/AbstractSqliteDriver";
1010

1111
/**
1212
* Organizes communication with sqlite DBMS.
@@ -63,14 +63,14 @@ export class SqliteDriver extends AbstractSqliteDriver {
6363
/**
6464
* Creates a query runner used to execute database queries.
6565
*/
66-
createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner {
66+
createQueryRunner(mode: "master" | "slave" = "master"): QueryRunner {
6767
if (!this.queryRunner)
6868
this.queryRunner = new SqliteQueryRunner(this);
6969

7070
return this.queryRunner;
7171
}
7272

73-
normalizeType(column: { type?: ColumnType, length?: number | string, precision?: number|null, scale?: number }): string {
73+
normalizeType(column: { type?: ColumnType, length?: number | string, precision?: number | null, scale?: number }): string {
7474
if ((column.type as any) === Buffer) {
7575
return "blob";
7676
}
@@ -133,11 +133,9 @@ export class SqliteDriver extends AbstractSqliteDriver {
133133
* Auto creates database directory if it does not exist.
134134
*/
135135
protected createDatabaseDirectory(fullPath: string): Promise<void> {
136-
return new Promise<void>((resolve, reject) => {
137-
const mkdirp = PlatformTools.load("mkdirp");
138-
const path = PlatformTools.load("path");
139-
mkdirp(path.dirname(fullPath), (err: any) => err ? reject(err) : resolve());
140-
});
136+
const mkdirp = PlatformTools.load("mkdirp");
137+
const path = PlatformTools.load("path");
138+
return mkdirp(path.dirname(fullPath));
141139
}
142140

143141
}

0 commit comments

Comments
 (0)