@sanity/export 2.30.2-shopify.2 → 3.0.0-dev-preview.7

package/lib/util/rimraf.js

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

package/lib/validateOptions.js

@@ -1,10 +1,10 @@
 "use strict";
 
-var defaults = require('lodash/defaults');
+const defaults = require('lodash/defaults');
 
-var clientMethods = ['getUrl', 'config'];
-var booleanFlags = ['assets', 'raw', 'compress', 'drafts'];
-var exportDefaults = {
+const clientMethods = ['getUrl', 'config'];
+const booleanFlags = ['assets', 'raw', 'compress', 'drafts'];
+const exportDefaults = {
   compress: true,
   drafts: true,
   assets: true,
@@ -12,7 +12,7 @@ var exportDefaults = {
 };
 
 function validateOptions(opts) {
-  var options = defaults({}, opts, exportDefaults);
+  const options = defaults({}, opts, exportDefaults);
 
   if (typeof options.dataset !== 'string' || options.dataset.length < 1) {
     throw new Error("options.dataset must be a valid dataset name");
@@ -26,13 +26,13 @@ function validateOptions(opts) {
     throw new Error('`options.client` must be set to an instance of @sanity/client');
   }
 
-  var missing = clientMethods.find(key => typeof options.client[key] !== 'function');
+  const missing = clientMethods.find(key => typeof options.client[key] !== 'function');
 
   if (missing) {
     throw new Error("`options.client` is not a valid @sanity/client instance - no \"".concat(missing, "\" method found"));
   }
 
-  var clientConfig = options.client.config();
+  const clientConfig = options.client.config();
 
   if (!clientConfig.token) {
     throw new Error('Client is not instantiated with a `token`');

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@sanity/export",
-  "version": "2.30.2-shopify.2+c78e70728",
+  "version": "3.0.0-dev-preview.7+856da7f1d5",
   "description": "Export Sanity documents and assets",
-  "main": "lib/export.js",
+  "main": "./lib/export.js",
+  "types": "./lib/dts/src/export.d.ts",
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   },
   "author": "Sanity.io <hello@sanity.io>",
   "license": "MIT",
   "scripts": {
-    "build": "babel src --copy-files --out-dir lib",
-    "clean": "rimraf lib dest",
-    "prebuild": "npm run clean",
-    "test": "jest"
+    "build": "../../../bin/pkg-utils transpile --target node",
+    "clean": "rimraf lib",
+    "test": "jest",
+    "watch": "../../../bin/pkg-utils transpile --target node --watch"
   },
   "keywords": [
     "sanity",
@@ -26,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.15",
+    "lodash": "^4.17.21",
     "mississippi": "^4.0.0",
     "p-queue": "^2.3.0",
+    "rimraf": "^3.0.2",
     "split2": "^3.2.2"
   },
   "devDependencies": {
-    "rimraf": "^2.7.1",
     "string-to-stream": "^1.1.0"
   },
   "publishConfig": {
@@ -49,5 +49,5 @@
     "url": "https://github.com/sanity-io/sanity/issues"
   },
   "homepage": "https://www.sanity.io/",
-  "gitHead": "c78e7072844ba209ec77b3c01e5ee3b1494cb276"
+  "gitHead": "856da7f1d599ffd8d8c35afdbb5f1577e0573e6e"
 }

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)

package/jest.config.js

@@ -1,6 +0,0 @@
-const createConfig = require('../../../createJestConfig')
-
-module.exports = createConfig({
-  displayName: require('./package.json').name,
-  testEnvironment: 'node',
-})