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: d62f59f4a051b6d538e20f66a5d1ebcf21538ded
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: c167004da6cbf0fb1fdc3406073eaff48bea2b51
Choose a head ref

Commits on Sep 8, 2015

  1. CLI: add --follow option

    dotzero committed Sep 8, 2015
    Copy the full SHA
    aac339e View commit details
  2. Test for --follow option

    dotzero committed Sep 8, 2015
    Copy the full SHA
    e289389 View commit details
  3. Copy the full SHA
    41cf00d View commit details

Commits on Sep 16, 2015

  1. Copy the full SHA
    8efaac2 View commit details
  2. Copy the full SHA
    1a43930 View commit details
  3. Copy the full SHA
    0e0b38d View commit details

Commits on Sep 17, 2015

  1. Disable flakey dependency watching tests

    Sometimes they generate double notification
    on change:
    
          1) cli node-sass in.scss should watch the full scss dep tree for a single file (scss):
    
          Uncaught AssertionError: 'body{background:blue}\n\nbody{background:blue}' == 'body{background:blue}'
          + expected - actual
    
          -body{background:blue}
          -
           body{background:blue}
    
          at Socket.<anonymous> (test/cli.js:317:16)
          at readableAddChunk (_stream_readable.js:146:16)
          at Socket.Readable.push (_stream_readable.js:110:10)
          at Pipe.onread (net.js:523:20)
    
    #1152
    saper committed Sep 17, 2015
    Copy the full SHA
    ec345be View commit details
  2. Merge branch 'disabledepwatch'

    saper committed Sep 17, 2015
    Copy the full SHA
    f021e6f View commit details
  3. Copy the full SHA
    14392b9 View commit details
  4. Improve 河蟹 message

    saper committed Sep 17, 2015
    Copy the full SHA
    b8050ef View commit details
  5. Merge branch 'censorship'

    saper committed Sep 17, 2015
    Copy the full SHA
    8352799 View commit details

Commits on Sep 18, 2015

  1. Import libsass 3.3.0-beta2

    - New source layout
    - New header names for #include
    - No need for exception handling in pure C code
    saper committed Sep 18, 2015
    Copy the full SHA
    3f0ef90 View commit details
  2. Merge pull request #1040 from saper/libsass3.3src

    Import libsass 3.3 code
    xzyfer committed Sep 18, 2015
    Copy the full SHA
    9336a1d View commit details
  3. Build of 32- and 64-bit Windows binaries for releases. Closes #1135

    For pull requests and pushes to master just build 32-bit binaries
    and do not store artifacts.
    
    Whenever a tag is pushed to the "release" branch - produce
    full set of 32-bit and 64-bit binaries, create a GitHub
    release (if does not exist already) and attach the binaries
    to the release.
    
    Issue open:
    
    http://bit.ly/twoBuilds
    
     AppVeyor starts two builds in response to the "new commit"
     and "new tag" events.
    saper authored and xzyfer committed Sep 18, 2015
    Copy the full SHA
    30b2b14 View commit details
  4. Merge pull request #1145 from Vitogee/npm-config-binary-url

    Use sass binary url from .npmrc if available
    xzyfer committed Sep 18, 2015
    Copy the full SHA
    2b8a986 View commit details
  5. Merge pull request #1126 from dotzero/follow

    Add --follow option to the CLI
    xzyfer committed Sep 18, 2015
    Copy the full SHA
    ce37205 View commit details
  6. v3.4.0-beta1

    xzyfer committed Sep 18, 2015
    Copy the full SHA
    f6b5fd2 View commit details
  7. Update README.md

    Fixed typo "Sepcial" to "Special" in "// only one of them is required, see section Special Behaviours" (line 319 in examples section) in README.md.
    JTKnox91 committed Sep 18, 2015
    Copy the full SHA
    6018d17 View commit details
  8. Fixed typo in README.md

    cvibhagool committed Sep 18, 2015
    Copy the full SHA
    c13ed62 View commit details
  9. Fix a typo in README.md

    Fix a typo "repsonse" to "response".
    kylecho committed Sep 18, 2015
    Copy the full SHA
    5bf7dc1 View commit details

Commits on Sep 23, 2015

  1. Copy the full SHA
    14cb652 View commit details
  2. Copy the full SHA
    2227890 View commit details
  3. Copy the full SHA
    9a46415 View commit details

Commits on Oct 14, 2015

  1. Copy the full SHA
    62e1b09 View commit details
  2. Bump LibSass to 3.3.0-beta3

    xzyfer committed Oct 14, 2015
    Copy the full SHA
    680bde7 View commit details
  3. Merge pull request #1201 from xzyfer/feat/libsass/3.3.0-beta3

    Bump LibSass to 3.3.0-beta3
    xzyfer committed Oct 14, 2015
    Copy the full SHA
    6946110 View commit details
  4. v3.4.0-beta.2

    xzyfer committed Oct 14, 2015
    Copy the full SHA
    4d2c15e View commit details

Commits on Oct 24, 2015

  1. Bump LibSass to 3.3.0

    xzyfer committed Oct 24, 2015
    Copy the full SHA
    1b9e24d View commit details
  2. Merge pull request #1214 from xzyfer/feat/3.4

    Bump LibSass to 3.3.0
    xzyfer committed Oct 24, 2015
    Copy the full SHA
    75f2daa View commit details
  3. Copy the full SHA
    0b2316d View commit details

Commits on Oct 25, 2015

  1. 3.4.0

    xzyfer committed Oct 25, 2015
    Copy the full SHA
    d19825e View commit details

Commits on Oct 26, 2015

  1. Copy the full SHA
    9079c7b View commit details
  2. Copy the full SHA
    a474102 View commit details
  3. Bump LibSass to 3.3.1

    xzyfer committed Oct 26, 2015
    Copy the full SHA
    e95d3fd View commit details

Commits on Oct 27, 2015

  1. Merge pull request #1221 from xzyfer/feat/libsass/3.3.1

    Bump LibSass to 3.3.1
    xzyfer committed Oct 27, 2015
    Copy the full SHA
    af9a754 View commit details
  2. 3.4.1

    xzyfer committed Oct 27, 2015
    Copy the full SHA
    c107cbd View commit details
  3. Merge pull request #1218 from esr360/1204-sass-logo-size

    making sass logo size more appropriate
    xzyfer committed Oct 27, 2015
    Copy the full SHA
    aac6fdb View commit details
  4. Merge pull request #1215 from danielknell/master

    fix to allow node-sass to pipe content with embedded sourcemap to other tools
    xzyfer committed Oct 27, 2015
    Copy the full SHA
    c1f6210 View commit details
  5. Merge pull request #1220 from chriseppstein/master

    The previous file should be the absolute path, not the string used to import it.
    xzyfer committed Oct 27, 2015
    Copy the full SHA
    3467c93 View commit details
  6. added a test for #1219

    James Newell committed Oct 27, 2015
    Copy the full SHA
    950eb57 View commit details
  7. fix lint errors

    James Newell committed Oct 27, 2015
    Copy the full SHA
    97cfba9 View commit details
  8. Merge pull request #1223 from jameslnewell/master

    Added a test for #1219
    xzyfer committed Oct 27, 2015
    Copy the full SHA
    7680371 View commit details

Commits on Oct 30, 2015

  1. Build for node 5.x

    saper committed Oct 30, 2015
    Copy the full SHA
    d19b1cc View commit details

Commits on Oct 31, 2015

  1. Merge pull request #1229 from saper/node5

    CI: Build for node 5.x
    xzyfer committed Oct 31, 2015
    Copy the full SHA
    c52d0c9 View commit details

Commits on Nov 2, 2015

  1. Use the last stable nvm, not the master version

    The nvm version from master is unsupported and may be broken. Using a tag
    is advised.
    mgol committed Nov 2, 2015
    Copy the full SHA
    41deae8 View commit details
  2. Log nvm, Node & npm versions

    mgol committed Nov 2, 2015
    Copy the full SHA
    75d402a View commit details

Commits on Nov 3, 2015

  1. Merge pull request #1237 from mzgol/stable-nvm

    Use the last stable nvm, not the master version
    xzyfer committed Nov 3, 2015
    Copy the full SHA
    8e1c122 View commit details

Commits on Nov 9, 2015

  1. Adjust incorrect spacing in README

    Minor spacing error causing "file" to read as "f ile". Fixed.
    ggamel committed Nov 9, 2015
    Copy the full SHA
    12a8a5c View commit details

Commits on Nov 11, 2015

  1. Merge pull request #1252 from ggamel/patch-1

    Adjust incorrect spacing in README
    saper committed Nov 11, 2015
    Copy the full SHA
    971f404 View commit details
  2. Better handle error specs

    xzyfer committed Nov 11, 2015
    Copy the full SHA
    4960fdb View commit details
Showing 313 changed files with 50,978 additions and 1,681 deletions.
50 changes: 50 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"env": {
"es6": true,
"node": true
},
"globals": {},
"extends": "eslint:recommended",
"overrides": [
{
"files": [
"test/**/*.js"
],
"env": {
"mocha": true
}
}
],
"rules": {
"no-bitwise": 2,
"curly": 2,
"eqeqeq": 2,
"no-unused-expressions": [
2,
{
"allowTernary": true
}
],
"wrap-iife": [
2,
"any"
],
"indent": [
2,
2,
{
"SwitchCase": 1
}
],
"linebreak-style": 2,
"no-multi-str": 2,
"new-cap": 2,
"no-caller": 2,
"quotes": [
2,
"single"
],
"semi": 2,
"block-scoped-var": 2
}
}
16 changes: 15 additions & 1 deletion CONTRIBUTING.md → .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Contributing
* Fork the project.
* Make your feature addition or bug fix.
* Add documentation if necessary.
* Add documentation if necessary.
* Add tests for it. This is important so I don't break it in a future version unintentionally.
* Send a pull request. Bonus points for topic branches.

@@ -29,6 +29,20 @@ If you are facing binary related issues, please create a gist (see [Creating gis

If this project is missing an API or command line flag that has been added to [libsass], then please open an issue here. We will then look at updating our [libsass] submodule and create a new release. You can help us create the new release by rebuilding binaries, and then creating a pull request to the [node-sass-binaries](https://github.com/sass/node-sass-binaries) repo.

### Testing a bugfix:

1. Ensure the `master` branch is up-to-date with: `git checkout master; git pull`
2. Create a new Git branch and make your changes. `git checkout -b name-of-new-branch`
3. Install all the node.js dependencies of node-sass with: `npm install`
4. Ensure the tests pass with: `npm test`

If the bug fix requires modifying any of the C++ files in the src/ directory, you'll need to re-build the bindings to libSass.

1. Build the libSass bindings for node-sass with: `npm run-script build`

Alternatively, the `scripts/build.js` build script has several different command line flags that can be passed by running: `node scripts/build.js -[flag]`


## Reporting Sass compilation and syntax issues

Please check for [issues on the libsass repo](https://github.com/hcatlin/libsass/issues) (as there is a good chance that it may already be an issue there for it), and otherwise [create a new issue there](https://github.com/sass/libsass/issues/new).
39 changes: 39 additions & 0 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
name: Bug report
about: If you're having an issue with installing node-sass or the compiled results
look incorrect

---

<!--
Before opening an Install issue:
- 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
- Common issues we're tracking can be found by looking at the `Pinned` label https://github.com/sass/node-sass/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3APinned+
**When reporting any bug, YOU MUST PROVIDE THE FOLLOWING INFORMATION
or your issue will be closed without discussion**
-->

- NPM version (`npm -v`):
- Node version (`node -v`):
- Node Process (`node -p process.versions`):
- Node Platform (`node -p process.platform`):
- Node architecture (`node -p process.arch`):
- node-sass version (`node -p "require('node-sass').info"`):
- npm node-sass versions (`npm ls node-sass`):

<!--
When encountering a syntax, or compilation issue:
- Please note that we cannot backport fixes to old versions, so ensure that you are running the latest release https://github.com/sass/node-sass/releases
- Search for duplicate or closed issues https://github.com/sass/node-sass/issues?utf8=%E2%9C%93&q=is%3Aissue
- Validate with http://sassmeister.com/ that the code works with Ruby Sass, then open an issue on `LibSass` https://github.com/sass/LibSass/issues/new
Sorry you didn't have the experience you expected.
-->
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/Feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

<!--
Before you request a feature, please realize this project is a wrapper for
LibSass so we can't add any language features here. If you want to add a feature
to the Sass language, please open an issue on https://github.com/sass/sass/issues/new
If you want a CLI feature, please make sure that it is supported by https://github.com/sass/sass
Thanks for making node-sass better!
-->
17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
open-pull-requests-limit: 99
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
open-pull-requests-limit: 99
schedule:
interval: "weekly"
51 changes: 51 additions & 0 deletions .github/workflows/alpine.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build bindings for Alpine releases

on:
push:
branches-ignore:
- "dependabot/**"
pull_request:

jobs:
build:
runs-on: ubuntu-latest
container:
image: node:${{ matrix.node }}-alpine
strategy:
fail-fast: false
matrix:
node:
- 12
- 14
- 15
- 16

include:
- node: 12
python: python2
- node: 14
python: python3
- node: 15
python: python3
- node: 16
python: python3

steps:
- name: Install Alpine build tools
run: apk add --no-cache ${{ matrix.python }} make git gcc g++

- uses: actions/checkout@v2

- name: Install packages
run: npm install --unsafe-perm
env:
SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true

- name: Run tests
run: npm test

- uses: actions/upload-artifact@v2
if: github.repository_owner == 'sass' && github.event_name != 'pull_request'
with:
name: ${{ matrix.node }}
path: vendor/
40 changes: 40 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Coverage

on:
push:
branches-ignore:
- "dependabot/**"
paths:
- ".nycrc.json"
- "**/*.js"
- "test/**"
- "package.json"
- "bin/node-sass"
- ".github/workflows/coverage.yml"
pull_request:
paths:
- ".nycrc.json"
- "**/*.js"
- "test/**"
- "package.json"
- "bin/node-sass"
- ".github/workflows/coverage.yml"

jobs:
build:
runs-on: ubuntu-latest
if: github.repository_owner == 'sass'

steps:
- uses: actions/checkout@v2

- name: Install packages
run: npm install --unsafe-perm

- name: Run Coverage
run: npm run coverage

- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
36 changes: 36 additions & 0 deletions .github/workflows/lint-js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Lint JS

on:
push:
branches-ignore:
- "dependabot/**"
paths:
- "**/*.js"
- ".eslintrc.json"
- "package.json"
- "bin/node-sass"
- ".github/workflows/lint-js.yml"
pull_request:
paths:
- "**/*.js"
- ".eslintrc.json"
- "package.json"
- "bin/node-sass"
- ".github/workflows/lint-js.yml"

jobs:
build:
runs-on: ubuntu-latest
env:
SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true

steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2.1.5

- name: Install packages
run: npm install --unsafe-perm

- name: Run Linting
run: npm run lint
68 changes: 68 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Build bindings for Linux releases

on:
push:
branches-ignore:
- "dependabot/**"
pull_request:

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
node:
- 12
- 14
- 15
- 16

include:
- node: 12
gcc: "gcc-6"
gpp: "g++-6"
os: ubuntu-18.04
- node: 14
gcc: "gcc-6"
gpp: "g++-6"
os: ubuntu-18.04
- node: 15
gcc: "gcc-6"
gpp: "g++-6"
os: ubuntu-18.04
- node: 16
gcc: "gcc-8"
gpp: "g++-8"
os: ubuntu-18.04


steps:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.5
with:
node-version: ${{ matrix.node }}

- name: Setup GCC/G++
run: sudo apt-get install ${{ matrix.gcc }} ${{ matrix.gpp }}

- name: Install packages
run: npm install --unsafe-perm
env:
SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true
CC: ${{ matrix.gcc }}
CXX: ${{ matrix.gpp }}
LINK: ${{ matrix.gcc }}
LINKXX: ${{ matrix.gpp }}

- name: Run tests
run: npm test

- uses: actions/upload-artifact@v2
if: github.repository_owner == 'sass' && github.event_name != 'pull_request'
with:
name: ${{ matrix.node }}
path: vendor/
42 changes: 42 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Build bindings for macOS releases

on:
push:
branches-ignore:
- "dependabot/**"
pull_request:

jobs:
build:
runs-on: macos-latest

strategy:
fail-fast: false
matrix:
node:
- 12
- 14
- 15
- 16

steps:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.5
with:
node-version: ${{ matrix.node }}

- name: Install packages
run: npm install --unsafe-perm
env:
SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true

- name: Run tests
run: npm test

- uses: actions/upload-artifact@v2
if: github.repository_owner == 'sass' && github.event_name != 'pull_request'
with:
name: ${{ matrix.node }}
path: vendor/
Loading