Skip to content

Commit

Permalink
Add support for Node4 (#218)
Browse files Browse the repository at this point in the history
  • Loading branch information
giuseppeg authored May 31, 2017
1 parent 484f3bf commit ef0e4de
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 96 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"language": "node_js",
"node_js": "node"
}
language: node_js
node_js:
- "4"
- "6"
90 changes: 1 addition & 89 deletions lib/style-transform.js
Original file line number Diff line number Diff line change
@@ -1,89 +1 @@
const stylis = require('stylis')

function disableNestingPlugin(...args) {
let [context, , , parent = [], line, column] = args
if (context === 2) {
parent = parent[0]
if (
typeof parent === 'string' &&
parent.trim().length > 0 &&
parent.charAt(0) !== '@'
) {
throw new Error(
`Nesting detected at ${line}:${column}. ` +
'Unfortunately nesting is not supported by styled-jsx.'
)
}
}
}

let generator
let filename
let offset

function sourceMapsPlugin(...args) {
const [context, , , , line, column, length] = args

// Pre-processed, init source map
if (context === -1 && generator !== undefined) {
generator.addMapping({
generated: {
line: 1,
column: 0
},
source: filename,
original: offset
})

return
}

// Post-processed
if (context === -2 && generator !== undefined) {
generator = undefined
offset = undefined
filename = undefined

return
}

// Selector/property, update source map
if ((context === 1 || context === 2) && generator !== undefined) {
generator.addMapping({
generated: {
line: 1,
column: length
},
source: filename,
original: {
line: line + offset.line,
column: column + offset.column
}
})
}
}

stylis.use(disableNestingPlugin)
stylis.use(sourceMapsPlugin)
stylis.set({
cascade: false,
compress: true
})

/**
* Public transform function
*
* @param {String} prefix
* @param {String} styles
* @param {Object} settings
* @return {string}
*/
function transform(prefix, styles, settings = {}) {
generator = settings.generator
offset = settings.offset
filename = settings.filename

return stylis(prefix, styles)
}

module.exports = transform
module.exports = require('../dist/lib/style-transform')
2 changes: 1 addition & 1 deletion src/babel-external.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import hash from 'string-hash'
import * as t from 'babel-types'

import transform from '../lib/style-transform'
import transform from './lib/style-transform'
import { MARKUP_ATTRIBUTE_EXTERNAL } from './_constants'
import {
getExpressionText,
Expand Down
2 changes: 1 addition & 1 deletion src/babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import jsx from 'babel-plugin-syntax-jsx'
import hash from 'string-hash'

// Ours
import transform from '../lib/style-transform'
import transform from './lib/style-transform'
import {
exportDefaultDeclarationVisitor,
namedExportDeclarationVisitor,
Expand Down
89 changes: 89 additions & 0 deletions src/lib/style-transform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
const stylis = require('stylis')

function disableNestingPlugin(...args) {
let [context, , , parent = [], line, column] = args
if (context === 2) {
parent = parent[0]
if (
typeof parent === 'string' &&
parent.trim().length > 0 &&
parent.charAt(0) !== '@'
) {
throw new Error(
`Nesting detected at ${line}:${column}. ` +
'Unfortunately nesting is not supported by styled-jsx.'
)
}
}
}

let generator
let filename
let offset

function sourceMapsPlugin(...args) {
const [context, , , , line, column, length] = args

// Pre-processed, init source map
if (context === -1 && generator !== undefined) {
generator.addMapping({
generated: {
line: 1,
column: 0
},
source: filename,
original: offset
})

return
}

// Post-processed
if (context === -2 && generator !== undefined) {
generator = undefined
offset = undefined
filename = undefined

return
}

// Selector/property, update source map
if ((context === 1 || context === 2) && generator !== undefined) {
generator.addMapping({
generated: {
line: 1,
column: length
},
source: filename,
original: {
line: line + offset.line,
column: column + offset.column
}
})
}
}

stylis.use(disableNestingPlugin)
stylis.use(sourceMapsPlugin)
stylis.set({
cascade: false,
compress: true
})

/**
* Public transform function
*
* @param {String} prefix
* @param {String} styles
* @param {Object} settings
* @return {string}
*/
function transform(prefix, styles, settings = {}) {
generator = settings.generator
offset = settings.offset
filename = settings.filename

return stylis(prefix, styles)
}

module.exports = transform
2 changes: 1 addition & 1 deletion test/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import test from 'ava'

// Ours
import transform from '../lib/style-transform'
import transform from '../src/lib/style-transform'
import read from './_read'

test('transpile styles with attributes', async t => {
Expand Down

0 comments on commit ef0e4de

Please sign in to comment.