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: 918dcb3a7712a02578947b0354b9f109656f7abf
Choose a head ref
Loading
Showing with 1,354 additions and 1,260 deletions.
  1. +12 −8 .eslintrc.json
  2. +1 −1 .github/ISSUE_TEMPLATE/Bug_report.md
  3. 0 .github/PULL_REQUEST_TEMPLATE.md
  4. +17 −0 .github/dependabot.yml
  5. +51 −0 .github/workflows/alpine.yml
  6. +40 −0 .github/workflows/coverage.yml
  7. +36 −0 .github/workflows/lint-js.yml
  8. +68 −0 .github/workflows/linux.yml
  9. +42 −0 .github/workflows/macos.yml
  10. +59 −0 .github/workflows/windows.yml
  11. +2 −1 .gitignore
  12. +14 −0 .nycrc.json
  13. +0 −105 .travis.yml
  14. +16 −0 CHANGELOG.md
  15. +1 −1 CODE_OF_CONDUCT.md
  16. +49 −20 README.md
  17. +82 −70 TROUBLESHOOTING.md
  18. +15 −114 appveyor.yml
  19. +128 −96 bin/node-sass
  20. +2 −19 binding.gyp
  21. +12 −17 lib/extensions.js
  22. +8 −25 lib/index.js
  23. +2 −3 lib/render.js
  24. +1 −1 lib/watcher.js
  25. +20 −29 package.json
  26. +4 −5 scripts/build.js
  27. +0 −85 scripts/coverage.js
  28. +19 −20 scripts/install.js
  29. +3 −2 scripts/util/downloadoptions.js
  30. +46 −0 scripts/util/rejectUnauthorized.js
  31. +2 −2 src/create_string.cpp
  32. +8 −7 src/custom_importer_bridge.cpp
  33. +0 −5 test/.eslintrc
  34. +173 −133 test/api.js
  35. +3 −3 test/binding.js
  36. +39 −50 test/cli.js
  37. +67 −6 test/downloadoptions.js
  38. +1 −1 test/errors.js
  39. +5 −0 test/fixtures/include-files/expected-data-importer.css
  40. +2 −0 test/fixtures/include-files/expected-file-importer.css
  41. +1 −1 test/fixtures/source-map-embed/expected.css
  42. +7 −7 test/lowlevel.js
  43. +22 −22 test/runtime.js
  44. +2 −2 test/scripts/util/proxy.js
  45. +0 −192 test/spec.js
  46. +209 −144 test/types.js
  47. +1 −1 test/useragent.js
  48. +62 −62 test/watcher.js
20 changes: 12 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
{
"env": {
"es6": true,
"node": true
},
"globals": {},
"extends": "eslint:recommended",
"overrides": [
{
"files": [
"test/**/*.js"
],
"env": {
"mocha": true
}
}
],
"rules": {
"no-bitwise": 2,
"camelcase": 0,
"curly": 2,
"eqeqeq": 2,
"no-unused-expressions": [
@@ -34,13 +44,7 @@
2,
"single"
],
"strict": 0,
"no-undef": 2,
"no-unused-vars": 2,
"semi": 2,
"no-extra-semi": 2,
"no-redeclare": 2,
"block-scoped-var": 2,
"no-console": 0
"block-scoped-var": 2
}
}
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.
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
- 16
- 17

include:
- node: 12
python: python2
- node: 14
python: python3
- node: 16
python: python3
- node: 17
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@1.1.3
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.4.1

- 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
- 16
- 17

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: 16
gcc: "gcc-8"
gpp: "g++-8"
os: ubuntu-18.04
- node: 17
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.4.1
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
- 16
- 17

steps:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
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/
59 changes: 59 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Build bindings for Windows releases

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

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

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

architecture:
- x64
- x86

include:
- node: 12
os: windows-2016
- node: 14
os: windows-2016
- node: 16
os: windows-2019
- node: 17
os: windows-2019

steps:
- uses: actions/checkout@v2

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

- name: Install packages
run: npm install
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 }}-${{ matrix.architecture }}
path: |
vendor/**/binding.node
build/Release/binding.pdb
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -11,4 +11,5 @@ test/lcov.info
test/fixtures/watching-css-out-01
test/fixtures/watching-css-out-02
coverage
package-lock.json
package-lock.json
.nyc_output
14 changes: 14 additions & 0 deletions .nycrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"all": true,
"include": [
"bin/*",
"lib/*.js",
"scripts/**/*.js"
],
"extension": [
"node-sass"
],
"reporter": [
"lcovonly"
]
}
Loading