Skip to content

Commit

Permalink
drop fs-extra (it broke with node 20 on windows 10)
Browse files Browse the repository at this point in the history
  • Loading branch information
mceachen committed Jul 20, 2023
1 parent d89a28e commit d49a722
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 14 deletions.
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
"@types/chai": "^4.3.5",
"@types/chai-as-promised": "^7.1.5",
"@types/chai-subset": "^1.3.3",
"@types/fs-extra": "^11.0.1",
"@types/globule": "^1.1.6",
"@types/he": "^1.2.0",
"@types/mocha": "^10.0.1",
Expand All @@ -87,7 +86,6 @@
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-node": "^11.1.0",
"extract-zip": "^2.0.1",
"fs-extra": "^11.1.1",
"geo-tz": "^7.0.7",
"globule": "^1.3.4",
"mocha": "^10.2.0",
Expand Down
3 changes: 2 additions & 1 deletion src/BinaryExtractionTask.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import assert from "assert"
import { copyFile, mkdirp } from "fs-extra"
import { copyFile } from "fs/promises"
import path from "path"
import { BinaryExtractionTask } from "./BinaryExtractionTask"
import { exiftool } from "./ExifTool"
import {
NonAlphaStrings,
expect,
mkdirp,
sha1,
testDir,
tmpdir,
Expand Down
3 changes: 2 additions & 1 deletion src/BinaryToBufferTask.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import assert from "assert"
import crypto from "crypto"
import { copyFile, mkdirp } from "fs-extra"
import { copyFile } from "fs/promises"
import path from "path"
import { BinaryToBufferTask } from "./BinaryToBufferTask"
import { exiftool } from "./ExifTool"
import {
NonAlphaStrings,
expect,
mkdirp,
sha1buffer,
testDir,
tmpdir,
Expand Down
13 changes: 7 additions & 6 deletions src/ReadRawTask.spec.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import * as fse from "fs-extra"
import { copyFile } from "fs/promises"
import path from "path"
import { exiftool } from "./ExifTool"
import {
expect,
NonAlphaStrings,
UnicodeTestMessage,
expect,
mkdirp,
testDir,
tmpdir,
UnicodeTestMessage,
} from "./_chai.spec"
import { exiftool } from "./ExifTool"

after(() => exiftool.end())

Expand All @@ -17,8 +18,8 @@ describe("ReadRawTask", () => {
it("reads with " + desc, async () => {
const FileName = str + ".jpg"
const dest = path.join(tmpdir(), FileName)
await fse.mkdirp(tmpdir())
await fse.copyFile(path.join(testDir, "quotes.jpg"), dest)
await mkdirp(tmpdir())
await copyFile(path.join(testDir, "quotes.jpg"), dest)
const t = await exiftool.readRaw(dest)
expect(t).to.containSubset({
MIMEType: "image/jpeg",
Expand Down
7 changes: 4 additions & 3 deletions src/ReadTask.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import * as fse from "fs-extra"
import { copyFile } from "fs/promises"
import { DateTime } from "luxon"
import path, { join } from "path"
import {
expect,
mkdirp,
NonAlphaStrings,
renderTagsWithISO,
renderTagsWithRawValues,
Expand Down Expand Up @@ -900,8 +901,8 @@ describe("ReadTask", () => {
it("reads with " + desc, async () => {
const FileName = str + ".jpg"
const dest = path.join(tmpdir(), FileName)
await fse.mkdirp(tmpdir())
await fse.copyFile(path.join(testDir, "quotes.jpg"), dest)
await mkdirp(tmpdir())
await copyFile(path.join(testDir, "quotes.jpg"), dest)
const t = await exiftool.read(dest)
expect(t).to.containSubset({
MIMEType: "image/jpeg",
Expand Down
7 changes: 6 additions & 1 deletion src/_chai.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Deferred, Log, setLogger } from "batch-cluster"
import { expect } from "chai"
import crypto, { randomBytes } from "crypto"
import { copyFile, createReadStream, mkdirp } from "fs-extra"
import { createReadStream } from "fs"
import { copyFile, mkdir } from "fs/promises"
import path from "path"
import process from "process"
import tmp from "tmp"
Expand All @@ -18,6 +19,10 @@ const chai = require("chai")
chai.use(require("chai-as-promised"))
chai.use(require("chai-subset"))

export function mkdirp(dir: string) {
return mkdir(dir, { recursive: true })
}

// Tests should be quiet unless LOG is set
setLogger(
Log.withLevels(
Expand Down

0 comments on commit d49a722

Please sign in to comment.