From e243c8e12f760fe18253c1f4e1880f427821b264 Mon Sep 17 00:00:00 2001 From: Adeel Date: Sun, 15 Mar 2015 21:32:42 +0200 Subject: [PATCH] Submodule: Updates LibSass to v3.2.0-beta.1. * Updates sass-spec to corresponding commit. * Prevents source_string from freeing in data context case in binding code. * Corresponds to sass/libsass#925. --- appveyor.yml | 4 ++++ libsass.gyp | 8 +++++--- package.json | 2 +- src/binding.cpp | 2 +- src/libsass | 2 +- test/fixtures/source-map/expected.map | 2 +- test/fixtures/spec | 2 +- test/spec.js | 1 + 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f61d2a490..7fee0d712 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 diff --git a/libsass.gyp b/libsass.gyp index 3d113d69e..1a4b69b27 100644 --- a/libsass.gyp +++ b/libsass.gyp @@ -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', @@ -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', diff --git a/package.json b/package.json index 2ddbabc43..84e6195ac 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/binding.cpp b/src/binding.cpp index 71dd1f18a..0d8e7ca44 100644 --- a/src/binding.cpp +++ b/src/binding.cpp @@ -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(result == 0)); } diff --git a/src/libsass b/src/libsass index 31521ef3e..62314f6a3 160000 --- a/src/libsass +++ b/src/libsass @@ -1 +1 @@ -Subproject commit 31521ef3ece636892f395a80392448ceae449b90 +Subproject commit 62314f6a3cbc7dbed3878884504847edd7fecb7b diff --git a/test/fixtures/source-map/expected.map b/test/fixtures/source-map/expected.map index ad429779c..590b2eba4 100644 --- a/test/fixtures/source-map/expected.map +++ b/test/fixtures/source-map/expected.map @@ -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": [] } diff --git a/test/fixtures/spec b/test/fixtures/spec index 3dc1f5758..4b5b1cf3a 160000 --- a/test/fixtures/spec +++ b/test/fixtures/spec @@ -1 +1 @@ -Subproject commit 3dc1f5758786627f41cebd275238d9224a593e5f +Subproject commit 4b5b1cf3ae940964a52a1b8f06560f7a3aaf6d16 diff --git a/test/spec.js b/test/spec.js index cbf5af079..1f2d26ff1 100644 --- a/test/spec.js +++ b/test/spec.js @@ -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() {