Merge pull request #1800 from sass/feat/libsass-3.4.0.1

Bump LibSass to 3.4.0
sass · Dec 10, 2016 · c1b05b3 · c1b05b3
2 parents 1bb893f + dd946fd
commit c1b05b3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "3.13.1",
-  "libsass": "3.3.6",
+  "libsass": "3.4.0",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "bugs": "https://github.com/sass/node-sass/issues",
@@ -62,6 +62,8 @@
     "in-publish": "^2.0.0",
     "lodash.assign": "^4.2.0",
     "lodash.clonedeep": "^4.3.2",
+    "lodash.isarray": "^4.0.0",
+    "lodash.mergewith": "^4.6.0",
     "meow": "^3.7.0",
     "mkdirp": "^0.5.1",
     "nan": "^2.3.2",
@@ -79,6 +81,6 @@
     "object-merge": "^2.5.1",
     "read-yaml": "^1.0.0",
     "rimraf": "^2.5.2",
-    "sass-spec": "^3.3.6-5"
+    "sass-spec": "^3.4.0"
   }
 }
diff --git a/src/libsass b/src/libsass
diff --git a/src/libsass.gyp b/src/libsass.gyp
@@ -15,6 +15,7 @@
         'libsass/src/base64vlq.cpp',
         'libsass/src/bind.cpp',
         'libsass/src/cencode.c',
+        'libsass/src/check_nesting.cpp',
         'libsass/src/color_maps.cpp',
         'libsass/src/constants.cpp',
         'libsass/src/context.cpp',

diff --git a/test/fixtures/source-map-embed/expected.css b/test/fixtures/source-map-embed/expected.css
diff --git a/test/fixtures/source-map/expected.map b/test/fixtures/source-map/expected.map
@@ -4,6 +4,6 @@
 	"sources": [
 		"index.scss"
 	],
-	"mappings": "AAAA,AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAK,GACd;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,eAAe,EAAE,IAAK,GACvB;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,IAAK,GAKb;EAND,AAGE,OAHK,CAAC,EAAE,CAGR,CAAC,CAAC;IACA,WAAW,EAAE,IAAK,GACnB",
-	"names": []
+	"names": [],
+	"mappings": "AAAA,AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI,GACb;;AAED,AAAA,OAAO,CAAC,EAAE,CAAC;EACT,eAAe,EAAE,IAAI,GACtB;;AAED,AAAA,OAAO,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,IAAI,GAKZ;EAND,AAGE,OAHK,CAAC,EAAE,CAGR,CAAC,CAAC;IACA,WAAW,EAAE,IAAI,GAClB"
 }
diff --git a/test/spec.js b/test/spec.js
@@ -7,7 +7,9 @@ var assert = require('assert'),
       ? require('../lib-cov')
       : require('../lib'),
   readYaml = require('read-yaml'),
-  objectMerge = require('object-merge'),
+  mergeWith = require('lodash.mergewith'),
+  assign = require('lodash.assign'),
+  isArray = require('lodash.isarray'),
   glob = require('glob'),
   specPath = require('sass-spec').dirname.replace(/\\/g, '/'),
   impl = 'libsass',
@@ -32,7 +34,7 @@ var initialize = function(inputCss, options) {
   testCase.statusPath = join(folder, 'status');
   testCase.optionsPath = join(folder, 'options.yml');
   if (exists(testCase.optionsPath)) {
-    options = objectMerge(options, readYaml.sync(testCase.optionsPath));
+    options = mergeWith(assign({}, options), readYaml.sync(testCase.optionsPath), customizer);
   }
   testCase.includePaths = [
     folder,
@@ -41,6 +43,7 @@ var initialize = function(inputCss, options) {
   testCase.precision = parseFloat(options[':precision']) || 5;
   testCase.outputStyle = options[':output_style'] ? options[':output_style'].replace(':', '') : 'nested';
   testCase.todo = options[':todo'] !== undefined && options[':todo'] !== null && options[':todo'].indexOf(impl) !== -1;
+  testCase.only = options[':only_on'] !== undefined && options[':only_on'] !== null && options[':only_on'];
   testCase.warningTodo = options[':warning_todo'] !== undefined && options[':warning_todo'] !== null && options[':warning_todo'].indexOf(impl) !== -1;
   testCase.startVersion = parseFloat(options[':start_version']) || 0;
   testCase.endVersion = parseFloat(options[':end_version']) || 99;
@@ -59,6 +62,8 @@ var runTest = function(inputCssPath, options) {
   it(test.name, function(done) {
     if (test.todo || test.warningTodo) {
       this.skip('Test marked with TODO');
+    } else if (test.only && test.only.indexOf(impl) === -1) {
+      this.skip('Tests marked for only: ' + test.only.join(', '));
     } else if (version < test.startVersion) {
       this.skip('Tests marked for newer Sass versions only');
     } else if (version > test.endVersion) {
@@ -109,11 +114,18 @@ var specSuite = {
   suites: [],
   options: {}
 };
+
+function customizer(objValue, srcValue) {
+  if (isArray(objValue)) {
+    return objValue.concat(srcValue);
+  }
+}
+
 var executeSuite = function(suite, tests) {
   var suiteFolderLength = suite.folder.split('/').length;
   var optionsFile = join(suite.folder, 'options.yml');
   if (exists(optionsFile)) {
-    suite.options = objectMerge(suite.options, readYaml.sync(optionsFile));
+    suite.options = mergeWith(assign({}, suite.options), readYaml.sync(optionsFile), customizer);
   }
 
   // Push tests in the current suite
@@ -143,7 +155,7 @@ var executeSuite = function(suite, tests) {
               folder: suite.folder + '/' + prevSuite,
               tests: [],
               suites: [],
-              options: suite.options
+              options: assign({}, suite.options),
             },
             tests.slice(prevSuiteStart, i)
           )
@@ -159,7 +171,7 @@ var executeSuite = function(suite, tests) {
           folder: suite.folder + '/' + suiteName,
           tests: [],
           suites: [],
-          options: suite.options
+          options: assign({}, suite.options),
         },
         tests.slice(prevSuiteStart, tests.length)
       )
+65 −0		.github/CONTRIBUTING.md
+29 −0		.github/ISSUE_TEMPLATE.md
+8 −3		Makefile
+28 −22		Makefile.conf
+14 −7		Readme.md
+5 −8		configure.ac
+3 −0		docs/api-context-internal.md
+7 −0		docs/api-context.md
+4 −0		docs/api-doc.md
+2 −0		docs/api-importer.md
+55 −0		docs/api-value-example.md
+49 −22		docs/api-value.md
+4 −0		docs/implementations.md
+5 −4		include/sass/base.h
+3 −0		include/sass/context.h
+28 −27		include/sass/values.h
+1 −1		include/sass/version.h
+1 −1		include/sass2scss.h
+3 −3		script/ci-build-libsass
+12 −3		script/ci-install-deps
+321 −212		src/ast.cpp
+273 −165		src/ast.hpp
+4 −5		src/ast_factory.hpp
+8 −7		src/ast_fwd_decl.hpp
+2 −7		src/bind.cpp
+0 −1		src/bind.hpp
+379 −0		src/check_nesting.cpp
+60 −0		src/check_nesting.hpp
+7 −6		src/constants.cpp
+2 −1		src/constants.hpp
+7 −1		src/context.cpp
+1 −1		src/context.hpp
+76 −32		src/cssize.cpp
+7 −8		src/cssize.hpp
+70 −40		src/debugger.hpp
+15 −2		src/error_handling.cpp
+19 −0		src/error_handling.hpp
+107 −161		src/eval.cpp
+12 −8		src/eval.hpp
+81 −74		src/expand.cpp
+13 −12		src/expand.hpp
+149 −142		src/extend.cpp
+10 −3		src/extend.hpp
+2 −1		src/file.cpp
+96 −59		src/functions.cpp
+2 −2		src/functions.hpp
+33 −45		src/inspect.cpp
+7 −7		src/inspect.hpp
+17 −5		src/json.cpp
+3 −3		src/lexer.cpp
+10 −10		src/listize.cpp
+3 −3		src/listize.hpp
+30 −30		src/node.cpp
+13 −13		src/node.hpp
+21 −19		src/operation.hpp
+48 −103		src/output.cpp
+0 −1		src/output.hpp
+161 −133		src/parser.cpp
+10 −7		src/parser.hpp
+6 −6		src/remove_placeholders.cpp
+1 −1		src/remove_placeholders.hpp
+21 −0		src/sass.cpp
+8 −1		src/sass.hpp
+14 −3		src/sass2scss.cpp
+69 −24		src/sass_context.cpp
+3 −0		src/sass_context.hpp
+22 −10		src/source_map.cpp
+2 −2		src/to_value.cpp
+1 −1		src/to_value.hpp
+3 −1		src/units.hpp
+20 −16		src/util.cpp
+2 −1		src/util.hpp
+2 −0		win/libsass.targets
+6 −0		win/libsass.vcxproj.filters