Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Submodule: Updates LibSass to v3.2.0-beta.1 #764

Merged
merged 1 commit into from
Mar 18, 2015
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
4 changes: 4 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ environment:
# io.js
- nodejs_version: 1 # will fetch the latest io.js version

matrix:
allow_failures:
- nodejs_version: 1

install:
- ps: Install-Product node $env:nodejs_version
- node --version
Expand Down
8 changes: 5 additions & 3 deletions libsass.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
'src/libsass/constants.cpp',
'src/libsass/context.cpp',
'src/libsass/contextualize.cpp',
'src/libsass/copy_c_str.cpp',
'src/libsass/cssize.cpp',
'src/libsass/emitter.cpp',
'src/libsass/error_handling.cpp',
'src/libsass/eval.cpp',
'src/libsass/expand.cpp',
Expand All @@ -21,9 +22,10 @@
'src/libsass/inspect.cpp',
'src/libsass/json.cpp',
'src/libsass/node.cpp',
'src/libsass/output_compressed.cpp',
'src/libsass/output_nested.cpp',
'src/libsass/output.cpp',
'src/libsass/parser.cpp',
'src/libsass/plugins.cpp',
'src/libsass/position.cpp',
'src/libsass/prelexer.cpp',
'src/libsass/remove_placeholders.cpp',
'src/libsass/sass.cpp',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "node-sass",
"version": "3.0.0-alpha.1",
"libsass": "3.1.0",
"libsass": "3.2.0-beta.2",
"description": "Wrapper around libsass",
"license": "MIT",
"homepage": "https://github.com/sass/node-sass",
Expand Down
2 changes: 1 addition & 1 deletion src/binding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ NAN_METHOD(render_sync) {

int result = get_result(ctx_w, ctx, true);

sass_wrapper_dispose(ctx_w, source_string);
sass_free_context_wrapper(ctx_w);

NanReturnValue(NanNew<Boolean>(result == 0));
}
Expand Down
2 changes: 1 addition & 1 deletion src/libsass
Submodule libsass updated 104 files
2 changes: 1 addition & 1 deletion test/fixtures/source-map/expected.map
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"index.scss"
],
"sourcesContent": [],
"mappings": "AAAA;EACE,AAAO;EACP,AAAQ;;AAGV,AAAQ;EACN,AAAiB;;AAGnB,AAAQ;EACN,AAAO;EAET,AAAQ,AAAG;IACP,AAAa",
"mappings": "AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAI,GAFL;;AAKD,OAAO,CAAC,EAAE,CAAP;EACT,eAAe,EAAE,IAAK,GADZ;;AAIJ,OAAO,CAAC,EAAE,CAAP;EACT,KAAK,EAAE,IAAK,GADF;EAGV,OAAO,CAAC,EAAE,CAAC,CAAC,CAAV;IACA,WAAW,EAAE,IAAK,GADjB",
"names": []
}
2 changes: 1 addition & 1 deletion test/fixtures/spec
Submodule spec updated 3611 files
1 change: 1 addition & 0 deletions test/spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var assert = require('assert'),
util = require('./util');

describe('spec', function() {
this.timeout(0);
var suites = util.getSuites();

describe('test/sass-spec directory', function() {
Expand Down