@smartface/builder
Advanced tools
Comparing version 0.10.10 to 0.11.0-alpha.0
{ | ||
"name": "@smartface/builder", | ||
"version": "0.10.10", | ||
"version": "0.11.0-alpha.0", | ||
"description": "Smartface Builder", | ||
@@ -42,3 +42,3 @@ "bin": { | ||
}, | ||
"gitHead": "e7d002bb16ab36876481a068f3520fc5a77a2828" | ||
"gitHead": "4a7bb5f802dd39009d54271aeec83c8aff37934a" | ||
} |
@@ -16,2 +16,4 @@ const fs = require('fs-extra'); | ||
const ATTRIBUTES = require('../smfObject/attributes'); | ||
const { parseClassName, regexpOfParserClassName } = require('../util/parseClassNameHelper'); | ||
const dotProp = require('dot-prop'); | ||
var UNDEFINED_ATTRIBUTES_OBJECT = ATTRIBUTES.undefinedObject; | ||
@@ -147,2 +149,9 @@ | ||
let bundle = merge.apply(null, styles); | ||
Object.keys(bundle) | ||
.filter(key => regexpOfParserClassName.test(key)) | ||
.forEach(key => { | ||
const parsedKey = parseClassName(key); | ||
dotProp.set(bundle, parsedKey, bundle[key]); | ||
delete bundle[key]; | ||
}); | ||
let parentTheme = indexJSON.parent || defaultParentTheme; | ||
@@ -157,3 +166,5 @@ getThemePack(path.dirname(themeDir), parentTheme, defaultParentTheme).then( | ||
if (parentThemePack) { | ||
//console.time('Merge:' + themeName); | ||
bundle = merge(parentThemePack.bundle, bundle); | ||
//console.timeEnd('Merge:' + themeName); | ||
variablesJson = Object.assign(parentThemePack.variables, variablesJson); | ||
@@ -175,6 +186,8 @@ } | ||
resolve(themeBundles[themeName]); | ||
const parentThemeStr = parentTheme || ''; | ||
const repeatLen = 25 - parentThemeStr.length; | ||
console.log( | ||
`├─ 📦 Generated Bundle --> ${parentTheme || '-'.repeat(15)} -> ${path.basename( | ||
file | ||
)}` | ||
`├─ 📦 Generated Bundle ➪ ${'—'.repeat( | ||
repeatLen / 2 | ||
)} ${parentThemeStr} ${'—'.repeat(repeatLen / 2)}➞ ${themeName}` | ||
); | ||
@@ -181,0 +194,0 @@ }); |
Sorry, the diff of this file is not supported yet
213352
87
4593