Merge pull request Urigo#1433 from Kamshak/master

fix(css-compiler): escape css output
Learn-app-ios · Sep 24, 2016 · 349414b · 349414b
2 parents 6cc8822 + 691690e
commit 349414b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/angular2-meteor/atmosphere-packages/css-compiler/compilers/basic_compiler.js b/packages/angular2-meteor/atmosphere-packages/css-compiler/compilers/basic_compiler.js
@@ -1,3 +1,4 @@
+const jsStringEscape = Npm.require('js-string-escape');
 
 /**
  * Contains addCompileResult that decides 
@@ -52,10 +53,7 @@ BasicCompiler = class BasicCompiler {
     // JS-module is being added as 'lazy', i.e.
     // it'll appear on the client only if it's
     // explicitly imported somewhere in the code base.
-    let css = Babel.compile(`
-      const css = \`${resultCss}\`;
-      module.exports.default = css;`
-    );
+    let css = Babel.compile('const css = "' + jsStringEscape(resultCss) + '"; module.exports.default = css;');
     inputFile.addJavaScript({
       data: css.code,
       path: sourcePath,

diff --git a/packages/angular2-meteor/atmosphere-packages/css-compiler/package.js b/packages/angular2-meteor/atmosphere-packages/css-compiler/package.js
@@ -7,7 +7,8 @@ Package.describe({
 });
 
 Npm.depends({
-  'less': 'https://github.com/meteor/less.js/tarball/8130849eb3d7f0ecf0ca8d0af7c4207b0442e3f6'
+  'less': 'https://github.com/meteor/less.js/tarball/8130849eb3d7f0ecf0ca8d0af7c4207b0442e3f6',
+  'js-string-escape': '1.0.1'
 });
 
 Package.onUse(function(api) {