From ef77ee91d453c90224a64810854bf3885e0b92fa Mon Sep 17 00:00:00 2001
From: Ismail El Korchi <ismail.elkorchi@gmail.com>
Date: Fri, 15 May 2020 00:25:03 +0000
Subject: [PATCH] Delete the custom bundle script in favor of an npm package
 (#1433)

---
 bin/bundle.js | 92 ---------------------------------------------------
 package.json  |  4 +--
 2 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 bin/bundle.js

diff --git a/bin/bundle.js b/bin/bundle.js
deleted file mode 100644
index 8c10a28..0000000
--- a/bin/bundle.js
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env node
-
-const path = require( 'path' );
-const fs = require( 'fs' );
-const archiver = require('archiver');
-
-// Contains the excluded files and folders.
-const excludes = [
-	'.DS_Store',
-	'.stylelintrc.json',
-	'.eslintrc',
-	'.git',
-	'.gitattributes',
-	'.github',
-	'.gitignore',
-	'README.md',
-	'bin',
-	'composer.json',
-	'composer.lock',
-	'node_modules',
-	'package-lock.json',
-	'package.json',
-	'vendor',
-	'.travis.yml',
-	'phpcs.xml.dist',
-	'sass',
-	'style.css.map',
-];
-
-// The path of the zip file.
-const zipPath = path.join(
-	__dirname,
-	'/../../',
-	path.basename(path.dirname(__dirname))
-) + '.zip';
-
-
-// Create a file to stream archive data to.
-let output = fs.createWriteStream( zipPath );
-let archive = archiver('zip', {
-  zlib: { level: 9 }
-});
-
-/**
- * Recursively traverse the directory tree and append the files to the archive. 
- * @param {string} directoryPath - The path of the directory being looped through.
- */
-function traverseDirectoryTree( directoryPath ) {
-	const files = fs.readdirSync( directoryPath );
-	for ( const i in files ) {
-		const currentPath = directoryPath + '/' + files[i];
-		const stats = fs.statSync( currentPath );
-		let relativePath = path.relative(process.cwd(), currentPath);
-		if ( stats.isFile() && ! excludes.includes( files[i] ) ) {
-			archive.file(currentPath, {
-				name: `${relativePath}`
-			});
-		} else if ( stats.isDirectory() && ! excludes.includes( files[i] ) ) {
-			traverseDirectoryTree( currentPath );
-		}
-	}
-}
-
-// Listen for all archive data to be written.
-output.on('close', function () {
-	console.log(`Created ${path.basename(path.dirname(__dirname))}.zip of ${archive.pointer()} bytes`);
-});
-
-// Catch warnings during archiving.
-archive.on('warning', function(err) {
-	if (err.code === 'ENOENT') {
-		// log warning
-		console.log(err);
-	} else {
-		// throw error
-		throw err;
-	}
-});
-
-// Catch errors during archiving.
-archive.on('error', function(err){
-	throw err;
-});
-
-// Pipe archive data to the file.
-archive.pipe(output);
-
-// Append the files to the archive.
-traverseDirectoryTree( '.' );
-
-// Finalize the archive.
-archive.finalize();
diff --git a/package.json b/package.json
index 50bcaaa..98fc76f 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@wordpress/scripts": "^9.0.0",
-    "archiver": "^4.0.1",
+    "dir-archiver": "^1.1.1",
     "node-sass": "^4.14.0",
     "rtlcss": "^2.5.0"
   },
@@ -41,6 +41,6 @@
     "compile:rtl": "rtlcss style.css style-rtl.css",
     "lint:scss": "wp-scripts lint-style 'sass/**/*.scss'",
     "lint:js": "wp-scripts lint-js 'js/*.js'",
-    "bundle": "node bin/bundle.js"
+    "bundle": "dir-archiver --src . --dest ../_s.zip --exclude .DS_Store .stylelintrc.json .eslintrc .git .gitattributes .github .gitignore README.md composer.json composer.lock node_modules vendor package-lock.json package.json .travis.yml phpcs.xml.dist sass style.css.map"
   }
 }