LibSass 3.4.3 (#1848)

* Bump LibSass to 3.4.3 * Update sourcemap test fixtures to match new LibSass behaviour * Bump [email protected]
sass · Jan 7, 2017 · 46266f1 · 46266f1
1 parent 5c83bb7
commit 46266f1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "4.1.1",
-  "libsass": "3.4.0",
+  "libsass": "3.4.3",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "bugs": "https://github.com/sass/node-sass/issues",
@@ -81,6 +81,6 @@
     "object-merge": "^2.5.1",
     "read-yaml": "^1.0.0",
     "rimraf": "^2.5.2",
-    "sass-spec": "3.4.0"
+    "sass-spec": "3.4.3"
   }
 }
diff --git a/src/libsass b/src/libsass
diff --git a/src/libsass.gyp b/src/libsass.gyp
@@ -32,7 +32,7 @@
         'libsass/src/json.cpp',
         'libsass/src/lexer.cpp',
         'libsass/src/listize.cpp',
-        'libsass/src/memory_manager.cpp',
+        'libsass/src/memory/SharedPtr.cpp',
         'libsass/src/node.cpp',
         'libsass/src/output.cpp',
         'libsass/src/parser.cpp',
@@ -47,6 +47,7 @@
         'libsass/src/sass_util.cpp',
         'libsass/src/sass_values.cpp',
         'libsass/src/source_map.cpp',
+        'libsass/src/subset_map.cpp',
         'libsass/src/to_c.cpp',
         'libsass/src/to_value.cpp',
         'libsass/src/units.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
@@ -5,5 +5,5 @@
 		"index.scss"
 	],
 	"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"
+	"mappings": "AAAA,AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI,GACb;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,eAAe,EAAE,IAAI,GACtB;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,IAAI,GAKZ;EAND,AAGE,OAHK,CAAC,EAAE,CAGR,CAAC,CAAC;IACA,WAAW,EAAE,IAAI,GAClB"
 }
+2 −1		Makefile.conf
+10 −5		appveyor.yml
+223 −0		docs/dev-ast-memory.md
+2 −0		include/sass/base.h
+7 −4		script/bootstrap
+3 −3		script/ci-build-libsass
+2 −0		script/ci-install-compiler
+2 −1		script/ci-report-coverage
+103 −0		script/test-leaks.pl
+621 −495		src/ast.cpp
+801 −367		src/ast.hpp
+5 −5		src/ast_def_macros.hpp
+0 −92		src/ast_factory.hpp
+312 −14		src/ast_fwd_decl.hpp
+54 −51		src/bind.cpp
+3 −7		src/bind.hpp
+117 −120		src/check_nesting.cpp
+38 −34		src/check_nesting.hpp
+3 −3		src/color_maps.cpp
+3 −3		src/color_maps.hpp
+33 −34		src/context.cpp
+12 −14		src/context.hpp
+200 −228		src/cssize.cpp
+49 −49		src/cssize.hpp
+260 −241		src/debugger.hpp
+6 −6		src/emitter.cpp
+7 −7		src/emitter.hpp
+2 −2		src/environment.cpp
+0 −2		src/environment.hpp
+5 −5		src/error_handling.cpp
+12 −12		src/error_handling.hpp
+412 −401		src/eval.cpp
+61 −62		src/eval.hpp
+233 −203		src/expand.cpp
+42 −42		src/expand.hpp
+198 −201		src/extend.cpp
+12 −14		src/extend.hpp
+4 −5		src/file.hpp
+424 −419		src/functions.cpp
+7 −10		src/functions.hpp
+115 −109		src/inspect.cpp
+69 −69		src/inspect.hpp
+31 −33		src/listize.cpp
+8 −10		src/listize.hpp
+116 −0		src/memory/SharedPtr.cpp
+202 −0		src/memory/SharedPtr.hpp
+0 −77		src/memory_manager.cpp
+0 −48		src/memory_manager.hpp
+45 −43		src/node.cpp
+15 −15		src/node.hpp
+136 −136		src/operation.hpp
+48 −49		src/output.cpp
+14 −14		src/output.hpp
+530 −554		src/parser.cpp
+91 −96		src/parser.hpp
+13 −10		src/prelexer.cpp
+25 −21		src/remove_placeholders.cpp
+7 −7		src/remove_placeholders.hpp
+2 −1		src/sass2scss.cpp
+125 −107		src/sass_context.cpp
+1 −1		src/sass_context.hpp
+5 −5		src/sass_util.hpp
+27 −27		src/sass_values.cpp
+2 −2		src/source_map.cpp
+2 −2		src/source_map.hpp
+57 −0		src/subset_map.cpp
+8 −76		src/subset_map.hpp
+13 −13		src/to_c.cpp
+14 −14		src/to_c.hpp
+20 −20		src/to_value.cpp
+20 −21		src/to_value.hpp
+3 −3		src/units.cpp
+55 −88		src/util.cpp
+9 −13		src/util.hpp
+27 −26		src/values.cpp
+2 −2		src/values.hpp
+69 −69		test/test_subset_map.cpp
+3 −2		win/libsass.targets
+9 −6		win/libsass.vcxproj.filters