Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support node-sass@6 #28710

Merged
merged 9 commits into from Sep 9, 2021
Merged

Support node-sass@6 #28710

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
088d7c9
support node-sass@6
adrienharnay Sep 1, 2021
28e13ed
Merge branch 'canary' into feat/support-node-sass-6
adrienharnay Sep 7, 2021
b0869b9
bump sass-loader
adrienharnay Sep 7, 2021
e66ee39
Merge branch 'canary' of github.com:vercel/next.js into feat/support-…
timneutkens Sep 7, 2021
bda4c84
Merge branch 'canary' into feat/support-node-sass-6
adrienharnay Sep 7, 2021
e43fa40
Merge branch 'feat/support-node-sass-6' of github.com:adrienharnay/ne…
timneutkens Sep 7, 2021
ed3c042
Update precompiled
timneutkens Sep 7, 2021
b36e823
Merge branch 'canary' into feat/support-node-sass-6
kodiakhq[bot] Sep 8, 2021
bc7ffb7
Merge branch 'canary' into feat/support-node-sass-6
kodiakhq[bot] Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -103,7 +103,7 @@
"moment": "^2.24.0",
"node-fetch": "2.6.1",
"node-notifier": "5.4.0",
"node-sass": "5.0.0",
"node-sass": "6.0.1",
"npm-run-all": "4.1.5",
"nprogress": "0.2.0",
"pixrem": "5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@
},
"peerDependencies": {
"fibers": ">= 3.1.0",
"node-sass": "^4.0.0 || ^5.0.0",
"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"sass": "^1.3.0"
Expand Down
32 changes: 25 additions & 7 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -13385,7 +13385,7 @@ meow@7.0.1:
type-fest "^0.13.1"
yargs-parser "^18.1.3"

meow@^3.3.0, meow@^3.7.0:
meow@^3.3.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
Expand Down Expand Up @@ -13435,6 +13435,24 @@ meow@^8.0.0:
type-fest "^0.18.0"
yargs-parser "^20.2.3"

meow@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
dependencies:
"@types/minimist" "^1.2.0"
camelcase-keys "^6.2.2"
decamelize "^1.2.0"
decamelize-keys "^1.1.0"
hard-rejection "^2.1.0"
minimist-options "4.1.0"
normalize-package-data "^3.0.0"
read-pkg-up "^7.0.1"
redent "^3.0.0"
trim-newlines "^3.0.0"
type-fest "^0.18.0"
yargs-parser "^20.2.3"

merge-descriptors@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
Expand Down Expand Up @@ -13733,6 +13751,7 @@ minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a"
integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==
dependencies:
encoding "^0.1.12"
minipass "^3.1.0"
minipass-sized "^1.0.3"
minizlib "^2.0.0"
Expand Down Expand Up @@ -14230,10 +14249,10 @@ node-releases@^1.1.71:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==

node-sass@5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-5.0.0.tgz#4e8f39fbef3bac8d2dc72ebe3b539711883a78d2"
integrity sha512-opNgmlu83ZCF792U281Ry7tak9IbVC+AKnXGovcQ8LG8wFaJv6cLnRlc6DIHlmNxWEexB5bZxi9SZ9JyUuOYjw==
node-sass@6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-6.0.1.tgz#cad1ccd0ce63e35c7181f545d8b986f3a9a887fe"
integrity sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
Expand All @@ -14242,8 +14261,7 @@ node-sass@5.0.0:
get-stdin "^4.0.1"
glob "^7.0.3"
lodash "^4.17.15"
meow "^3.7.0"
mkdirp "^0.5.1"
meow "^9.0.0"
nan "^2.13.2"
node-gyp "^7.1.0"
npmlog "^4.0.0"
Expand Down