Skip to content

Commit 00e236b

Browse files
committed
chore(libsass): upgrading to libsass 3.5.4
1 parent 6745590 commit 00e236b

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Sass parser in JavaScript. Have a look at the [Interactive Playground](http://sass.js.org/) to play around with compiling SCSS to CSS in your browser.
44

5-
This is a convenience API for [emscripted](https://github.com/kripken/emscripten) [libsass](https://github.com/sass/libsass) (at [v3.4.9](https://github.com/sass/libsass/releases/tag/3.4.9)). If you're looking to run Sass in node, you're probably looking for [node-sass](https://github.com/sass/node-sass). Sass.js and node-sass should generate the same results.
5+
This is a convenience API for [emscripted](https://github.com/kripken/emscripten) [libsass](https://github.com/sass/libsass) (at [v3.5.4](https://github.com/sass/libsass/releases/tag/3.5.4)). If you're looking to run Sass in node, you're probably looking for [node-sass](https://github.com/sass/node-sass). Sass.js and node-sass should generate the same results.
66

77
A fair warning: minified the worker weighs 3.4MB, gzipped it's still 740KB. If you're on NodeJS, please use the (considerably faster) [node-sass](https://github.com/andrew/node-sass) instead.
88

libsass/emterpreter_whitelist.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[
2-
"_ZN4Sass9To_StringC1EPNS_7ContextEbb",
32
"__Z20sass_compile_contextP12Sass_ContextN4Sass7Context4DataE",
43
"__Z20sass_compile_contextP12Sass_ContextPN4Sass7ContextE",
54
"__ZL20sass_compile_contextP12Sass_ContextPN4Sass7ContextE",
@@ -25,12 +24,14 @@
2524
"__ZN4Sass7Context14call_importersERKNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPKcRNS_11ParserStateEPNS_6ImportE",
2625
"__ZN4Sass7Context17register_resourceERKNS_7IncludeERKNS_8ResourceE",
2726
"__ZN4Sass7Context17register_resourceERKNS_7IncludeERKNS_8ResourceEPNS_11ParserStateE",
27+
"__ZN4Sass7Context17register_resourceERKNS_7IncludeERKNS_8ResourceERNS_11ParserStateE",
2828
"__ZN4Sass7Context19process_queue_entryERNS_11Sass_QueuedEj",
29-
"__ZN4Sass7Context8add_fileERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEES9_NS_11ParserStateE",
3029
"__ZN4Sass7Context8add_fileERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEb",
30+
"__ZN4Sass7Context8add_fileERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEES9_NS_11ParserStateE",
31+
"_emscripten_sleep",
3132
"_sass_compile_data_context",
3233
"_sass_compile_emscripten",
3334
"_sass_compiler_parse",
3435
"_sass_importer_emscripten",
35-
"_emscripten_sleep"
36+
"_ZN4Sass9To_StringC1EPNS_7ContextEbb"
3637
]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sass.js",
33
"version": "0.10.9",
4-
"libsass": "3.4.9",
4+
"libsass": "3.5.4",
55
"title": "Sass.js - API for emscripted libsass",
66
"description": "Sass.js is a convenience API for the JavaScript libsass (compiled with Emscripten)",
77
"homepage": "http://medialize.github.com/sass.js/",

test/test.import.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('@import', function() {
3434
done();
3535
});
3636
});
37-
37+
3838
it('should resolve nested imports', function(done) {
3939
var source = '@import "some-dir/testfile";';
4040
var expected = '.imported {\n content: "bar"; }\n\n.imported {\n content: "testfile"; }\n';
@@ -59,10 +59,10 @@ describe('@import', function() {
5959
Sass.compile(source, function(result) {
6060
expect(result).to.be.a('object');
6161
expect(result.line).to.equal(1);
62-
expect(result.message).to.equal('File to import not found or unreadable: unknown-file.\nParent style sheet: stdin');
62+
expect(result.message).to.equal('File to import not found or unreadable: unknown-file.');
6363

6464
done();
6565
});
6666
});
6767

68-
});
68+
});

0 commit comments

Comments
 (0)