sass · xzyfer · Apr 23, 2018 · Apr 23, 2018 · Apr 23, 2018
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "4.8.3",
-  "libsass": "3.5.2",
+  "libsass": "3.5.3",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "bugs": "https://github.com/sass/node-sass/issues",
@@ -83,7 +83,7 @@
     "object-merge": "^2.5.1",
     "read-yaml": "^1.0.0",
     "rimraf": "^2.5.2",
-    "sass-spec": "^3.5.1",
+    "sass-spec": "3.5.1",
     "unique-temp-dir": "^1.0.0"
   }
 }
diff --git a/src/libsass/GNUmakefile.am b/src/libsass/GNUmakefile.am
@@ -25,63 +25,49 @@ else
   AM_CXXFLAGS += -std=c++0x
 endif
 
+TEST_EXTENSIONS = .rb
+
 if ENABLE_TESTS
 
-noinst_PROGRAMS = tester
+SASS_SASSC_PATH ?= $(top_srcdir)/sassc
+SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
 
+noinst_PROGRAMS = tester
 tester_LDADD = src/libsass.la
-tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
-tester_VERSION ?= `cd "$(SASS_SASSC_PATH)" && ./version.sh`
-tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(tester_VERSION)\""
-tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(tester_VERSION)\""
 tester_LDFLAGS = $(AM_LDFLAGS)
+nodist_tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
+SASS_SASSC_VERSION ?= `cd "$(SASS_SASSC_PATH)" && ./version.sh`
+tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(SASS_SASSC_VERSION)\""
+tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(SASS_SASSC_VERSION)\""
 
 if ENABLE_COVERAGE
 nodist_EXTRA_tester_SOURCES = non-existent-file-to-force-CXX-linking.cxx
 endif
 
-SASS_SASSC_PATH ?= $(top_srcdir)/sassc
-SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
-
-TESTS = \
-	$(SASS_SPEC_PATH)/spec/basic \
-	$(SASS_SPEC_PATH)/spec/css \
-	$(SASS_SPEC_PATH)/spec/extend-tests \
-	$(SASS_SPEC_PATH)/spec/extends \
-	$(SASS_SPEC_PATH)/spec/libsass \
-	$(SASS_SPEC_PATH)/spec/libsass-closed-issues \
-	$(SASS_SPEC_PATH)/spec/maps \
-	$(SASS_SPEC_PATH)/spec/misc \
-	$(SASS_SPEC_PATH)/spec/regressions \
-	$(SASS_SPEC_PATH)/spec/scss \
-	$(SASS_SPEC_PATH)/spec/scss-tests \
-	$(SASS_SPEC_PATH)/spec/types
+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
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) ./script/tap-driver
-AM_LOG_FLAGS = -c ./tester $(LOG_FLAGS)
-if USE_TAP
-	AM_LOG_FLAGS += -t
-	SASS_TEST_FLAGS += -t | tapout
-	LOG_COMPILER = ./script/tap-runner $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-else
-	LOG_COMPILER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-endif
+SASS_TEST_FLAGS += -r $(SASS_SPEC_PATH)
+SASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
+AM_TESTS_ENVIRONMENT = TEST_FLAGS='$(SASS_TEST_FLAGS)'
 
 SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-SASS_TESTER += -c $(top_srcdir)/tester$(EXEEXT)
 
 test:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(SASS_TEST_FLAGS)
 
 test_build:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(SASS_TEST_FLAGS)
 
 test_full:
-	$(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) --run-todo $(SASS_TEST_FLAGS)
 
 test_probe:
-	$(SASS_TESTER) --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) --probe-todo $(SASS_TEST_FLAGS)
+
+.PHONY: test test_build test_full test_probe
 
 endif
 

diff --git a/src/libsass/Readme.md b/src/libsass/Readme.md
@@ -1,104 +1,20 @@
-LibSass - Sass compiler written in C++
-======================================
+Welcome to the LibSass documentation!
 
-Currently maintained by Marcel Greter ([@mgreter]) and Michael Mifsud ([@xzyfer])  
-Originally created by Aaron Leung ([@akhleung]) and Hampton Catlin ([@hcatlin])
+## First Off
+LibSass is just a library. To run the code locally (i.e. to compile your stylesheets), you need an implementer. SassC (get it?) is an implementer written in C. There are a number of other implementations of LibSass - for example Node. We encourage you to write your own port - the whole point of LibSass is that we want to bring Sass to many other languages, not just Ruby!
 
-[![Unix CI](https://travis-ci.org/sass/libsass.svg?branch=master)](https://travis-ci.org/sass/libsass "Travis CI")
-[![Windows CI](https://ci.appveyor.com/api/projects/status/github/sass/libsass?svg=true)](https://ci.appveyor.com/project/sass/libsass/branch/master "Appveyor CI")
-[![Coverage Status](https://img.shields.io/coveralls/sass/libsass.svg)](https://coveralls.io/r/sass/libsass?branch=feature%2Ftest-travis-ci-3 "Code coverage of spec tests")
-[![Percentage of issues still open](http://isitmaintained.com/badge/open/sass/libsass.svg)](http://isitmaintained.com/project/sass/libsass "Percentage of issues still open")
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/sass/libsass.svg)](http://isitmaintained.com/project/sass/libsass "Average time to resolve an issue")
-[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=283068)](https://www.bountysource.com/trackers/283068-libsass?utm_source=283068&utm_medium=shield&utm_campaign=TRACKER_BADGE "Bountysource")
-[![Join us](https://libsass-slack.herokuapp.com/badge.svg)](https://libsass-slack.herokuapp.com/ "Slack communication channels")
+We're working hard on moving to full parity with Ruby Sass... learn more at the [The-LibSass-Compatibility-Plan](compatibility-plan.md)!
 
+### Implementing LibSass
 
-[LibSass](https://github.com/sass/libsass "LibSass GitHub Project") is just a library!
-If you want to use LibSass to compile Sass, you need an implementer. Some
-implementations are only bindings into other programming languages. But most also
-ship with a command line interface (CLI) you can use directly. There is also
-[SassC](https://github.com/sass/sassc), which is the official lightweight
-CLI tool built by the same people as LibSass.
+If you're interested in implementing LibSass in your own project see the [API Documentation](api-doc.md) which now includes implementing
+your own [Sass functions](api-function.md).  You may wish to [look at other implementations](implementations.md) for your language of choice.
+Or make your own!
 
-### Excerpt of "sanctioned" implementations:
+### Contributing to LibSass
 
-- https://github.com/sass/node-sass (Node.js)
-- https://github.com/sass/perl-libsass (Perl)
-- https://github.com/sass/libsass-python (Python)
-- https://github.com/wellington/go-libsass (Go)
-- https://github.com/sass/sassc-ruby (Ruby)
-- https://github.com/sass/libsass-net (C#)
-- https://github.com/medialize/sass.js (JS)
-- https://github.com/bit3/jsass (Java)
+|   Issue Tracker   |            Issue Triage          |     Community Guidelines    |
+|-------------------|----------------------------------|-----------------------------|
+| We're always needing help, so check out our issue tracker, help some people out, and read our article on [Contributing](contributing.md)! It's got all the details on what to do! | To help understand the process of triaging bugs, have a look at our [Issue-Triage](triage.md) document. | Oh, and don't forget we always follow [[Sass Community Guidelines|http://sass-lang.com/community-guidelines]]. Be nice and everyone else will be nice too! |
 
-This list does not say anything about the quality of either the listed or not listed [implementations](docs/implementations.md)!  
-The authors of the listed projects above are just known to work regularly together with LibSass developers.
-
-About
------
-
-LibSass is a C++ port of the original Ruby Sass CSS compiler with a [C API](docs/api-doc.md).
-We coded LibSass with portability and efficiency in mind. You can expect LibSass to be a lot
-faster than Ruby Sass and on par or faster than the best alternative CSS compilers around.
-
-Developing
-----------
-
-As noted above, the LibSass repository does not contain any binaries or other way to execute
-LibSass. Therefore, you need an implementer to develop LibSass. Easiest is to start with
-the official [SassC](http://github.com/sass/sassc) CLI wrapper. It is *guaranteed* to compile
-with the latest code in LibSass master, since it is also used in the CI process. There is no
-limitation here, as you may use any other LibSass implementer to test your LibSass branch!
-
-Testing
--------
-
-Since LibSass is a pure library, tests are run through the [Sass-Spec](https://github.com/sass/sass-spec)
-project using the [SassC](http://github.com/sass/sassc) CLI wrapper. To run the tests against LibSass while
-developing, you can run `./script/spec`. This will clone SassC and Sass-Spec under the project folder and
-then run the Sass-Spec test suite. You may want to update the clones to ensure you have the latest version.
-Note that the scripts in the `./script` folder are mainly intended for our CI needs.
-
-Building
---------
-
-To build LibSass you need GCC 4.6+ or Clang/LLVM. If your OS is older, you may need to upgrade
-them first (or install clang as an alternative). On Windows, you need MinGW with GCC 4.6+ or VS 2013
-Update 4+. It is also possible to build LibSass with Clang/LLVM on Windows with various build chains
-and/or command line interpreters.
-
-See the [build docs for further instructions](docs/build.md)!
-
-Compatibility
--------------
-
-Current LibSass 3.4 should be compatible with Sass 3.4. Please refer to the [sass compatibility
-page](http://sass-compatibility.github.io/) for a more detailed comparison. But note that there
-are still a few incomplete edges which we are aware of. Otherwise LibSass has reached a good level
-of stability, thanks to our ever growing [Sass-Spec test suite](https://github.com/sass/sass-spec).
-
-About Sass
-----------
-
-Sass is a CSS pre-processor language to add on exciting, new, awesome features to CSS. Sass was
-the first language of its kind and by far the most mature and up to date codebase.
-
-Sass was originally conceived of by the co-creator of this library, Hampton Catlin ([@hcatlin]).
-Most of the language has been the result of years of work by Natalie Weizenbaum ([@nex3]) and
-Chris Eppstein ([@chriseppstein]).
-
-For more information about Sass itself, please visit http://sass-lang.com
-
-Initial development of LibSass by Aaron Leung and Hampton Catlin was supported by [Moovweb](http://www.moovweb.com).
-
-Licensing
----------
-
-Our [MIT license](LICENSE) is designed to be as simple and liberal as possible.
-
-[@hcatlin]: https://github.com/hcatlin
-[@akhleung]: https://github.com/akhleung
-[@chriseppstein]: https://github.com/chriseppstein
-[@nex3]: https://github.com/nex3
-[@mgreter]: https://github.com/mgreter
-[@xzyfer]: https://github.com/xzyfer
+Please refer to the steps on [Building LibSass](build.md)
diff --git a/src/libsass/api-context-example.md b/src/libsass/api-context-example.md
@@ -0,0 +1,45 @@
+## Example main.c
+
+```C
+#include <stdio.h>
+#include "sass/context.h"
+
+int main( int argc, const char* argv[] )
+{
+
+  // get the input file from first argument or use default
+  const char* input = argc > 1 ? argv[1] : "styles.scss";
+
+  // create the file context and get all related structs
+  struct Sass_File_Context* file_ctx = sass_make_file_context(input);
+  struct Sass_Context* ctx = sass_file_context_get_context(file_ctx);
+  struct Sass_Options* ctx_opt = sass_context_get_options(ctx);
+
+  // configure some options ...
+  sass_option_set_precision(ctx_opt, 10);
+
+  // context is set up, call the compile step now
+  int status = sass_compile_file_context(file_ctx);
+
+  // print the result or the error to the stdout
+  if (status == 0) puts(sass_context_get_output_string(ctx));
+  else puts(sass_context_get_error_message(ctx));
+
+  // release allocated memory
+  sass_delete_file_context(file_ctx);
+
+  // exit status
+  return status;
+
+}
+```
+
+### Compile main.c
+
+```bash
+gcc -c main.c -o main.o
+gcc -o sample main.o -lsass
+echo "foo { margin: 21px * 2; }" > foo.scss
+./sample foo.scss => "foo { margin: 42px }"
+```
+