@sanity/export 2.29.5-purple-unicorn.856 → 2.29.5-purple-unicorn-remix.958

package/lib/AssetHandler.js

@@ -11,7 +11,10 @@ const {
   format: formatUrl
 } = require('url');
 
-const fse = require('fs-extra');
+const {
+  mkdirSync,
+  createWriteStream
+} = require('fs');
 
 const miss = require('mississippi');
 
@@ -28,6 +31,8 @@ const requestStream = require('./requestStream');
 
 const debug = require('./debug');
 
+const rimraf = require('./util/rimraf');
+
 const EXCLUDE_PROPS = ['_id', '_type', 'assetId', 'extension', 'mimeType', 'path', 'url'];
 const ACTION_REMOVE = 'remove';
 const ACTION_REWRITE = 'rewrite';
@@ -175,8 +180,12 @@ class AssetHandler {
     /* eslint-disable no-sync */
 
 
-    fse.ensureDirSync(path.join(this.tmpDir, 'files'));
-    fse.ensureDirSync(path.join(this.tmpDir, 'images'));
+    mkdirSync(path.join(this.tmpDir, 'files'), {
+      recursive: true
+    });
+    mkdirSync(path.join(this.tmpDir, 'images'), {
+      recursive: true
+    });
     /* eslint-enable no-sync */
 
     this.assetDirsCreated = true;
@@ -259,7 +268,7 @@ class AssetHandler {
     } else if (differs) {
       const details = [hasHash && (method === 'md5' ? "md5 should be ".concat(remoteMd5, ", got ").concat(md5) : "sha1 should be ".concat(remoteSha1, ", got ").concat(sha1)), contentLength && parseInt(contentLength, 10) !== size && "Asset should be ".concat(contentLength, " bytes, got ").concat(size), "Did not succeed after ".concat(attemptNum, " attempts.")];
       const detailsString = "Details:\n - ".concat(details.filter(Boolean).join('\n - '));
-      await fse.unlink(tmpPath);
+      await rimraf(tmpPath);
       this.queue.clear();
       const error = new Error("Failed to download asset at ".concat(assetDoc.url, ", giving up. ").concat(detailsString));
       this.reject(error);
@@ -315,7 +324,7 @@ function writeHashedStream(filePath, stream) {
     sha1.update(chunk);
     cb(null, chunk);
   });
-  return new Promise((resolve, reject) => miss.pipe(stream, hasher, fse.createWriteStream(filePath), err => {
+  return new Promise((resolve, reject) => miss.pipe(stream, hasher, createWriteStream(filePath), err => {
     if (err) {
       reject(err);
       return;

package/lib/export.js

@@ -6,7 +6,7 @@ const path = require('path');
 
 const zlib = require('zlib');
 
-const fse = require('fs-extra');
+const fs = require('fs');
 
 const miss = require('mississippi');
 
@@ -14,6 +14,8 @@ const split = require('split2');
 
 const archiver = require('archiver');
 
+const rimraf = require('./util/rimraf');
+
 const debug = require('./debug');
 
 const AssetHandler = require('./AssetHandler');
@@ -51,7 +53,7 @@ function exportDataset(opts) {
   const prefix = "".concat(opts.dataset, "-export-").concat(slugDate);
   const tmpDir = path.join(os.tmpdir(), prefix);
 
-  const cleanup = () => fse.remove(tmpDir).catch(err => {
+  const cleanup = () => rimraf(tmpDir).catch(err => {
     debug("Error while cleaning up temporary files: ".concat(err.message));
   });
 
@@ -68,7 +70,7 @@ function exportDataset(opts) {
   if (isWritableStream(options.outputPath)) {
     outputStream = options.outputPath;
   } else {
-    outputStream = options.outputPath === '-' ? process.stdout : fse.createWriteStream(options.outputPath);
+    outputStream = options.outputPath === '-' ? process.stdout : fs.createWriteStream(options.outputPath);
   }
 
   let assetStreamHandler = assetHandler.noop;

package/lib/util/rimraf.js

@@ -0,0 +1,9 @@
+"use strict";
+
+const {
+  promisify
+} = require('util');
+
+const rimrafCb = require('rimraf');
+
+module.exports = promisify(rimrafCb);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/export",
-  "version": "2.29.5-purple-unicorn.856+d39e7c057",
+  "version": "2.29.5-purple-unicorn-remix.958+2e3b4bcb7",
   "description": "Export Sanity documents and assets",
   "main": "./lib/export.js",
   "types": "./lib/dts/src/export.d.ts",
@@ -27,15 +27,14 @@
   "dependencies": {
     "archiver": "^5.0.0",
     "debug": "^3.2.7",
-    "fs-extra": "^7.0.0",
     "get-it": "^5.2.1",
     "lodash": "^4.17.21",
     "mississippi": "^4.0.0",
     "p-queue": "^2.3.0",
+    "rimraf": "^3.0.2",
     "split2": "^3.2.2"
   },
   "devDependencies": {
-    "rimraf": "^3.0.2",
     "string-to-stream": "^1.1.0"
   },
   "publishConfig": {
@@ -50,5 +49,5 @@
     "url": "https://github.com/sanity-io/sanity/issues"
   },
   "homepage": "https://www.sanity.io/",
-  "gitHead": "d39e7c0574631659b51086cd87dd041f6b278fa9"
+  "gitHead": "2e3b4bcb70a3336c5a75e4ad947760b328d1eb04"
 }

package/src/AssetHandler.js

@@ -1,13 +1,14 @@
 const path = require('path')
 const crypto = require('crypto')
 const {parse: parseUrl, format: formatUrl} = require('url')
-const fse = require('fs-extra')
+const {mkdirSync, createWriteStream} = require('fs')
 const miss = require('mississippi')
 const PQueue = require('p-queue')
 const {omit, noop} = require('lodash')
 const pkg = require('../package.json')
 const requestStream = require('./requestStream')
 const debug = require('./debug')
+const rimraf = require('./util/rimraf')
 
 const EXCLUDE_PROPS = ['_id', '_type', 'assetId', 'extension', 'mimeType', 'path', 'url']
 const ACTION_REMOVE = 'remove'
@@ -112,8 +113,8 @@ class AssetHandler {
     }
 
     /* eslint-disable no-sync */
-    fse.ensureDirSync(path.join(this.tmpDir, 'files'))
-    fse.ensureDirSync(path.join(this.tmpDir, 'images'))
+    mkdirSync(path.join(this.tmpDir, 'files'), {recursive: true})
+    mkdirSync(path.join(this.tmpDir, 'images'), {recursive: true})
     /* eslint-enable no-sync */
     this.assetDirsCreated = true
   }
@@ -195,7 +196,7 @@ class AssetHandler {
 
       const detailsString = `Details:\n - ${details.filter(Boolean).join('\n - ')}`
 
-      await fse.unlink(tmpPath)
+      await rimraf(tmpPath)
       this.queue.clear()
 
       const error = new Error(
@@ -306,7 +307,7 @@ function writeHashedStream(filePath, stream) {
   })
 
   return new Promise((resolve, reject) =>
-    miss.pipe(stream, hasher, fse.createWriteStream(filePath), (err) => {
+    miss.pipe(stream, hasher, createWriteStream(filePath), (err) => {
       if (err) {
         reject(err)
         return

package/src/export.js

@@ -1,10 +1,11 @@
 const os = require('os')
 const path = require('path')
 const zlib = require('zlib')
-const fse = require('fs-extra')
+const fs = require('fs')
 const miss = require('mississippi')
 const split = require('split2')
 const archiver = require('archiver')
+const rimraf = require('./util/rimraf')
 const debug = require('./debug')
 const AssetHandler = require('./AssetHandler')
 const stringifyStream = require('./stringifyStream')
@@ -35,7 +36,7 @@ function exportDataset(opts) {
   const prefix = `${opts.dataset}-export-${slugDate}`
   const tmpDir = path.join(os.tmpdir(), prefix)
   const cleanup = () =>
-    fse.remove(tmpDir).catch((err) => {
+    rimraf(tmpDir).catch((err) => {
       debug(`Error while cleaning up temporary files: ${err.message}`)
     })
 
@@ -54,7 +55,7 @@ function exportDataset(opts) {
     outputStream = options.outputPath
   } else {
     outputStream =
-      options.outputPath === '-' ? process.stdout : fse.createWriteStream(options.outputPath)
+      options.outputPath === '-' ? process.stdout : fs.createWriteStream(options.outputPath)
   }
 
   let assetStreamHandler = assetHandler.noop

package/src/util/rimraf.js

@@ -0,0 +1,4 @@
+const {promisify} = require('util')
+const rimrafCb = require('rimraf')
+
+module.exports = promisify(rimrafCb)