Skip to content

Commit

Permalink
feature #865 Bump sass-loader to ^10.0.0 (shmshd, weaverryan)
Browse files Browse the repository at this point in the history
This PR was merged into the main branch.

Discussion
----------

Bump sass-loader to ^10.0.0

Continues #853

Commits
-------

13ae4fb allowing version 9 or 10
51f83a2 Bump sass-loader to ^10.1.0
  • Loading branch information
weaverryan committed Dec 3, 2020
2 parents a3fcb1c + 13ae4fb commit 39b761a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"preact": "^8.2.1",
"preact-compat": "^3.17.0",
"sass": "^1.17.0",
"sass-loader": "^9.0.1",
"sass-loader": "^9.0.1 || ^10.0.0",
"sinon": "^9.0.2",
"stimulus": "^1.1.1",
"strip-ansi": "^6.0.0",
Expand Down
6 changes: 3 additions & 3 deletions test/package-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ describe('package-helper', () => {
describe('The getInvalidPackageVersionRecommendations correctly checks installed versions', () => {
it('Check package that *is* the correct version', () => {
const versionProblems = packageHelper.getInvalidPackageVersionRecommendations([
{ name: 'sass-loader', version: '^9.0.1' },
{ name: 'sass-loader', version: '^10.1.0' },
{ name: 'preact', version: '^8.2.0' }
]);

Expand All @@ -132,7 +132,7 @@ describe('package-helper', () => {

it('Check package with a version too low', () => {
const versionProblems = packageHelper.getInvalidPackageVersionRecommendations([
{ name: 'sass-loader', version: '^10.0.0' },
{ name: 'sass-loader', version: '^11.0.0' },
{ name: 'preact', version: '9.0.0' }
]);

Expand All @@ -142,7 +142,7 @@ describe('package-helper', () => {

it('Check package with a version too new', () => {
const versionProblems = packageHelper.getInvalidPackageVersionRecommendations([
{ name: 'sass-loader', version: '^8.0.1' },
{ name: 'sass-loader', version: '^9.0.1' },
{ name: 'preact', version: '8.1.0' }
]);

Expand Down
17 changes: 6 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5353,11 +5353,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==

klona@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/klona/-/klona-1.1.2.tgz#a79e292518a5a5412ec8d097964bff1571a64db0"
integrity sha512-xf88rTeHiXk+XE2Vhi6yj8Wm3gMZrygGdKjJqN8HkV+PwF/t50/LdAKHoHpPcxFAlmQszTZ1CugrK25S7qDRLA==

klona@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
Expand Down Expand Up @@ -7654,15 +7649,15 @@ [email protected]:
scss-tokenizer "^0.2.3"
yargs "^13.3.2"

sass-loader@^9.0.1:
version "9.0.3"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-9.0.3.tgz#086adcf0bfdcc9d920413e2cdc3ba3321373d547"
integrity sha512-fOwsP98ac1VMme+V3+o0HaaMHp8Q/C9P+MUazLFVi3Jl7ORGHQXL1XeRZt3zLSGZQQPC8xE42Y2WptItvGjDQg==
"sass-loader@^9.0.1 || ^10.0.0":
version "10.1.0"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.0.tgz#1727fcc0c32ab3eb197cda61d78adf4e9174a4b3"
integrity sha512-ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg==
dependencies:
klona "^1.1.2"
klona "^2.0.4"
loader-utils "^2.0.0"
neo-async "^2.6.2"
schema-utils "^2.7.0"
schema-utils "^3.0.0"
semver "^7.3.2"

sass@^1.17.0:
Expand Down

0 comments on commit 39b761a

Please sign in to comment.