From 14470ca43fbb3e310b4c0617b9729e7894b0acd9 Mon Sep 17 00:00:00 2001
From: Avi Goldman <avrahamymgoldman@gmail.com>
Date: Wed, 25 Oct 2017 20:37:13 -0700
Subject: [PATCH] restructured utils package

---
 packages/heml-utils/src/{utils => }/condition.js          | 0
 packages/heml-utils/src/createElement.js                  | 4 ++--
 packages/heml-utils/src/index.js                          | 6 ++++--
 .../heml-utils/src/{utils => transforms}/convertProp.js   | 0
 .../heml-utils/src/{utils => transforms}/fallbackFor.js   | 0
 .../src/{utils => transforms}/ieAlignFallback.js          | 0
 packages/heml-utils/src/transforms/index.js               | 6 ++++++
 packages/heml-utils/src/{utils => transforms}/trueHide.js | 0
 packages/heml-utils/src/utils/index.js                    | 8 --------
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/heml-utils/src/{utils => }/condition.js (100%)
 rename packages/heml-utils/src/{utils => transforms}/convertProp.js (100%)
 rename packages/heml-utils/src/{utils => transforms}/fallbackFor.js (100%)
 rename packages/heml-utils/src/{utils => transforms}/ieAlignFallback.js (100%)
 create mode 100644 packages/heml-utils/src/transforms/index.js
 rename packages/heml-utils/src/{utils => transforms}/trueHide.js (100%)
 delete mode 100644 packages/heml-utils/src/utils/index.js

diff --git a/packages/heml-utils/src/utils/condition.js b/packages/heml-utils/src/condition.js
similarity index 100%
rename from packages/heml-utils/src/utils/condition.js
rename to packages/heml-utils/src/condition.js
diff --git a/packages/heml-utils/src/createElement.js b/packages/heml-utils/src/createElement.js
index a1d1ab0..e39b887 100644
--- a/packages/heml-utils/src/createElement.js
+++ b/packages/heml-utils/src/createElement.js
@@ -1,6 +1,6 @@
 import { defaults, isFunction } from 'lodash'
 
-const textRegex = /^(text(-([^-\s]+))?(-([^-\s]+))?|word-(break|spacing|wrap)|line-(break|height)|hanging-punctuation|hyphens|letter-spacing|overflow-wrap|tab-size|white-space|font-family|font-weight|font-style|font-variant|color)$/i
+const textRegex = /^(text(-([^-\s]+))?(-([^-\s]+))?|word-(break|spacing|wrap)|line-break|hanging-punctuation|hyphens|letter-spacing|overflow-wrap|tab-size|white-space|font-family|font-weight|font-style|font-variant|color)$/i
 
 export default function (name, element) {
   if (!name || name.trim().length === 0) {
@@ -14,7 +14,7 @@ export default function (name, element) {
   if (element.containsText) {
     element.rules = element.rules || {}
     element.rules['.header'] = [ textRegex ]
-    element.rules['.text'] = [ textRegex, 'font-size' ]
+    element.rules['.text'] = [ textRegex, 'font-size', 'line-height' ]
   }
 
   element = defaults({}, element || {}, {
diff --git a/packages/heml-utils/src/index.js b/packages/heml-utils/src/index.js
index 4e2b9c1..77ebeed 100644
--- a/packages/heml-utils/src/index.js
+++ b/packages/heml-utils/src/index.js
@@ -1,6 +1,8 @@
 import { renderElement } from '@heml/render'
+import cssGroups from 'css-groups'
 import createElement from './createElement'
 import HEMLError from './HEMLError'
-import utils from './utils'
+import transforms from './transforms'
+import condition from './condition'
 
-module.exports = { createElement, renderElement, HEMLError, utils }
+module.exports = { createElement, renderElement, HEMLError, cssGroups, transforms, condition }
diff --git a/packages/heml-utils/src/utils/convertProp.js b/packages/heml-utils/src/transforms/convertProp.js
similarity index 100%
rename from packages/heml-utils/src/utils/convertProp.js
rename to packages/heml-utils/src/transforms/convertProp.js
diff --git a/packages/heml-utils/src/utils/fallbackFor.js b/packages/heml-utils/src/transforms/fallbackFor.js
similarity index 100%
rename from packages/heml-utils/src/utils/fallbackFor.js
rename to packages/heml-utils/src/transforms/fallbackFor.js
diff --git a/packages/heml-utils/src/utils/ieAlignFallback.js b/packages/heml-utils/src/transforms/ieAlignFallback.js
similarity index 100%
rename from packages/heml-utils/src/utils/ieAlignFallback.js
rename to packages/heml-utils/src/transforms/ieAlignFallback.js
diff --git a/packages/heml-utils/src/transforms/index.js b/packages/heml-utils/src/transforms/index.js
new file mode 100644
index 0000000..48eac20
--- /dev/null
+++ b/packages/heml-utils/src/transforms/index.js
@@ -0,0 +1,6 @@
+import trueHide from './trueHide'
+import convertProp from './convertProp'
+import ieAlignFallback from './ieAlignFallback'
+import fallbackFor from './fallbackFor'
+
+export default { trueHide, convertProp, ieAlignFallback, fallbackFor }
diff --git a/packages/heml-utils/src/utils/trueHide.js b/packages/heml-utils/src/transforms/trueHide.js
similarity index 100%
rename from packages/heml-utils/src/utils/trueHide.js
rename to packages/heml-utils/src/transforms/trueHide.js
diff --git a/packages/heml-utils/src/utils/index.js b/packages/heml-utils/src/utils/index.js
deleted file mode 100644
index cde306f..0000000
--- a/packages/heml-utils/src/utils/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import cssGroups from 'css-groups'
-import trueHide from './trueHide'
-import convertProp from './convertProp'
-import ieAlignFallback from './ieAlignFallback'
-import fallbackFor from './fallbackFor'
-import condition from './condition'
-
-export default { cssGroups, trueHide, convertProp, ieAlignFallback, fallbackFor, condition }