Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Libsass 2b8a17a #2714

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 86 additions & 86 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,87 +1,87 @@
{
"name": "node-sass",
"version": "4.12.0",
"libsass": "3.5.4",
"description": "Wrapper around libsass",
"license": "MIT",
"bugs": "https://github.com/sass/node-sass/issues",
"homepage": "https://github.com/sass/node-sass",
"repository": {
"type": "git",
"url": "https://github.com/sass/node-sass"
},
"author": {
"name": "Andrew Nesbitt",
"email": "[email protected]",
"url": "http://andrew.github.com"
},
"engines": {
"node": ">=0.10.0"
},
"main": "lib/index.js",
"nodeSassConfig": {
"binarySite": "https://github.com/sass/node-sass/releases/download"
},
"bin": {
"node-sass": "bin/node-sass"
},
"gypfile": true,
"scripts": {
"coverage": "node scripts/coverage.js",
"install": "node scripts/install.js",
"postinstall": "node scripts/build.js",
"lint": "node_modules/.bin/eslint bin/node-sass lib scripts test",
"test": "node_modules/.bin/mocha test/{*,**/**}.js",
"build": "node scripts/build.js --force",
"prepublish": "not-in-install && node scripts/prepublish.js || in-install"
},
"files": [
"bin",
"binding.gyp",
"lib",
"scripts",
"src",
"test",
"vendor"
],
"keywords": [
"css",
"libsass",
"preprocessor",
"sass",
"scss",
"style"
],
"dependencies": {
"async-foreach": "^0.1.3",
"chalk": "^1.1.1",
"cross-spawn": "^3.0.0",
"gaze": "^1.0.0",
"get-stdin": "^4.0.1",
"glob": "^7.0.3",
"in-publish": "^2.0.0",
"lodash": "^4.17.11",
"meow": "^3.7.0",
"mkdirp": "^0.5.1",
"nan": "^2.13.2",
"node-gyp": "^3.8.0",
"npmlog": "^4.0.0",
"request": "^2.88.0",
"sass-graph": "^2.2.4",
"stdout-stream": "^1.4.0",
"true-case-path": "^1.0.2"
},
"devDependencies": {
"coveralls": "^3.0.2",
"eslint": "^3.4.0",
"fs-extra": "^0.30.0",
"istanbul": "^0.4.2",
"mocha": "^3.1.2",
"mocha-lcov-reporter": "^1.2.0",
"object-merge": "^2.5.1",
"read-yaml": "^1.0.0",
"rimraf": "^2.5.2",
"sass-spec": "https://github.com/sass/sass-spec.git#dc2d573",
"unique-temp-dir": "^1.0.0"
}
}
"name": "node-sass",
"version": "4.12.1",
"libsass": "3.6.1-28-g2b8a",
"description": "Wrapper around libsass",
"license": "MIT",
"bugs": "https://github.com/sass/node-sass/issues",
"homepage": "https://github.com/sass/node-sass",
"repository": {
"type": "git",
"url": "https://github.com/sass/node-sass"
},
"author": {
"name": "Andrew Nesbitt",
"email": "[email protected]",
"url": "http://andrew.github.com"
},
"engines": {
"node": ">=0.10.0"
},
"main": "lib/index.js",
"nodeSassConfig": {
"binarySite": "https://github.com/sass/node-sass/releases/download"
},
"bin": {
"node-sass": "bin/node-sass"
},
"gypfile": true,
"scripts": {
"coverage": "node scripts/coverage.js",
"install": "node scripts/install.js",
"postinstall": "node scripts/build.js",
"lint": "node_modules/.bin/eslint bin/node-sass lib scripts test",
"test": "node_modules/.bin/mocha test/{*,**/**}.js",
"build": "node scripts/build.js --force",
"prepublish": "not-in-install && node scripts/prepublish.js || in-install"
},
"files": [
"bin",
"binding.gyp",
"lib",
"scripts",
"src",
"test",
"vendor"
],
"keywords": [
"css",
"libsass",
"preprocessor",
"sass",
"scss",
"style"
],
"dependencies": {
"async-foreach": "^0.1.3",
"chalk": "^1.1.1",
"cross-spawn": "^3.0.0",
"gaze": "^1.0.0",
"get-stdin": "^4.0.1",
"glob": "^7.0.3",
"in-publish": "^2.0.0",
"lodash": "^4.17.11",
"meow": "^3.7.0",
"mkdirp": "^0.5.1",
"nan": "^2.13.2",
"node-gyp": "^3.8.0",
"npmlog": "^4.0.0",
"request": "^2.88.0",
"sass-graph": "^2.2.4",
"stdout-stream": "^1.4.0",
"true-case-path": "^1.0.2"
},
"devDependencies": {
"coveralls": "^3.0.2",
"eslint": "^3.4.0",
"fs-extra": "^0.30.0",
"istanbul": "^0.4.2",
"mocha": "^3.1.2",
"mocha-lcov-reporter": "^1.2.0",
"object-merge": "^2.5.1",
"read-yaml": "^1.0.0",
"rimraf": "^2.5.2",
"sass-spec": "https://github.com/sass/sass-spec.git#dc2d573",
Copy link
Member

@saper saper Aug 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be a bit too much whitespace change, can you check?

You need to figure out the right commit from the https://github.com/sass/sass-spec repository, it will be probably close to the master branch.

"unique-temp-dir": "^1.0.0"
}
}
36 changes: 27 additions & 9 deletions src/libsass.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,21 @@
'DEBUG'
],
'sources': [
'libsass/src/ast.cpp',
'libsass/src/ast_fwd_decl.cpp',
'libsass/src/ast_sel_cmp.cpp',
'libsass/src/ast_sel_super.cpp',
'libsass/src/ast_sel_unify.cpp',
'libsass/src/ast_sel_weave.cpp',
'libsass/src/ast_selectors.cpp',
'libsass/src/ast_supports.cpp',
'libsass/src/ast_values.cpp',
'libsass/src/ast.cpp',
'libsass/src/ast2c.cpp',
'libsass/src/backtrace.cpp',
'libsass/src/base64vlq.cpp',
'libsass/src/bind.cpp',
'libsass/src/c2ast.cpp',
'libsass/src/c99func.c',
'libsass/src/cencode.c',
'libsass/src/check_nesting.cpp',
'libsass/src/color_maps.cpp',
Expand All @@ -25,37 +35,45 @@
'libsass/src/emitter.cpp',
'libsass/src/environment.cpp',
'libsass/src/error_handling.cpp',
'libsass/src/eval_selectors.cpp',
'libsass/src/eval.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_selectors.cpp',
'libsass/src/parser.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_functions.cpp',
'libsass/src/sass_util.cpp',
'libsass/src/sass_values.cpp',
'libsass/src/sass.cpp',
'libsass/src/sass2scss.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_string.cpp',
'libsass/src/util.cpp',
'libsass/src/values.cpp'
],
Expand Down
2 changes: 1 addition & 1 deletion src/libsass/.editorconfig
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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
Empty file modified src/libsass/.gitattributes
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions src/libsass/.github/CONTRIBUTING.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Empty file modified src/libsass/.github/ISSUE_TEMPLATE.md
100644 → 100755
Empty file.
11 changes: 11 additions & 0 deletions src/libsass/.gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

/sassc
/sass-spec
/plugins/

VERSION
.DS_Store
Expand Down Expand Up @@ -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
18 changes: 12 additions & 6 deletions src/libsass/.travis.yml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions src/libsass/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -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
Empty file modified src/libsass/COPYING
100644 → 100755
Empty file.
9 changes: 5 additions & 4 deletions src/libsass/GNUmakefile.am
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)'
Expand All @@ -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
Expand Down
Empty file modified src/libsass/INSTALL
100644 → 100755
Empty file.
Empty file modified src/libsass/LICENSE
100644 → 100755
Empty file.
Loading