From ef62b3bf55d9eb3a5a5988389ee8cd2c3c4af6b5 Mon Sep 17 00:00:00 2001
From: Felipe Gasper <felipe@felipegasper.com>
Date: Tue, 17 Oct 2017 08:39:43 +0200
Subject: [PATCH] Use zmodem.js from npm rather than a git submodule.

---
 .gitmodules                |  3 ---
 demo/js/formdata.min.js    |  1 -
 demo/js/zmodem.js          |  1 +
 package-lock.json          | 39 ++++++++++++++++++++++++++++++++------
 package.json               | 11 +++++------
 src/addons/zmodem/zmodemjs |  1 -
 6 files changed, 39 insertions(+), 17 deletions(-)
 delete mode 120000 demo/js/formdata.min.js
 create mode 120000 demo/js/zmodem.js
 delete mode 160000 src/addons/zmodem/zmodemjs

diff --git a/.gitmodules b/.gitmodules
index de5dc32b..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "zmodemjs"]
-	path = src/addons/zmodem/zmodemjs
-	url = https://github.com/FGasper/zmodemjs.git
diff --git a/demo/js/formdata.min.js b/demo/js/formdata.min.js
deleted file mode 120000
index efdf071c..00000000
--- a/demo/js/formdata.min.js
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/formdata-polyfill/formdata.min.js
\ No newline at end of file
diff --git a/demo/js/zmodem.js b/demo/js/zmodem.js
new file mode 120000
index 00000000..88c4a96d
--- /dev/null
+++ b/demo/js/zmodem.js
@@ -0,0 +1 @@
+../../node_modules/zmodem.js/dist/zmodem.js
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index db5a07fb..e4edceb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -672,6 +672,16 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
+    "crc-32": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.1.1.tgz",
+      "integrity": "sha1-XXOdXkxuNSrYME1zIj1IP+Va240=",
+      "dev": true,
+      "requires": {
+        "exit-on-epipe": "1.0.1",
+        "printj": "1.1.0"
+      }
+    },
     "create-ecdh": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
@@ -1031,6 +1041,12 @@
         }
       }
     },
+    "exit-on-epipe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
+      "dev": true
+    },
     "express": {
       "version": "4.13.4",
       "resolved": "https://registry.npmjs.org/express/-/express-4.13.4.tgz",
@@ -1502,11 +1518,6 @@
         "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"
       }
     },
-    "formdata-polyfill": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-2.0.4.tgz",
-      "integrity": "sha512-jsOLsQy0/dbO7BG3G9H1riXNuVxn5L2aBqdyzYUnxk1Jt4KztpF5N2HgHijzfs52temBpLYXz/jEwkbcQodfdQ=="
-    },
     "fs-extra": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
@@ -11795,6 +11806,12 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
       "dev": true
     },
+    "printj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.0.tgz",
+      "integrity": "sha512-NbiNBOQ0GioHyeD3ni8wZB7ZmfU7mxIrqhWR5XSreX3rUVvk5UOwpzxOnWqrLdCtoBbdQ40sEwC+nXxxjlUo0A==",
+      "dev": true
+    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -12436,7 +12453,8 @@
     "text-encoding": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
+      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
+      "dev": true
     },
     "through": {
       "version": "2.3.8",
@@ -13448,6 +13466,15 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
+    },
+    "zmodem.js": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/zmodem.js/-/zmodem.js-0.1.1.tgz",
+      "integrity": "sha1-KmQTeFGRndgRIG+UirTpAf9/lww=",
+      "dev": true,
+      "requires": {
+        "crc-32": "1.1.1"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 3149e085..2e247e9b 100644
--- a/package.json
+++ b/package.json
@@ -63,10 +63,12 @@
     "node-pty": "0.6.4",
     "nodemon": "1.10.2",
     "sorcery": "^0.10.0",
+    "text-encoding": "^0.6.4",
     "tslint": "^4.0.2",
     "typescript": "~2.4.0",
     "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^1.1.0"
+    "vinyl-source-stream": "^1.1.0",
+    "zmodem.js": "^0.1.1"
   },
   "scripts": {
     "prestart": "npm run build",
@@ -75,12 +77,9 @@
     "lint": "tslint src/*.ts src/**/*.ts",
     "test": "gulp test",
     "build:docs": "jsdoc -c jsdoc.json",
-    "build": "gulp build; cd src/addons/zmodem/zmodemjs; npm install",
+    "build": "gulp build",
     "prepublish": "npm run build",
     "coveralls": "gulp coveralls"
   },
-  "dependencies": {
-    "formdata-polyfill": "^2.0.4",
-    "text-encoding": "^0.6.4"
-  }
+  "dependencies": {}
 }
diff --git a/src/addons/zmodem/zmodemjs b/src/addons/zmodem/zmodemjs
deleted file mode 160000
index ae9e5cfd..00000000
--- a/src/addons/zmodem/zmodemjs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ae9e5cfd7139db593d525d18169dea46b55d552e