From f0718dc34b6f660901933c05140f29bb176520c0 Mon Sep 17 00:00:00 2001 From: Ryan Zimmerman Date: Thu, 27 Jun 2019 15:50:31 -0400 Subject: [PATCH 1/2] Switch back to upgraded graceful-fs for copy & move Fixes #664 Fixes #684 --- lib/copy-sync/copy-sync.js | 4 +--- lib/copy/copy.js | 4 +--- lib/move-sync/move-sync.js | 4 +--- lib/move/__tests__/move.test.js | 4 +--- lib/move/move.js | 4 +--- lib/util/stat.js | 4 +--- package.json | 2 +- 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/lib/copy-sync/copy-sync.js b/lib/copy-sync/copy-sync.js index bb70e819..f2831b32 100644 --- a/lib/copy-sync/copy-sync.js +++ b/lib/copy-sync/copy-sync.js @@ -1,8 +1,6 @@ 'use strict' -// TODO: enable this once graceful-fs supports bigint option. -// const fs = require('graceful-fs') -const fs = require('fs') +const fs = require('graceful-fs') const path = require('path') const mkdirpSync = require('../mkdirs').mkdirsSync const utimesSync = require('../util/utimes.js').utimesMillisSync diff --git a/lib/copy/copy.js b/lib/copy/copy.js index fdab802c..411fc64c 100644 --- a/lib/copy/copy.js +++ b/lib/copy/copy.js @@ -1,8 +1,6 @@ 'use strict' -// TODO: enable this once graceful-fs supports bigint option. -// const fs = require('graceful-fs') -const fs = require('fs') +const fs = require('graceful-fs') const path = require('path') const mkdirp = require('../mkdirs').mkdirs const pathExists = require('../path-exists').pathExists diff --git a/lib/move-sync/move-sync.js b/lib/move-sync/move-sync.js index 62f8e1a6..20f910cc 100644 --- a/lib/move-sync/move-sync.js +++ b/lib/move-sync/move-sync.js @@ -1,8 +1,6 @@ 'use strict' -// TODO: enable this once graceful-fs supports bigint option. -// const fs = require('graceful-fs') -const fs = require('fs') +const fs = require('graceful-fs') const path = require('path') const copySync = require('../copy-sync').copySync const removeSync = require('../remove').removeSync diff --git a/lib/move/__tests__/move.test.js b/lib/move/__tests__/move.test.js index 617ed0be..cb39b373 100644 --- a/lib/move/__tests__/move.test.js +++ b/lib/move/__tests__/move.test.js @@ -1,8 +1,6 @@ 'use strict' -// TODO: enable this once graceful-fs supports bigint option. -// const fs = require('graceful-fs') -const fs = require('fs') +const fs = require('graceful-fs') const os = require('os') const fse = require('../../') const path = require('path') diff --git a/lib/move/move.js b/lib/move/move.js index 94dc7949..fa3ea618 100644 --- a/lib/move/move.js +++ b/lib/move/move.js @@ -1,8 +1,6 @@ 'use strict' -// TODO: enable this once graceful-fs supports bigint option. -// const fs = require('graceful-fs') -const fs = require('fs') +const fs = require('graceful-fs') const path = require('path') const copy = require('../copy').copy const remove = require('../remove').remove diff --git a/lib/util/stat.js b/lib/util/stat.js index 20049b73..350cb9f7 100644 --- a/lib/util/stat.js +++ b/lib/util/stat.js @@ -1,8 +1,6 @@ 'use strict' -// TODO: enable this once graceful-fs supports bigint option. -// const fs = require('graceful-fs') -const fs = require('fs') +const fs = require('graceful-fs') const path = require('path') const NODE_VERSION_MAJOR_WITH_BIGINT = 10 diff --git a/package.json b/package.json index b6df15c0..973a3558 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "author": "JP Richardson ", "license": "MIT", "dependencies": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" }, From a1e0abd82738dab437ae73ca08dee3caae543e5e Mon Sep 17 00:00:00 2001 From: Ryan Zimmerman Date: Thu, 27 Jun 2019 15:53:21 -0400 Subject: [PATCH 2/2] Use graceful-fs for emptyDir*() --- lib/empty/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/empty/index.js b/lib/empty/index.js index db05c171..204d53ba 100644 --- a/lib/empty/index.js +++ b/lib/empty/index.js @@ -1,7 +1,7 @@ 'use strict' const u = require('universalify').fromCallback -const fs = require('fs') +const fs = require('graceful-fs') const path = require('path') const mkdir = require('../mkdirs') const remove = require('../remove')