From a7d0be726e5883ef3c74faece4ee7bb05cc8d0cd Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 31 Aug 2017 16:04:38 +0200 Subject: [PATCH] feat(fs-extra): update `CopyFilter` signature to include `dest` (#19361) * feat(fs-extra): update `CopyFilter` signature to include `dest` * merge conflicts fs-extra: re-add missing dash --- types/fs-extra-promise/fs-extra-promise-tests.ts | 4 ++-- types/fs-extra/fs-extra-tests.ts | 8 ++++---- types/fs-extra/index.d.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/types/fs-extra-promise/fs-extra-promise-tests.ts b/types/fs-extra-promise/fs-extra-promise-tests.ts index 6b69bfec3c..75fa32f876 100644 --- a/types/fs-extra-promise/fs-extra-promise-tests.ts +++ b/types/fs-extra-promise/fs-extra-promise-tests.ts @@ -47,9 +47,9 @@ let writeStream: stream.Writable; let isDirectory: boolean; fs.copy(src, dest, errorCallback); -fs.copy(src, dest, { filter: (src: string) => false }, errorCallback); +fs.copy(src, dest, { filter: (src: string, dest: string) => false }, errorCallback); fs.copySync(src, dest); -fs.copySync(src, dest, { filter: (src: string) => false }); +fs.copySync(src, dest, { filter: (src: string, dest: string) => false }); fs.createFile(file, errorCallback); fs.createFileSync(file); diff --git a/types/fs-extra/fs-extra-tests.ts b/types/fs-extra/fs-extra-tests.ts index 22232bc297..1af094260d 100644 --- a/types/fs-extra/fs-extra-tests.ts +++ b/types/fs-extra/fs-extra-tests.ts @@ -43,12 +43,12 @@ fs.copy(src, dest, { overwrite: true }).then(() => { // stub }); fs.copy(src, dest, errorCallback); -fs.copy(src, dest, { filter: src => false }, errorCallback); +fs.copy(src, dest, { filter: (src: string, dest: string) => false }, errorCallback); fs.copy(src, dest, { overwrite: true, preserveTimestamps: true, - filter: (src: string) => false + filter: (src: string, dest: string) => false }, errorCallback ); @@ -61,13 +61,13 @@ fs.copy(src, dest, errorCallback ); fs.copySync(src, dest); -fs.copySync(src, dest, { filter: src => false }); +fs.copySync(src, dest, { filter: (src: string, dest: string) => false }); fs.copySync(src, dest, { filter: /.*/ }); fs.copySync(src, dest, { overwrite: true, preserveTimestamps: true, - filter: (src: string) => false + filter: (src: string, dest: string) => false } ); fs.copySync(src, dest, diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts index 0231cac2d2..df3324aca5 100644 --- a/types/fs-extra/index.d.ts +++ b/types/fs-extra/index.d.ts @@ -258,7 +258,7 @@ export interface PathEntryStream { read(): PathEntry | null; } -export type CopyFilter = ((src: string) => boolean) | RegExp; +export type CopyFilter = ((src: string, dest: string) => boolean) | RegExp; export type SymlinkType = "dir" | "file";