get upstream

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - "0.12"
-  - "4.4"
-  - "5.9"
+  - "10"
+  - "12"
+  - "node"

README.md

@@ -1,8 +1,8 @@
 # Inky
 
-[![Build Status](https://travis-ci.org/zurb/inky.svg?branch=master)](https://travis-ci.org/zurb/inky) [![npm version](https://badge.fury.io/js/inky.svg)](https://badge.fury.io/js/inky)
+[![Build Status](https://travis-ci.com/foundation/inky.svg?branch=master)](https://travis-ci.com/foundation/inky) [![npm version](https://badge.fury.io/js/inky.svg)](https://badge.fury.io/js/inky)
 
-Inky is an HTML-based templating language that converts simple HTML into complex, responsive email-ready HTML. Designed for [Foundation for Emails](http://foundation.zurb.com/emails), a responsive email framework from [ZURB](http://zurb.com).
+Inky is an HTML-based templating language that converts simple HTML into complex, responsive email-ready HTML. Designed for [Foundation for Emails](https://get.foundation/emails).
 
 Give Inky simple HTML like this:
 
@@ -75,14 +75,7 @@ function parse() {
 
 ### Command Line
 
-Install [inky-cli](https://github.com/zurb/inky-cli) to get the `inky` command. The first option is a glob of input files, and the second option is a folder to output them to. Add the `--watch` flag to re-compile when files are added or changed.
-
-```bash
-npm install inky-cli --global
-inky src/pages/**/*.html dist --watch
-```
-
-Doesn't support advanced settings at the moment.
+Install [foundation-cli](https://github.com/foundation/foundation-cli) to get the `foundation` command.
 
 ## Plugin Settings
 
@@ -92,7 +85,7 @@ Doesn't support advanced settings at the moment.
 - `columnCount` (Number): Column count for the grid. Make sure your Foundation for Emails project has the same column count in the Sass as well.
 - `cheerio` (Object): cheerio settings (for available options please refer to [cheerio project at github](https://github.com/cheeriojs/cheerio)).
 
-## Custom Elements
+## Custom Components
 
 Inky simplifies the process of creating HTML emails by expanding out simple tags like `<row>` and `<column>` into full table syntax. The names of the tags can be changed with the `components` setting.
 

lib/componentFactory.js

@@ -138,15 +138,15 @@ module.exports = function(element) {
       if (element.attr('size-sm') || element.attr('size-lg')) {
         if (element.attr('size-sm')) {
           size = (element.attr('size-sm'));
-          html += format('<table %s class="%s hide-for-large"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
+          html += format('<table %s class="%s hide-for-large"><tbody><tr><td height="'+size+'" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
         }
         if (element.attr('size-lg')) {
           size = (element.attr('size-lg'));
-          html += format('<table %s class="%s show-for-large"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
+          html += format('<table %s class="%s show-for-large"><tbody><tr><td height="'+size+'" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
         }
       } else {
         size = (element.attr('size')) || 16;
-        html += format('<table %s class="%s"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
+        html += format('<table %s class="%s"><tbody><tr><td height="'+size+'" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
       }
 
       if( element.attr('size-sm') && element.attr('size-lg') ) {

package.json

@@ -1,8 +1,8 @@
 {
   "name": "inky",
-  "version": "1.3.7",
+  "version": "1.4.2",
   "description": "Convert a simple HTML syntax into tables compatible with Foundation for Emails.",
-  "author": "ZURB <foundation@zurb.com> (http://foundation.zurb.com)",
+  "author": "Foundation <contact@get.foundation> (https://get.foundation)",
   "keywords": [
     "ink",
     "foundation",
@@ -11,7 +11,7 @@
   ],
   "main": "index.js",
   "scripts": {
-    "test": "mocha --compilers js:babel-register",
+    "test": "mocha --require babel-core/register",
     "browser": "gulp browser"
   },
   "dependencies": {
@@ -20,22 +20,22 @@
     "mkdirp": "^0.5.1",
     "object-values": "^1.0.0",
     "through2": "^2.0.0",
-    "vinyl-fs": "^2.3.0"
+    "vinyl-fs": "^3.0.3"
   },
   "devDependencies": {
     "assert-html-equal": "^1.0.0",
     "babel-preset-es2015": "^6.3.13",
     "babel-register": "^6.4.3",
     "browserify": "^13.1.0",
     "chalk": "^1.1.1",
-    "gulp": "git+https://github.com/gulpjs/gulp.git#4.0",
+    "gulp": "4.0",
     "gulp-uglify": "^2.0.0",
-    "mocha": "^2.4.5",
+    "mocha": "^8.0.1",
     "rimraf": "^2.5.1",
-    "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^1.1.0"
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0"
   },
-  "repository": "https://github.com/zurb/inky.git",
-  "bugs": "https://github.com/zurb/inky/issues",
+  "repository": "https://github.com/foundation/inky.git",
+  "bugs": "https://github.com/foundation/inky/issues",
   "license": "MIT"
 }

test/components.js

@@ -52,9 +52,7 @@ describe('Center', () => {
                 <table>
                   <tbody>
                     <tr>
-                      <th class="menu-item float-center">
-                        <a href="#"></a>
-                      </th>
+                      <th class="menu-item float-center"><a href="#"></a></th>
                     </tr>
                   </tbody>
                 </table>
@@ -319,7 +317,7 @@ describe('Spacer', () => {
       <table class="spacer">
         <tbody>
           <tr>
-            <td height="10px" style="font-size:10px;line-height:10px;">&nbsp;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -335,7 +333,7 @@ describe('Spacer', () => {
       <table class="spacer">
         <tbody>
           <tr>
-            <td height="16px" style="font-size:16px;line-height:16px;">&nbsp;</td>
+            <td height="16" style="font-size:16px;line-height:16px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -350,7 +348,7 @@ describe('Spacer', () => {
       <table class="spacer hide-for-large">
         <tbody>
           <tr>
-            <td height="10px" style="font-size:10px;line-height:10px;">&nbsp;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -365,7 +363,7 @@ describe('Spacer', () => {
       <table class="spacer show-for-large">
         <tbody>
           <tr>
-            <td height="20px" style="font-size:20px;line-height:20px;">&nbsp;</td>
+            <td height="20" style="font-size:20px;line-height:20px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -380,14 +378,14 @@ describe('Spacer', () => {
       <table class="spacer hide-for-large">
         <tbody>
           <tr>
-            <td height="10px" style="font-size:10px;line-height:10px;">&nbsp;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
       <table class="spacer show-for-large">
         <tbody>
           <tr>
-            <td height="20px" style="font-size:20px;line-height:20px;">&nbsp;</td>
+            <td height="20" style="font-size:20px;line-height:20px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -402,7 +400,7 @@ describe('Spacer', () => {
       <table class="spacer bgcolor">
         <tbody>
           <tr>
-            <td height="10px" style="font-size:10px;line-height:10px;">&nbsp;</td>
+            <td height="10" style="font-size:10px;line-height:10px;">&nbsp;</td>
           </tr>
         </tbody>
       </table>
@@ -442,7 +440,7 @@ describe('h-line', () => {
      compare(input, expected);
   });
 });
- 
+
 describe('raw', () => {
   it('creates a wrapper that ignores anything inside', () => {
     var input = `<raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw>`;