@maizzle/framework 4.0.0-alpha.8 → 4.0.1

package/src/generators/posthtml.js

@@ -1,66 +1,66 @@
-const fm = require('front-matter')
-const posthtml = require('posthtml')
-const {get, merge} = require('lodash')
-const fetch = require('posthtml-fetch')
-const layouts = require('posthtml-extend')
-const modules = require('posthtml-modules')
-const expressions = require('posthtml-expressions')
-
-module.exports = async (html, config) => {
-  const layoutsOptions = get(config, 'build.layouts', {})
-
-  const modulesOptions = get(config, 'build.components', {})
-  // Fake `from` option so we can reference modules relatively
-  const modulesRoot = modulesOptions.root || './'
-  const modulesFrom = modulesOptions.from || `${modulesRoot}/fake`
-
-  const posthtmlOptions = get(config, 'build.posthtml.options', {})
-  const posthtmlPlugins = get(config, 'build.posthtml.plugins', [])
-
-  const expressionsOptions = merge({strictMode: false}, get(config, 'build.posthtml.expressions', {}))
-
-  const locals = merge(
-    get(expressionsOptions, 'locals', {}),
-    get(config, 'locals', {}),
-    {page: config}
-  )
-
-  const fetchPlugin = fetch(
-    merge(
-      {
-        expressions: merge({...expressionsOptions, locals})
-      },
-      get(config, 'build.posthtml.fetch', {})
-    )
-  )
-
-  return posthtml([
-    fetchPlugin,
-    expressions({...expressionsOptions, locals}),
-    layouts(
-      merge(
-        {
-          strict: false,
-          expressions: merge({...expressionsOptions, locals})
-        },
-        layoutsOptions
-      )
-    ),
-    modules({
-      parser: posthtmlOptions,
-      attributeAsLocals: true,
-      from: modulesFrom,
-      root: modulesRoot,
-      tag: 'component',
-      attribute: 'src',
-      plugins: [
-        fetchPlugin
-      ],
-      locals,
-      ...modulesOptions
-    }),
-    ...posthtmlPlugins
-  ])
-    .process(html, {...posthtmlOptions})
-    .then(result => fm(result.html).body)
-}
+const fm = require('front-matter')
+const posthtml = require('posthtml')
+const {get, merge} = require('lodash')
+const fetch = require('posthtml-fetch')
+const layouts = require('posthtml-extend')
+const modules = require('posthtml-modules')
+const expressions = require('posthtml-expressions')
+
+module.exports = async (html, config) => {
+  const layoutsOptions = get(config, 'build.layouts', {})
+
+  const modulesOptions = get(config, 'build.components', {})
+  // Fake `from` option so we can reference modules relatively
+  const modulesRoot = modulesOptions.root || './'
+  const modulesFrom = modulesOptions.from || `${modulesRoot}/fake`
+
+  const posthtmlOptions = get(config, 'build.posthtml.options', {})
+  const posthtmlPlugins = get(config, 'build.posthtml.plugins', [])
+
+  const expressionsOptions = merge({strictMode: false}, get(config, 'build.posthtml.expressions', {}))
+
+  const locals = merge(
+    get(expressionsOptions, 'locals', {}),
+    get(config, 'locals', {}),
+    {page: config}
+  )
+
+  const fetchPlugin = fetch(
+    merge(
+      {
+        expressions: merge({...expressionsOptions, locals})
+      },
+      get(config, 'build.posthtml.fetch', {})
+    )
+  )
+
+  return posthtml([
+    fetchPlugin,
+    expressions({...expressionsOptions, locals}),
+    layouts(
+      merge(
+        {
+          strict: false,
+          expressions: merge({...expressionsOptions, locals})
+        },
+        layoutsOptions
+      )
+    ),
+    modules({
+      parser: posthtmlOptions,
+      attributeAsLocals: true,
+      from: modulesFrom,
+      root: modulesRoot,
+      tag: 'component',
+      attribute: 'src',
+      plugins: [
+        fetchPlugin
+      ],
+      locals,
+      ...modulesOptions
+    }),
+    ...posthtmlPlugins
+  ])
+    .process(html, {...posthtmlOptions})
+    .then(result => fm(result.html).body)
+}

package/src/generators/tailwindcss.js

@@ -1,116 +1,116 @@
-const path = require('path')
-const fs = require('fs-extra')
-const postcss = require('postcss')
-const tailwindcss = require('tailwindcss')
-const postcssImport = require('postcss-import')
-const postcssNested = require('tailwindcss/nesting')
-const {requireUncached} = require('../utils/helpers')
-const mergeLonghand = require('postcss-merge-longhand')
-const {get, isObject, isEmpty, merge} = require('lodash')
-
-module.exports = {
-  compile: async (css = '', html = '', tailwindConfig = {}, maizzleConfig = {}, spinner = null) => {
-    tailwindConfig = (isObject(tailwindConfig) && !isEmpty(tailwindConfig)) ? tailwindConfig : get(maizzleConfig, 'build.tailwind.config', 'tailwind.config.js')
-
-    // Compute the Tailwind config to use
-    const userConfig = () => {
-      // If a custom config object was passed, use that
-      if (isObject(tailwindConfig) && !isEmpty(tailwindConfig)) {
-        return tailwindConfig
-      }
-
-      /**
-       * Try loading a fresh tailwind.config.js, with fallback to an empty object.
-       * This will use the default Tailwind config (with rem units etc)
-       */
-      try {
-        return requireUncached(path.resolve(process.cwd(), tailwindConfig))
-      } catch {
-        return {}
-      }
-    }
-
-    // Merge user's Tailwind config on top of a 'base' config
-    const config = merge({
-      important: true,
-      content: {
-        files: [
-          './src/**/*.*',
-          {raw: html, extension: 'html'}
-        ]
-      }
-    }, userConfig())
-
-    // Add back the `{raw: html}` option if user provided own config
-    if (Array.isArray(config.content)) {
-      config.content = {
-        files: [
-          ...config.content,
-          './src/**/*.*',
-          {raw: html, extension: 'html'}
-        ]
-      }
-    }
-
-    // Include all `build.templates.source` paths when scanning for selectors to preserve
-    const buildTemplates = get(maizzleConfig, 'build.templates')
-
-    if (buildTemplates) {
-      const templateObjects = Array.isArray(buildTemplates) ? buildTemplates : [buildTemplates]
-      const templateSources = templateObjects.map(template => {
-        const source = get(template, 'source')
-
-        if (typeof source === 'function') {
-          const sources = source(maizzleConfig)
-
-          if (Array.isArray(sources)) {
-            sources.map(s => config.content.files.push(s))
-          } else if (typeof sources === 'string') {
-            config.content.files.push(sources)
-          }
-
-          // Must return a valid `content` entry
-          return {raw: '', extension: 'html'}
-        }
-
-        // Support single-file sources i.e. src/templates/index.html
-        if (typeof source === 'string' && Boolean(path.extname(source))) {
-          config.content.files.push(source)
-
-          return {raw: '', extension: 'html'}
-        }
-
-        return `${source}/**/*.*`
-      })
-
-      config.content.files.push(...templateSources)
-    }
-
-    const userFilePath = get(maizzleConfig, 'build.tailwind.css', path.join(process.cwd(), 'src/css/tailwind.css'))
-    const userFileExists = await fs.pathExists(userFilePath)
-
-    if (userFileExists) {
-      css = await fs.readFile(path.resolve(userFilePath), 'utf8') + css
-    } else {
-      css = `@import "tailwindcss/components"; @import "tailwindcss/utilities"; ${css}`
-    }
-
-    return postcss([
-      postcssImport({path: path.dirname(userFilePath)}),
-      postcssNested(),
-      tailwindcss(config),
-      maizzleConfig.env === 'local' ? () => {} : mergeLonghand(),
-      ...get(maizzleConfig, 'build.postcss.plugins', [])
-    ])
-      .process(css, {from: undefined})
-      .then(result => result.css)
-      .catch(error => {
-        console.error(error)
-        if (spinner) {
-          spinner.stop()
-        }
-
-        throw new Error(`Tailwind CSS compilation failed`)
-      })
-  }
-}
+const path = require('path')
+const fs = require('fs-extra')
+const postcss = require('postcss')
+const tailwindcss = require('tailwindcss')
+const postcssImport = require('postcss-import')
+const postcssNested = require('tailwindcss/nesting')
+const {requireUncached} = require('../utils/helpers')
+const mergeLonghand = require('postcss-merge-longhand')
+const {get, isObject, isEmpty, merge} = require('lodash')
+
+module.exports = {
+  compile: async (css = '', html = '', tailwindConfig = {}, maizzleConfig = {}, spinner = null) => {
+    tailwindConfig = (isObject(tailwindConfig) && !isEmpty(tailwindConfig)) ? tailwindConfig : get(maizzleConfig, 'build.tailwind.config', 'tailwind.config.js')
+
+    // Compute the Tailwind config to use
+    const userConfig = () => {
+      // If a custom config object was passed, use that
+      if (isObject(tailwindConfig) && !isEmpty(tailwindConfig)) {
+        return tailwindConfig
+      }
+
+      /**
+       * Try loading a fresh tailwind.config.js, with fallback to an empty object.
+       * This will use the default Tailwind config (with rem units etc)
+       */
+      try {
+        return requireUncached(path.resolve(process.cwd(), tailwindConfig))
+      } catch {
+        return {}
+      }
+    }
+
+    // Merge user's Tailwind config on top of a 'base' config
+    const config = merge({
+      important: true,
+      content: {
+        files: [
+          './src/**/*.*',
+          {raw: html, extension: 'html'}
+        ]
+      }
+    }, userConfig())
+
+    // Add back the `{raw: html}` option if user provided own config
+    if (Array.isArray(config.content)) {
+      config.content = {
+        files: [
+          ...config.content,
+          './src/**/*.*',
+          {raw: html, extension: 'html'}
+        ]
+      }
+    }
+
+    // Include all `build.templates.source` paths when scanning for selectors to preserve
+    const buildTemplates = get(maizzleConfig, 'build.templates')
+
+    if (buildTemplates) {
+      const templateObjects = Array.isArray(buildTemplates) ? buildTemplates : [buildTemplates]
+      const templateSources = templateObjects.map(template => {
+        const source = get(template, 'source')
+
+        if (typeof source === 'function') {
+          const sources = source(maizzleConfig)
+
+          if (Array.isArray(sources)) {
+            sources.map(s => config.content.files.push(s))
+          } else if (typeof sources === 'string') {
+            config.content.files.push(sources)
+          }
+
+          // Must return a valid `content` entry
+          return {raw: '', extension: 'html'}
+        }
+
+        // Support single-file sources i.e. src/templates/index.html
+        if (typeof source === 'string' && Boolean(path.extname(source))) {
+          config.content.files.push(source)
+
+          return {raw: '', extension: 'html'}
+        }
+
+        return `${source}/**/*.*`
+      })
+
+      config.content.files.push(...templateSources)
+    }
+
+    const userFilePath = get(maizzleConfig, 'build.tailwind.css', path.join(process.cwd(), 'src/css/tailwind.css'))
+    const userFileExists = await fs.pathExists(userFilePath)
+
+    if (userFileExists) {
+      css = await fs.readFile(path.resolve(userFilePath), 'utf8') + css
+    } else {
+      css = `@import "tailwindcss/components"; @import "tailwindcss/utilities"; ${css}`
+    }
+
+    return postcss([
+      postcssImport({path: path.dirname(userFilePath)}),
+      postcssNested(),
+      tailwindcss(config),
+      maizzleConfig.env === 'local' ? () => {} : mergeLonghand(),
+      ...get(maizzleConfig, 'build.postcss.plugins', [])
+    ])
+      .process(css, {from: undefined})
+      .then(result => result.css)
+      .catch(error => {
+        console.error(error)
+        if (spinner) {
+          spinner.stop()
+        }
+
+        throw new Error(`Tailwind CSS compilation failed`)
+      })
+  }
+}

package/src/index.js

@@ -1,17 +1,17 @@
-const serve = require('./commands/serve')
-const toFile = require('./commands/build')
-const transformers = require('./transformers')
-const toString = require('./functions/render')
-const PostCSS = require('./generators/postcss')
-const toPlaintext = require('./functions/plaintext')
-const TailwindCSS = require('./generators/tailwindcss')
-
-module.exports = {
-  serve,
-  build: toFile,
-  ...transformers,
-  render: toString,
-  postcss: PostCSS,
-  plaintext: toPlaintext,
-  tailwindcss: TailwindCSS
-}
+const serve = require('./commands/serve')
+const toFile = require('./commands/build')
+const transformers = require('./transformers')
+const toString = require('./functions/render')
+const PostCSS = require('./generators/postcss')
+const toPlaintext = require('./functions/plaintext')
+const TailwindCSS = require('./generators/tailwindcss')
+
+module.exports = {
+  serve,
+  build: toFile,
+  ...transformers,
+  render: toString,
+  postcss: PostCSS,
+  plaintext: toPlaintext,
+  tailwindcss: TailwindCSS
+}

package/src/transformers/attributeToStyle.js

@@ -1,90 +1,90 @@
-const posthtml = require('posthtml')
-const parseAttrs = require('posthtml-attrs-parser')
-const {get, forEach, intersection, keys, isEmpty} = require('lodash')
-
-module.exports = async (html, config = {}, direct = false) => {
-  const posthtmlOptions = get(config, 'build.posthtml.options', {})
-  const attributes = get(config, 'inlineCSS.attributeToStyle', false)
-
-  if (typeof attributes === 'boolean' && attributes) {
-    return posthtml([attributesToStyle()]).process(html, posthtmlOptions).then(result => result.html)
-  }
-
-  if (Array.isArray(attributes) && !isEmpty(attributes)) {
-    return posthtml([attributesToStyle({attributes})]).process(html, posthtmlOptions).then(result => result.html)
-  }
-
-  if (direct) {
-    return posthtml([
-      attributesToStyle({
-        attributes: Array.isArray(config) ? config : []
-      })
-    ]).process(html).then(result => result.html)
-  }
-
-  return html
-}
-
-const attributesToStyle = (options = {}) => tree => {
-  options.attributes = options.attributes || ['width', 'height', 'bgcolor', 'background', 'align', 'valign']
-
-  const process = node => {
-    const nodeAttributes = parseAttrs(node.attrs)
-    const matches = intersection(keys(nodeAttributes), options.attributes)
-    const nodeStyle = get(node.attrs, 'style')
-    const csstoInline = []
-
-    forEach(matches, attribute => {
-      let value = get(node.attrs, attribute)
-
-      switch (attribute) {
-        case 'bgcolor':
-          csstoInline.push(`background-color: ${value}`)
-          break
-
-        case 'background':
-          csstoInline.push(`background-image: url('${value}')`)
-          break
-
-        case 'width':
-          value = Number.parseInt(value, 10) + (value.match(/px|%/) || 'px')
-          csstoInline.push(`width: ${value}`)
-          break
-
-        case 'height':
-          value = Number.parseInt(value, 10) + (value.match(/px|%/) || 'px')
-          csstoInline.push(`height: ${value}`)
-          break
-
-        case 'align':
-          if (node.tag !== 'table') {
-            return csstoInline.push(`text-align: ${value}`)
-          }
-
-          if (['left', 'right'].includes(value)) {
-            csstoInline.push(`float: ${value}`)
-          }
-
-          if (value === 'center') {
-            csstoInline.push('margin-left: auto', 'margin-right: auto')
-          }
-
-          break
-
-        case 'valign':
-          csstoInline.push(`vertical-align: ${value}`)
-          break
-
-        // No default
-      }
-    })
-
-    nodeAttributes.style = nodeStyle ? `${nodeStyle} ${csstoInline.join('; ')}` : `${csstoInline.join('; ')}`
-
-    node.attrs = nodeAttributes.compose()
-
-    return node
-  }
-
-  return tree.walk(process)
-}
+const posthtml = require('posthtml')
+const parseAttrs = require('posthtml-attrs-parser')
+const {get, forEach, intersection, keys, isEmpty} = require('lodash')
+
+module.exports = async (html, config = {}, direct = false) => {
+  const posthtmlOptions = get(config, 'build.posthtml.options', {})
+  const attributes = get(config, 'inlineCSS.attributeToStyle', false)
+
+  if (typeof attributes === 'boolean' && attributes) {
+    return posthtml([attributesToStyle()]).process(html, posthtmlOptions).then(result => result.html)
+  }
+
+  if (Array.isArray(attributes) && !isEmpty(attributes)) {
+    return posthtml([attributesToStyle({attributes})]).process(html, posthtmlOptions).then(result => result.html)
+  }
+
+  if (direct) {
+    return posthtml([
+      attributesToStyle({
+        attributes: Array.isArray(config) ? config : []
+      })
+    ]).process(html).then(result => result.html)
+  }
+
+  return html
+}
+
+const attributesToStyle = (options = {}) => tree => {
+  options.attributes = options.attributes || ['width', 'height', 'bgcolor', 'background', 'align', 'valign']
+
+  const process = node => {
+    const nodeAttributes = parseAttrs(node.attrs)
+    const matches = intersection(keys(nodeAttributes), options.attributes)
+    const nodeStyle = get(node.attrs, 'style')
+    const csstoInline = []
+
+    forEach(matches, attribute => {
+      let value = get(node.attrs, attribute)
+
+      switch (attribute) {
+        case 'bgcolor':
+          csstoInline.push(`background-color: ${value}`)
+          break
+
+        case 'background':
+          csstoInline.push(`background-image: url('${value}')`)
+          break
+
+        case 'width':
+          value = Number.parseInt(value, 10) + (value.match(/px|%/) || 'px')
+          csstoInline.push(`width: ${value}`)
+          break
+
+        case 'height':
+          value = Number.parseInt(value, 10) + (value.match(/px|%/) || 'px')
+          csstoInline.push(`height: ${value}`)
+          break
+
+        case 'align':
+          if (node.tag !== 'table') {
+            return csstoInline.push(`text-align: ${value}`)
+          }
+
+          if (['left', 'right'].includes(value)) {
+            csstoInline.push(`float: ${value}`)
+          }
+
+          if (value === 'center') {
+            csstoInline.push('margin-left: auto', 'margin-right: auto')
+          }
+
+          break
+
+        case 'valign':
+          csstoInline.push(`vertical-align: ${value}`)
+          break
+
+        // No default
+      }
+    })
+
+    nodeAttributes.style = nodeStyle ? `${nodeStyle} ${csstoInline.join('; ')}` : `${csstoInline.join('; ')}`
+
+    node.attrs = nodeAttributes.compose()
+
+    return node
+  }
+
+  return tree.walk(process)
+}