Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
],
"dependencies": {
"falafel": "^2.1.0",
"fast-json-parse": "^1.0.2",
"findup": "^0.1.5",
"insert-css": "^2.0.0",
"map-limit": "0.0.1",
"postcss": "^5.0.10",
Expand Down
8 changes: 8 additions & 0 deletions test/fixtures/transform-package/expected.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
._75161010 .hello,._75161010 .world {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
._75161010 .hello,._75161010 .world {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
16 changes: 16 additions & 0 deletions test/fixtures/transform-package/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"sheetify": {
"transform": [
[
"sheetify-cssnext",
{
"sourcemap": false
}
]
]
},
"dependencies": {
"sheetify": "file:../../..",
"sheetify-cssnext": "^1.0.0"
}
}
16 changes: 16 additions & 0 deletions test/fixtures/transform-package/source.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const sf = require('sheetify')

const prefix = sf`
:host .hello, :host .world {
transform: translate(0, 0);
}
`

var foo = {}
foo.bar = sf`
:host .hello, :host .world {
transform: translate(0, 0);
}
`

console.log(prefix)
1 change: 1 addition & 0 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ require('./import')
require('./plugins')
require('./json')
require('./noparse')
require('./transform-package')
41 changes: 41 additions & 0 deletions test/transform-package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const browserify = require('browserify')
const concat = require('concat-stream')
const through = require('through2')
const test = require('tape')
const path = require('path')
const fs = require('fs')

const sheetify = require('../')

test('transform-package', function (t) {
t.test('should transform CSS from package.json with options', function (t) {
t.plan(1)

const expath = path.join(__dirname, 'fixtures/transform-package/expected.css')
const expected = fs.readFileSync(expath, 'utf8').trim()

const ws = concat(function (buf) {
const res = String(buf).trim()
t.equal(res, expected, 'CSS was transformed')
})

const bOpts = { browserField: false }
const bpath = path.join(__dirname, 'fixtures/transform-package/source.js')

browserify(bpath, bOpts)
.transform(sheetify)
.transform(function (file) {
return through(function (buf, enc, next) {
const str = buf.toString('utf8')
this.push(str.replace(/sheetify\/insert/g, 'insert-css'))
next()
})
})
.plugin('css-extract', { out: outFn })
.bundle()

function outFn () {
return ws
}
})
})
55 changes: 41 additions & 14 deletions transform.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
const cssResolve = require('style-resolve').sync
const staticEval = require('static-eval')
const parse = require('fast-json-parse')
const mapLimit = require('map-limit')
const through = require('through2')
const falafel = require('falafel')
const findup = require('findup')
const xtend = require('xtend')
const path = require('path')
const fs = require('fs')
Expand All @@ -22,8 +24,6 @@ function transform (filename, options) {
out: ''
})

opts.transform = [].concat(opts.transform || []).concat(opts.t || [])

const bufs = []
const transformStream = through(write, end)
return transformStream
Expand Down Expand Up @@ -54,19 +54,25 @@ function transform (filename, options) {
return
}

try {
const tmpAst = falafel(src, { ecmaVersion: 8 }, identifyModuleName)
ast = falafel(tmpAst.toString(), { ecmaVersion: 8 }, extractNodes)
} catch (err) {
return self.emit('error', err)
}

// transform all detected nodes and
// close stream when done
mapLimit(nodes, Infinity, iterate, function (err) {
findTransforms(filename, function (err, transforms) {
if (err) return self.emit('error', err)
self.push(ast.toString())
self.push(null)

opts.transform = transforms.concat(opts.transform || []).concat(opts.t || [])

try {
const tmpAst = falafel(src, { ecmaVersion: 8 }, identifyModuleName)
ast = falafel(tmpAst.toString(), { ecmaVersion: 8 }, extractNodes)
} catch (err) {
return self.emit('error', err)
}

// transform all detected nodes and
// close stream when done
mapLimit(nodes, Infinity, iterate, function (err) {
if (err) return self.emit('error', err)
self.push(ast.toString())
self.push(null)
})
})

function identifyModuleName (node) {
Expand Down Expand Up @@ -166,6 +172,27 @@ function transform (filename, options) {
})
}
}

function findTransforms (filename, done) {
findup(filename, 'package.json', function (err, pathname) {
// no package.json found - just run local transforms
if (err) return done(null, [])

var filename = path.join(pathname, 'package.json')
fs.readFile(filename, function (err, file) {
if (err) return done(err)
var parsed = parse(file)
if (parsed.err) return done(parsed.err)
var json = parsed.value
var d = json.sheetify
if (!d) return done(null, [])
var t = d.transform
if (!t || !Array.isArray(t)) return done(null, [])

return done(null, t)
})
})
}
}

function cooked (node) { return node.value.cooked }
Expand Down