cross-zip 3.1.0 → 4.0.1

package/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily
+    labels:
+      - dependency
+    versioning-strategy: increase-if-necessary
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+    labels:
+      - dependency

package/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: ci
+'on':
+  - push
+  - pull_request
+jobs:
+  test:
+    name: Node ${{ matrix.node }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        node:
+          - '14'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install
+      - run: npm run build --if-present
+      - run: npm test

package/README.md

@@ -1,7 +1,7 @@
-# cross-zip [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
+# cross-zip [![ci][ci-image]][ci-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
 
-[travis-image]: https://img.shields.io/travis/feross/cross-zip/master.svg
-[travis-url]: https://travis-ci.org/feross/cross-zip
+[ci-image]: https://img.shields.io/github/workflow/status/feross/cross-zip/ci/master
+[ci-url]: https://github.com/feross/cross-zip/actions
 [npm-image]: https://img.shields.io/npm/v/cross-zip.svg
 [npm-url]: https://npmjs.org/package/cross-zip
 [downloads-image]: https://img.shields.io/npm/dm/cross-zip.svg

package/index.js

@@ -1,16 +1,15 @@
 /*! cross-zip. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 module.exports = {
-  zip: zip,
-  zipSync: zipSync,
-  unzip: unzip,
-  unzipSync: unzipSync
+  zip,
+  zipSync,
+  unzip,
+  unzipSync
 }
 
-var cp = require('child_process')
-var fs = require('fs')
-var os = require('os')
-var path = require('path')
-var rimraf = require('rimraf')
+const cp = require('child_process')
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
 
 function zip (inPath, outPath, cb) {
   if (!cb) cb = function () {}
@@ -32,7 +31,7 @@ function zip (inPath, outPath, cb) {
   function copyToTemp () {
     fs.readFile(inPath, function (err, inFile) {
       if (err) return cb(err)
-      var tmpPath = path.join(os.tmpdir(), 'cross-zip-' + Date.now())
+      const tmpPath = path.join(os.tmpdir(), 'cross-zip-' + Date.now())
       fs.mkdir(tmpPath, function (err) {
         if (err) return cb(err)
         fs.writeFile(path.join(tmpPath, path.basename(inPath)), inFile, function (err) {
@@ -47,14 +46,14 @@ function zip (inPath, outPath, cb) {
   // Windows zip command does not overwrite existing files. So do it manually first.
   function doZip () {
     if (process.platform === 'win32') {
-      rimraf(outPath, doZip2)
+      fs.rmdir(outPath, { recursive: true, maxRetries: 3 }, doZip2)
     } else {
       doZip2()
     }
   }
 
   function doZip2 () {
-    var opts = {
+    const opts = {
       cwd: path.dirname(inPath),
       maxBuffer: Infinity
     }
@@ -67,15 +66,15 @@ function zip (inPath, outPath, cb) {
 function zipSync (inPath, outPath) {
   if (process.platform === 'win32') {
     if (fs.statSync(inPath).isFile()) {
-      var inFile = fs.readFileSync(inPath)
-      var tmpPath = path.join(os.tmpdir(), 'cross-zip-' + Date.now())
+      const inFile = fs.readFileSync(inPath)
+      const tmpPath = path.join(os.tmpdir(), 'cross-zip-' + Date.now())
       fs.mkdirSync(tmpPath)
       fs.writeFileSync(path.join(tmpPath, path.basename(inPath)), inFile)
       inPath = tmpPath
     }
-    rimraf.sync(outPath)
+    fs.rmdirSync(outPath, { recursive: true, maxRetries: 3 })
   }
-  var opts = {
+  const opts = {
     cwd: path.dirname(inPath),
     maxBuffer: Infinity
   }
@@ -84,7 +83,7 @@ function zipSync (inPath, outPath) {
 
 function unzip (inPath, outPath, cb) {
   if (!cb) cb = function () {}
-  var opts = {
+  const opts = {
     maxBuffer: Infinity
   }
   cp.execFile(getUnzipCommand(), getUnzipArgs(inPath, outPath), opts, function (err) {
@@ -93,7 +92,7 @@ function unzip (inPath, outPath, cb) {
 }
 
 function unzipSync (inPath, outPath) {
-  var opts = {
+  const opts = {
     maxBuffer: Infinity
   }
   cp.execFileSync(getUnzipCommand(), getUnzipArgs(inPath, outPath), opts)
@@ -129,7 +128,7 @@ function getZipArgs (inPath, outPath) {
       '-myOutPath', quotePath(outPath)
     ]
   } else {
-    var fileName = path.basename(inPath)
+    const fileName = path.basename(inPath)
     return ['-r', '-y', outPath, fileName]
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cross-zip",
   "description": "Cross-platform .zip file creation",
-  "version": "3.1.0",
+  "version": "4.0.1",
   "author": {
     "name": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
@@ -34,8 +34,8 @@
   "scripts": {
     "test": "standard && tape test/*.js"
   },
-  "dependencies": {
-    "rimraf": "^3.0.0"
+  "engines": {
+    "node": ">=12.10"
   },
   "funding": [
     {

package/test/unzip.js

@@ -1,22 +1,21 @@
-var fs = require('fs')
-var path = require('path')
-var rimraf = require('rimraf')
-var test = require('tape')
-var zip = require('../')
+const fs = require('fs')
+const path = require('path')
+const test = require('tape')
+const zip = require('../')
 
-var filePath = path.join(__dirname, 'content', 'file.txt')
-var fileZipPath = path.join(__dirname, 'content', 'file.txt.zip')
-var tmpPath = path.join(__dirname, 'tmp')
+const filePath = path.join(__dirname, 'content', 'file.txt')
+const fileZipPath = path.join(__dirname, 'content', 'file.txt.zip')
+const tmpPath = path.join(__dirname, 'tmp')
 
 fs.mkdirSync(tmpPath, { recursive: true })
 
 test('unzipSync', function (t) {
-  var tmpFilePath = path.join(tmpPath, 'file.txt')
-  rimraf.sync(tmpFilePath)
+  const tmpFilePath = path.join(tmpPath, 'file.txt')
+  fs.rmSync(tmpFilePath, { recursive: true, force: true })
   zip.unzipSync(fileZipPath, tmpPath)
 
-  var tmpFile = fs.readFileSync(tmpFilePath)
-  var file = fs.readFileSync(filePath)
+  const tmpFile = fs.readFileSync(tmpFilePath)
+  const file = fs.readFileSync(filePath)
 
   t.deepEqual(tmpFile, file)
   t.end()
@@ -25,15 +24,15 @@ test('unzipSync', function (t) {
 test('unzip', function (t) {
   t.plan(3)
 
-  var tmpFilePath = path.join(tmpPath, 'file.txt')
-  rimraf(tmpFilePath, function (err) {
+  const tmpFilePath = path.join(tmpPath, 'file.txt')
+  fs.rm(tmpFilePath, { recursive: true }, function (err) {
     t.error(err)
 
     zip.unzip(fileZipPath, tmpPath, function (err) {
       t.error(err)
 
-      var tmpFile = fs.readFileSync(tmpFilePath)
-      var file = fs.readFileSync(filePath)
+      const tmpFile = fs.readFileSync(tmpFilePath)
+      const file = fs.readFileSync(filePath)
 
       t.deepEqual(tmpFile, file)
     })
@@ -43,20 +42,24 @@ test('unzip', function (t) {
 test('unzip from a folder with a space in it', function (t) {
   t.plan(4)
 
-  var zipSpacePath = path.join(tmpPath, 'folder space', path.basename(fileZipPath))
+  const zipSpacePath = path.join(
+    tmpPath,
+    'folder space',
+    path.basename(fileZipPath)
+  )
   fs.mkdirSync(path.dirname(zipSpacePath), { recursive: true })
   fs.copyFileSync(fileZipPath, zipSpacePath)
 
-  var tmpFilePath = path.join(tmpPath, 'file.txt')
-  rimraf(tmpFilePath, function (err) {
+  const tmpFilePath = path.join(tmpPath, 'file.txt')
+  fs.rm(tmpFilePath, { recursive: true }, function (err) {
     t.error(err)
 
     zip.unzip(zipSpacePath, tmpPath, function (err) {
       t.error(err)
 
       t.ok(fs.existsSync(tmpFilePath), 'extracted file should exist')
-      var tmpFile = fs.readFileSync(tmpFilePath)
-      var file = fs.readFileSync(filePath)
+      const tmpFile = fs.readFileSync(tmpFilePath)
+      const file = fs.readFileSync(filePath)
 
       t.deepEqual(tmpFile, file)
     })

package/test/zip.js

@@ -1,24 +1,23 @@
-var fs = require('fs')
-var path = require('path')
-var rimraf = require('rimraf')
-var test = require('tape')
-var zip = require('../')
+const fs = require('fs')
+const path = require('path')
+const test = require('tape')
+const zip = require('../')
 
-var filePath = path.join(__dirname, 'content', 'file.txt')
-var tmpPath = path.join(__dirname, 'tmp')
+const filePath = path.join(__dirname, 'content', 'file.txt')
+const tmpPath = path.join(__dirname, 'tmp')
 
 fs.mkdirSync(tmpPath, { recursive: true })
 
 test('zipSync', function (t) {
-  var tmpFileZipPath = path.join(tmpPath, 'file.zip')
+  const tmpFileZipPath = path.join(tmpPath, 'file.zip')
   zip.zipSync(filePath, tmpFileZipPath)
 
-  var tmpFilePath = path.join(tmpPath, 'file.txt')
-  rimraf.sync(tmpFilePath)
+  const tmpFilePath = path.join(tmpPath, 'file.txt')
+  fs.rmSync(tmpFilePath, { recursive: true, force: true })
   zip.unzipSync(tmpFileZipPath, tmpPath)
 
-  var tmpFile = fs.readFileSync(tmpFilePath)
-  var file = fs.readFileSync(filePath)
+  const tmpFile = fs.readFileSync(tmpFilePath)
+  const file = fs.readFileSync(filePath)
 
   t.deepEqual(tmpFile, file)
   t.end()
@@ -27,19 +26,19 @@ test('zipSync', function (t) {
 test('zip', function (t) {
   t.plan(4)
 
-  var tmpFileZipPath = path.join(tmpPath, 'file.zip')
+  const tmpFileZipPath = path.join(tmpPath, 'file.zip')
   zip.zip(filePath, tmpFileZipPath, function (err) {
     t.error(err)
 
-    var tmpFilePath = path.join(tmpPath, 'file.txt')
-    rimraf(tmpFilePath, function (err) {
+    const tmpFilePath = path.join(tmpPath, 'file.txt')
+    fs.rm(tmpFilePath, { recursive: true }, function (err) {
       t.error(err)
 
       zip.unzip(tmpFileZipPath, tmpPath, function (err) {
         t.error(err)
 
-        var tmpFile = fs.readFileSync(tmpFilePath)
-        var file = fs.readFileSync(filePath)
+        const tmpFile = fs.readFileSync(tmpFilePath)
+        const file = fs.readFileSync(filePath)
 
         t.deepEqual(tmpFile, file)
       })

package/.travis.yml

@@ -1,9 +0,0 @@
-language: node_js
-node_js:
-  - lts/*
-os:
-  - linux
-  - osx
-  - windows
-git:
-  autocrlf: input