Merge pull request #32 from StatelessSoftware/v0.2.2

V0.2.2

Author: DrewImm

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog - html-to-app
 
+## [0.2.2] - 2018-03-30
+
+### Fixes
+
+- [Issue #30] - Remaps with same tag seem to interfere
+- [Issue #29] - Build -f throws exception if app is open in another window
+- [Issue #28] - App isn't merged without -f
+
 ## [0.2.1] - 2018-03-29
 
 ### Additions

lib/chainlinks/builder.js

@@ -42,8 +42,14 @@ let Builder = function() {
 
             // Remove the bin forlder if force build
             if (payload.build.force) {
-                shell.execSync("rm -rf " + buildPath);
-                shouldBuild = true;
+                try {
+                    shell.execSync("rm -rf " + buildPath);
+                    shouldBuild = true;
+
+                }
+                catch (ex) {
+                    reject("Cannot remove build directory.  Please make sure it is not open in another window.");
+                }
             }
 
             // Create build directory if necessary
@@ -82,7 +88,14 @@ let Builder = function() {
 
             }
             else {
-                accept(payload);
+
+                // Merge build
+                if (this._mergeCmd && this.binCmd(this._mergeCmd)) {
+                    accept(payload);
+                }
+                else {
+                    reject("Could not merge");
+                }
             }
 
         });

lib/chainlinks/converter.js

@@ -42,8 +42,9 @@ let Converter = function() {
                     dom.window.document.querySelectorAll(remap.tag).forEach((element) => {
 
                         let href = "";
+                        let elementType = element.nodeName.toLowerCase();
 
-                        switch (remap.tag) {
+                        switch (elementType) {
                             case "a":
                             case "link":
                                 href = element.href;
@@ -80,7 +81,7 @@ let Converter = function() {
                             element.integrity = remap.integrity;
                         }
 
-                        switch (remap.tag) {
+                        switch (elementType) {
                             case "a":
                             case "link":
                                 element.href = href;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-to-app",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Convert HTML flat file sites to Apps",
   "main": "lib/index.js",
   "bin": {