From 579e2d19318ab1c64ee601bd317dd88ab41c6be0 Mon Sep 17 00:00:00 2001 From: Alxandr Date: Tue, 17 Feb 2015 04:50:41 +0100 Subject: [PATCH 1/3] Rewrite paths --- css-builder.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/css-builder.js b/css-builder.js index c8d6bc8..da5502a 100644 --- a/css-builder.js +++ b/css-builder.js @@ -20,11 +20,14 @@ module.exports = function bundle(loads, opts) { return "System\.register('" + load.name + "', [], false, function() {});"; }).join('\n'); - var cssOutput = new CleanCSS().minify(loads.map(function(load) { - return load.source; - }).reduce(function(sourceA, sourceB) { - return sourceA + sourceB; - }, '')).styles; + var cssOutput = loads.map(function(load) { + return new CleanCSS({ + target: opts.outFile, + relativeTo: load.address.substring('file:'.length), + }).minify(load.source).styles; + }).reduce(function(s1, s2) { + return s1 + s2; + }, ''); // write a separate CSS file if necessary if (this.separateCSS) { From ca5faf3767798985aeb34dd6ee68154b2862cc05 Mon Sep 17 00:00:00 2001 From: Alxandr Date: Tue, 17 Feb 2015 05:14:51 +0100 Subject: [PATCH 2/3] Use dirname --- css-builder.js | 3 ++- package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/css-builder.js b/css-builder.js index da5502a..a57bf22 100644 --- a/css-builder.js +++ b/css-builder.js @@ -1,5 +1,6 @@ var CleanCSS = require('clean-css'); var fs = require('fs'); +var path = require('path'); function escape(source) { return source @@ -23,7 +24,7 @@ module.exports = function bundle(loads, opts) { var cssOutput = loads.map(function(load) { return new CleanCSS({ target: opts.outFile, - relativeTo: load.address.substring('file:'.length), + relativeTo: path.dirname(load.address.substring('file:'.length)), }).minify(load.source).styles; }).reduce(function(s1, s2) { return s1 + s2; diff --git a/package.json b/package.json index a2c8ee2..77260d1 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "registry": "jspm", "dependencies": { "clean-css": "npm:clean-css@~3.0.10", - "fs": "^0.1.1" + "fs": "^0.1.1", + "path": "^0.1.0" } } From 5c34acb62e8f5e2864fec2945a24d6f4e3f30900 Mon Sep 17 00:00:00 2001 From: Alxandr Date: Tue, 17 Feb 2015 05:45:17 +0100 Subject: [PATCH 3/3] Make sure to use right path --- css-builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css-builder.js b/css-builder.js index a57bf22..76d6173 100644 --- a/css-builder.js +++ b/css-builder.js @@ -23,7 +23,7 @@ module.exports = function bundle(loads, opts) { var cssOutput = loads.map(function(load) { return new CleanCSS({ - target: opts.outFile, + target: this.separateCSS ? opts.outFile : '.', relativeTo: path.dirname(load.address.substring('file:'.length)), }).minify(load.source).styles; }).reduce(function(s1, s2) {