Update libsass to version 3.6.3

package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "4.13.1",
-  "libsass": "3.5.4",
+  "libsass": "3.6.3",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "bugs": "https://github.com/sass/node-sass/issues",

src/libsass.gyp

@@ -11,12 +11,21 @@
          'DEBUG'
       ],
       'sources': [
+        'libsass/src/ast2c.cpp',
         'libsass/src/ast.cpp',
         'libsass/src/ast_fwd_decl.cpp',
+        'libsass/src/ast_sel_cmp.cpp',
+        'libsass/src/ast_selectors.cpp',
+        'libsass/src/ast_sel_super.cpp',
+        'libsass/src/ast_sel_unify.cpp',
+        'libsass/src/ast_sel_weave.cpp',
+        'libsass/src/ast_supports.cpp',
+        'libsass/src/ast_values.cpp',
         'libsass/src/backtrace.cpp',
         'libsass/src/base64vlq.cpp',
         'libsass/src/bind.cpp',
         'libsass/src/cencode.c',
+        'libsass/src/c2ast.cpp',
         'libsass/src/check_nesting.cpp',
         'libsass/src/color_maps.cpp',
         'libsass/src/constants.cpp',
@@ -26,37 +35,45 @@
         'libsass/src/environment.cpp',
         'libsass/src/error_handling.cpp',
         'libsass/src/eval.cpp',
+        'libsass/src/eval_selectors.cpp',
         'libsass/src/expand.cpp',
-        'libsass/src/extend.cpp',
+        'libsass/src/extender.cpp',
+        'libsass/src/extension.cpp',
         'libsass/src/file.cpp',
-        'libsass/src/functions.cpp',
+        'libsass/src/fn_colors.cpp',
+        'libsass/src/fn_lists.cpp',
+        'libsass/src/fn_maps.cpp',
+        'libsass/src/fn_miscs.cpp',
+        'libsass/src/fn_numbers.cpp',
+        'libsass/src/fn_selectors.cpp',
+        'libsass/src/fn_strings.cpp',
+        'libsass/src/fn_utils.cpp',
         'libsass/src/inspect.cpp',
         'libsass/src/json.cpp',
         'libsass/src/lexer.cpp',
         'libsass/src/listize.cpp',
         'libsass/src/memory/SharedPtr.cpp',
-        'libsass/src/node.cpp',
         'libsass/src/operators.cpp',
         'libsass/src/operators.hpp',
         'libsass/src/output.cpp',
         'libsass/src/parser.cpp',
+        'libsass/src/parser_selectors.cpp',
         'libsass/src/plugins.cpp',
         'libsass/src/position.cpp',
         'libsass/src/prelexer.cpp',
         'libsass/src/remove_placeholders.cpp',
-        'libsass/src/sass.cpp',
         'libsass/src/sass2scss.cpp',
         'libsass/src/sass_context.cpp',
+        'libsass/src/sass.cpp',
         'libsass/src/sass_functions.cpp',
-        '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/stylesheet.cpp',
         'libsass/src/to_value.cpp',
         'libsass/src/units.cpp',
         'libsass/src/utf8_string.cpp',
         'libsass/src/util.cpp',
+        'libsass/src/util_string.cpp',
         'libsass/src/values.cpp'
       ],
       'cflags!': [

src/libsass/.editorconfig

@@ -10,6 +10,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[{Makefile, GNUmakefile.am}]
+[{Makefile,GNUmakefile.am}]
 indent_style = tab
 indent_size = 4

src/libsass/.github/CONTRIBUTING.md

@@ -32,7 +32,7 @@ direction for corners that lack test coverage). Foremost we rely on good and con
 
 ## My error is hiding in a big code base
 1. we do not have time to support your code base!
-2. to fix occuring issues we need precise bug reports
+2. to fix occurring issues we need precise bug reports
 3. the more precise you are, the faster we can help you
 4. lazy reports get overlooked even when exposing serious bugs
 5. it's not hard to do, it only takes time
@@ -60,6 +60,6 @@ report. Once you verified all of the above, you may use the template below to fi
 [6]: http://www.sassmeister.com/
 [7]: https://rubygems.org/gems/sass
 
-[8]: http://sass-lang.com/
+[8]: https://sass-lang.com/
 [9]: https://github.com/sass/libsass/tree/master/docs
 [10]: https://github.com/sass/sass-spec

src/libsass/.gitignore

@@ -2,6 +2,7 @@
 
 /sassc
 /sass-spec
+/plugins/
 
 VERSION
 .DS_Store
@@ -83,3 +84,13 @@ sassc/
 sass-spec/
 
 installer/
+
+# Visual Studio cache directory
+.vs/
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json

src/libsass/.travis.yml

@@ -1,6 +1,8 @@
 language: cpp
-sudo: false
 
+# ASan needs ptrace support which currently requires `sudo: required`.
+# See https://github.com/travis-ci/travis-ci/issues/9033.
+sudo: required
 
 # don't create redundant code coverage reports
 # - AUTOTOOLS=yes COVERAGE=yes BUILD=static
@@ -12,7 +14,7 @@ sudo: false
 # this will still catch all coding errors!
 # - AUTOTOOLS=yes COVERAGE=no BUILD=static
 
-# currenty there are various issues when
+# currently there are various issues when
 # built with coverage, clang and autotools
 # - AUTOTOOLS=yes COVERAGE=yes BUILD=shared
 
@@ -31,15 +33,19 @@ matrix:
           packages:
             - g++-5
     - os: linux
-      compiler: clang++-3.7
-      env: AUTOTOOLS=no COVERAGE=yes BUILD=static
+      compiler: g++-8
+      env: AUTOTOOLS=yes COVERAGE=no BUILD=shared
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
           packages:
-            - clang-3.7
+            - g++-8
+    - os: linux
+      compiler: clang
+      # This build runs with ASan and we set `detect_odr_violation=0`
+      # to work around https://bugs.llvm.org/show_bug.cgi?id=37545.
+      env: AUTOTOOLS=no COVERAGE=no BUILD=static ASAN_OPTIONS=detect_odr_violation=0
     - os: linux
       compiler: clang
       env: AUTOTOOLS=yes COVERAGE=no BUILD=shared
@@ -48,7 +54,7 @@ matrix:
       env: AUTOTOOLS=no COVERAGE=no BUILD=shared
     - os: osx
       compiler: clang
-      env: AUTOTOOLS=no COVERAGE=yes BUILD=static
+      env: AUTOTOOLS=no COVERAGE=no BUILD=static
     - os: osx
       compiler: clang
       env: AUTOTOOLS=yes COVERAGE=no BUILD=shared

src/libsass/CODE_OF_CONDUCT.md

@@ -0,0 +1,10 @@
+Sass is more than a technology; Sass is driven by the community of individuals
+that power its development and use every day. As a community, we want to embrace
+the very differences that have made our collaboration so powerful, and work
+together to provide the best environment for learning, growing, and sharing of
+ideas. It is imperative that we keep Sass a fun, welcoming, challenging, and
+fair place to play.
+
+[The full community guidelines can be found on the Sass website.][link]
+
+[link]: https://sass-lang.com/community-guidelines

src/libsass/GNUmakefile.am

@@ -18,11 +18,9 @@ AM_LDFLAGS  = $(AM_COPT) $(AM_COVLDFLAGS)
 AM_CPPFLAGS += -I$(top_srcdir)
 
 RESOURCES =
+AM_CXXFLAGS += -std=c++11
 if COMPILER_IS_MINGW32
   RESOURCES += res/libsass.rc
-  AM_CXXFLAGS += -std=gnu++0x
-else
-  AM_CXXFLAGS += -std=c++0x
 endif
 
 TEST_EXTENSIONS = .rb
@@ -48,7 +46,7 @@ TESTS = $(SASS_SPEC_PATH)/sass-spec.rb
 RB_LOG_COMPILER = ./script/tap-runner
 AM_RB_LOG_FLAGS = $(RUBY)
 
-SASS_TEST_FLAGS = -V 3.5 --impl libsass
+SASS_TEST_FLAGS = --impl libsass
 SASS_TEST_FLAGS += -r $(SASS_SPEC_PATH)
 SASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
 AM_TESTS_ENVIRONMENT = TEST_FLAGS='$(SASS_TEST_FLAGS)'
@@ -67,6 +65,9 @@ test_full:
 test_probe:
 	$(SASS_TESTER) --probe-todo $(SASS_TEST_FLAGS)
 
+test_interactive:
+	$(SASS_TESTER) --interactive $(SASS_TEST_FLAGS)
+
 .PHONY: test test_build test_full test_probe
 
 endif