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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sass/node-sass
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dfe1f05aba0f681eb237bc146d8cf1716d1086c4
Choose a base ref
...
head repository: sass/node-sass
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b54053a1b50fd97e951eb0311a7fb818683a8e99
Choose a head ref

Commits on Jul 19, 2018

  1. Copy the full SHA
    71fe854 View commit details
  2. Copy the full SHA
    e8f6b85 View commit details

Commits on Dec 1, 2018

  1. Copy the full SHA
    0bd48bb View commit details

Commits on Dec 5, 2018

  1. Copy the full SHA
    454bb8e View commit details

Commits on Dec 16, 2018

  1. Merge pull request #2454 from nschonni/troubleshooting-edits

    Troubleshooting edits
    nschonni authored Dec 16, 2018
    Copy the full SHA
    7c1dd8e View commit details

Commits on Jan 4, 2019

  1. Remove @adamyeats from maintainers list

    Adam Yeats authored and xzyfer committed Jan 4, 2019
    Copy the full SHA
    088b80b View commit details

Commits on Jan 22, 2019

  1. Copy the full SHA
    44366b3 View commit details

Commits on Feb 4, 2019

  1. removed outdated TOC entries

    DerZyklop authored and xzyfer committed Feb 4, 2019
    Copy the full SHA
    a2ac801 View commit details

Commits on Mar 5, 2019

  1. https-ify sass-lang.com urls (#2608)

    * https-ify sass-lang.com urls
    
    See sass/sass-site#217
    
    Committed via https://github.com/asottile/all-repos
    
    * Revert changes to vendored libsass
    asottile authored and xzyfer committed Mar 5, 2019
    Copy the full SHA
    33a32c3 View commit details

Commits on Mar 19, 2019

  1. Update README.md (#2617)

    Nico385412 authored and xzyfer committed Mar 19, 2019
    Copy the full SHA
    0f86a0a View commit details

Commits on Apr 25, 2019

  1. Add support for Node 12

    xzyfer committed Apr 25, 2019
    Copy the full SHA
    da10866 View commit details
  2. Fix OSX compilation for Mojavi

    xzyfer committed Apr 25, 2019
    Copy the full SHA
    34f99a2 View commit details
  3. Copy the full SHA
    f4eebc8 View commit details
  4. Copy the full SHA
    480250c View commit details
  5. Copy the full SHA
    5aae0d2 View commit details
  6. Copy the full SHA
    9e564a1 View commit details

Commits on Apr 26, 2019

  1. 3
    Copy the full SHA
    12c0052 View commit details
  2. Merge pull request #2633 from xzyfer/node-12

    Add support for Node 12
    xzyfer authored Apr 26, 2019
    2
    Copy the full SHA
    bc78b22 View commit details
  3. 4.12.0

    xzyfer committed Apr 26, 2019
    3
    Copy the full SHA
    23c8659 View commit details

Commits on Apr 28, 2019

  1. Copy the full SHA
    e59f5ba View commit details

Commits on May 2, 2019

  1. Copy the full SHA
    0c1a49e View commit details

Commits on May 21, 2019

  1. Remove sudo settings from .travis.yml

    'sudo' seems to be unavailable.
    Remove sudo settings from .travis.yml
    
    https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
    abetomo committed May 21, 2019
    Copy the full SHA
    15355dd View commit details
  2. Merge pull request #2673 from abetomo/remove_sudo_setting_from_travis

    Remove sudo settings from .travis.yml
    nschonni authored May 21, 2019
    Copy the full SHA
    7ab387c View commit details

Commits on May 30, 2019

  1. chore: Remove PR template

    Warning about node-gyp isn't needed anymore
    nschonni authored May 30, 2019
    Copy the full SHA
    2513e6a View commit details

Commits on Aug 30, 2019

  1. Assorted typo fixes.

    XhmikosR committed Aug 30, 2019
    Copy the full SHA
    8421979 View commit details
  2. Merge pull request #2726 from XhmikosR/master-xmr-typos

    Assorted typo fixes.
    xzyfer authored Aug 30, 2019
    Copy the full SHA
    96aa279 View commit details

Commits on Sep 6, 2019

  1. Fix #2614 - Update lodash version

    Kevin Kessenich committed Sep 6, 2019
    Copy the full SHA
    b1f54d7 View commit details

Commits on Sep 8, 2019

  1. Merge pull request #2730 from kessenich/master

    Fix #2614 - Update lodash version
    xzyfer authored Sep 8, 2019
    Copy the full SHA
    887199a View commit details

Commits on Oct 16, 2019

  1. Fix broken link to NodeJS docs in README.md

    Griffen Schwiesow committed Oct 16, 2019
    Copy the full SHA
    b0d4d85 View commit details
  2. Merge pull request #2753 from schwigri/master

    Fix broken link to NodeJS docs in README.md
    xzyfer authored Oct 16, 2019
    Copy the full SHA
    8d0acca View commit details

Commits on Oct 21, 2019

  1. Fix #2394: sourceMap option should have consistent behaviour

    render() and renderSync() should return "map" property in the results
    only if source map has been enabled.
    saper committed Oct 21, 2019
    1
    Copy the full SHA
    8498f70 View commit details

Commits on Oct 22, 2019

  1. Node 13 support

    saper committed Oct 22, 2019
    Copy the full SHA
    64b6f32 View commit details

Commits on Oct 23, 2019

  1. Merge pull request #2766 from saper/node-modules-79

    Node 13 support
    xzyfer authored Oct 23, 2019
    Copy the full SHA
    e84c6a9 View commit details
  2. Use GCC 6 for Node 12 binaries

    Node 12 is built using GCC 6 therefore
    it is mandatory that we use the same C++
    runtime as the mothership.
    saper committed Oct 23, 2019
    Copy the full SHA
    3838eae View commit details
  3. Use GCC 6 for Node 12 binaries (#2767)

    Use GCC 6 for Node 12 binaries
    xzyfer authored Oct 23, 2019
    Copy the full SHA
    f1cc0d3 View commit details
  4. Copy the full SHA
    0c8d308 View commit details
  5. Merge pull request #2768 from sass/release-4-13

    Update references for v4.13 release
    xzyfer authored Oct 23, 2019
    Copy the full SHA
    43db915 View commit details
  6. 4.13.0

    xzyfer committed Oct 23, 2019
    Copy the full SHA
    60fad5f View commit details

Commits on Oct 24, 2019

  1. Merge pull request #2754 from saper/no-map-if-not-requested

    Fix #2394: sourceMap option should have consistent behaviour
    xzyfer authored Oct 24, 2019
    Copy the full SHA
    fbc9ff5 View commit details

Commits on Nov 17, 2019

  1. doc: README example fix (#2787)

    Fix Unexpected token ) on the render example
    ZoranPandovski authored and nschonni committed Nov 17, 2019
    Copy the full SHA
    c6f2e5a View commit details

Commits on Jan 16, 2020

  1. Copy the full SHA
    338fd7a View commit details
  2. 4.13.1

    xzyfer committed Jan 16, 2020
    Copy the full SHA
    01db051 View commit details
  3. Update changelog

    xzyfer committed Jan 16, 2020
    Copy the full SHA
    b54053a View commit details
Showing with 240 additions and 133 deletions.
  1. +1 −1 .github/ISSUE_TEMPLATE/Bug_report.md
  2. 0 .github/PULL_REQUEST_TEMPLATE.md
  3. +30 −12 .travis.yml
  4. +12 −0 CHANGELOG.md
  5. +1 −1 CODE_OF_CONDUCT.md
  6. +16 −7 README.md
  7. +81 −69 TROUBLESHOOTING.md
  8. +25 −11 appveyor.yml
  9. +2 −3 binding.gyp
  10. +3 −1 lib/extensions.js
  11. +5 −3 lib/index.js
  12. +1 −1 lib/watcher.js
  13. +3 −5 package.json
  14. +2 −2 src/create_string.cpp
  15. +8 −7 src/custom_importer_bridge.cpp
  16. +40 −0 test/api.js
  17. +2 −2 test/spec.js
  18. +8 −8 test/watcher.js
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ about: If you're having an issue with installing node-sass or the compiled resul
<!--
Before opening an Install issue:
- If you're running Node 10, you must be running node-sass 4.9.
- If you're running Node 13, you must be running node-sass 4.13.
- Check that the version of node-sass you're trying to install supports your version of Node by looking at the release page for that version https://github.com/sass/node-sass/releases
- If you're running the latest versions of Node, you'll likely need the latest node-sass, we don't backport support to old versions of node-sass
- Read the common workarounds in https://github.com/sass/node-sass/blob/master/TROUBLESHOOTING.md
Empty file removed .github/PULL_REQUEST_TEMPLATE.md
Empty file.
42 changes: 30 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: node_js

compiler: gcc
sudo: false

env:
global:
@@ -17,6 +16,18 @@ jobs:
- stage: platform-test
node_js: "node"
os: osx
- stage: platform-test
node_js: "12"
os: linux
- stage: platform-test
node_js: "12"
os: osx
- stage: platform-test
node_js: "11"
os: linux
- stage: platform-test
node_js: "11"
os: osx
- stage: platform-test
node_js: "10"
os: linux
@@ -30,28 +41,28 @@ jobs:
node_js: "9"
os: osx
- stage: platform-test
node_js: "7"
node_js: "8"
os: linux
- stage: platform-test
node_js: "7"
node_js: "8"
os: osx
- stage: platform-test
node_js: "lts/carbon"
node_js: "7"
os: linux
- stage: platform-test
node_js: "lts/carbon"
node_js: "7"
os: osx
- stage: platform-test
node_js: "lts/boron"
node_js: "6"
os: linux
- stage: platform-test
node_js: "lts/boron"
node_js: "6"
os: osx
- stage: platform-test
node_js: "lts/argon"
node_js: "4"
os: linux
- stage: platform-test
node_js: "lts/argon"
node_js: "4"
os: osx
- stage: platform-test
node_js: "0.12"
@@ -69,12 +80,19 @@ addons:
- g++-4.7
- gcc-4.9
- g++-4.9
- gcc-6
- g++-6

before_install:
- echo $TRAVIS_NODE_VERSION
- npm config set python `which python`
- if [ $TRAVIS_OS_NAME == "linux" ]; then
if [[ $(node -v) =~ v1[01] ]]; then
if [[ $(node -v) =~ v1[23] ]]; then
export CC="gcc-6";
export CXX="g++-6";
export LINK="gcc-6";
export LINKXX="g++-6";
elif [[ $(node -v) =~ v1[01] ]]; then
export CC="gcc-4.9";
export CXX="g++-4.9";
export LINK="gcc-4.9";
@@ -89,8 +107,8 @@ before_install:
- nvm --version
- node --version
- npm --version
- gcc --version
- g++ --version
- ${CC:-gcc} --version
- ${CXX:-g++} --version

install:
- npm install
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## v4.13.1

https://github.com/sass/node-sass/releases/tag/v4.13.1

## v4.13.0

https://github.com/sass/node-sass/releases/tag/v4.13.0

## v4.12.0

https://github.com/sass/node-sass/releases/tag/v4.12.0

## v4.11.0

https://github.com/sass/node-sass/releases/tag/v4.11.0
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@ fair place to play.

[The full community guidelines can be found on the Sass website.][link]

[link]: http://sass-lang.com/community-guidelines
[link]: https://sass-lang.com/community-guidelines
23 changes: 16 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# node-sass

#### Supported Node.js versions vary by release, please consult the [releases page](https://github.com/sass/node-sass/releases)
#### Supported Node.js versions vary by release, please consult the [releases page](https://github.com/sass/node-sass/releases). Below is a quick guide for minimum support:

NodeJS | Minimum node-sass version | Node Module
--------|--------------------------|------------
Node 13 | 4.13+ | 79
Node 12 | 4.12+ | 72
Node 11 | 4.10+ | 67
Node 10 | 4.9+ | 64
Node 8 | 4.5.3+ | 57

<table>
<tr>
@@ -38,7 +46,7 @@ Follow @nodesass on twitter for release updates: <https://twitter.com/nodesass>
npm install node-sass
```

Some users have reported issues installing on Ubuntu due to `node` being registered to another package. [Follow the official NodeJS docs](https://github.com/nodejs/node-v0.x-archive/wiki/Installing-Node.js-via-package-manager) to install NodeJS so that `#!/usr/bin/env node` correctly resolves.
Some users have reported issues installing on Ubuntu due to `node` being registered to another package. [Follow the official NodeJS docs](https://github.com/nodesource/distributions/blob/master/README.md#debinstall) to install NodeJS so that `#!/usr/bin/env node` correctly resolves.

Compiling on Windows machines requires the [node-gyp prerequisites](https://github.com/nodejs/node-gyp#on-windows).

@@ -211,7 +219,7 @@ An array of paths that [LibSass] can look in to attempt to resolve your `@import
* Type: `Boolean`
* Default: `false`

`true` values enable [Sass Indented Syntax](http://sass-lang.com/documentation/file.INDENTED_SYNTAX.html) for parsing the data string or file.
`true` values enable [Sass Indented Syntax](https://sass-lang.com/documentation/file.INDENTED_SYNTAX.html) for parsing the data string or file.

__Note:__ node-sass/libsass will compile a mixed library of scss and indented syntax (.sass) files with the Default setting (false) as long as .sass and .scss extensions are used in filenames.

@@ -303,9 +311,11 @@ Used to determine how many digits after the decimal will be allowed. For instanc
* Type: `Boolean | String | undefined`
* Default: `undefined`

**Special:** Setting the `sourceMap` option requires also setting the `outFile` option
Enables source map generation during `render` and `renderSync`.

When `sourceMap === true`, the value of `outFile` is used as the target output location for the source map with the suffix `.map` appended. If no `outFile` is set, `sourceMap` parameter is ignored.

Enables the outputting of a source map during `render` and `renderSync`. When `sourceMap === true`, the value of `outFile` is used as the target output location for the source map. When `typeof sourceMap === "string"`, the value of `sourceMap` will be used as the writing location for the file.
When `typeof sourceMap === "string"`, the value of `sourceMap` will be used as the writing location for the file.

### sourceMapContents

@@ -414,7 +424,7 @@ var result = sass.renderSync({
var result = someSyncFunction(url, prev);
return {file: result.path, contents: result.data};
}
}));
});

console.log(result.css);
console.log(result.map);
@@ -603,7 +613,6 @@ This module is brought to you and maintained by the following people:
* Keith Cirkel ([Github](https://github.com/keithamus) / [Twitter](https://twitter.com/Keithamus))
* Laurent Goderre ([Github](https://github.com/laurentgoderre) / [Twitter](https://twitter.com/laurentgoderre))
* Nick Schonning ([Github](https://github.com/nschonni) / [Twitter](https://twitter.com/nschonni))
* Adam Yeats ([Github](https://github.com/adamyeats) / [Twitter](https://twitter.com/adamyeats))
* Adeel Mujahid ([Github](https://github.com/am11) / [Twitter](https://twitter.com/adeelbm))

## Contributors
Loading