From 2dba7a184d703699c66682bacb7cd25e48c8b426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20F=C3=BCrstenberg?= Date: Sun, 19 Apr 2020 19:51:51 +0200 Subject: [PATCH 1/2] Fixed sass parameter in rollup-plugin-scss --- CHANGELOG.md | 4 ++++ itsl.rollup.js | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81d648f9..70c5c07a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## Fixed + +- Sass parameter changed from `compiler` to `sass` in rollup-plugin-scss + ## [v10.8.0] - 16.04.2020 ### Changed diff --git a/itsl.rollup.js b/itsl.rollup.js index 4d9b0763..f1c2f88f 100644 --- a/itsl.rollup.js +++ b/itsl.rollup.js @@ -4,7 +4,6 @@ const path = require('path'); const babel = require('rollup-plugin-babel'); const { eslint } = require('rollup-plugin-eslint'); const resolve = require('@rollup/plugin-node-resolve'); -const sass = require('sass'); const scss = require('rollup-plugin-scss'); const commonjs = require('@rollup/plugin-commonjs'); const svelte = require('rollup-plugin-svelte'); @@ -137,7 +136,7 @@ const Sass = (src, dest, options = sassOptions) => ({ onwarn: (warning, onwarn) => warning.code === 'EMPTY_BUNDLE' || onwarn(warning), plugins: [ scss({ - compiler: sass, + sass: require('sass'), importer(path) { return { file: path.replace(/^~/, 'node_modules/') From 904a3e8da57c50cb8de714b798b19aef6f331945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20F=C3=BCrstenberg?= Date: Sun, 19 Apr 2020 20:01:59 +0200 Subject: [PATCH 2/2] Updated to v10.8.1 --- CHANGELOG.md | 2 ++ package.json | 29 +++++++++--------- yarn.lock | 83 ++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 93 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70c5c07a..708724c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v10.8.1] - 19.04.2020 + ## Fixed - Sass parameter changed from `compiler` to `sass` in rollup-plugin-scss diff --git a/package.json b/package.json index 180496f7..1cee5da6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@itslearning/protomorph", "description": "Shared build config for frontend applications", - "version": "10.8.0", + "version": "10.8.1", "author": "Itslearning AS", "license": "MIT", "scripts": { @@ -15,9 +15,8 @@ "@babel/core": "v7.9.0", "@babel/plugin-proposal-object-rest-spread": "v7.9.5", "@babel/preset-env": "v7.9.5", - "whatwg-fetch": "^3.0.0", - "core-js": "3.6.1", - "regenerator-runtime": "^0.13.3", + "@rollup/plugin-commonjs": "11.0.2", + "@rollup/plugin-node-resolve": "7.1.1", "@types/chai": "4.1.3", "@types/mocha": "5.2.0", "autoprefixer": "9.7.3", @@ -27,6 +26,7 @@ "chai": "4.1.2", "clean-webpack-plugin": "0.1.19", "copy-webpack-plugin": "5.0.5", + "core-js": "3.6.1", "css-loader": "3.0.0", "del": "3.0.0", "dirty-chai": "2.0.1", @@ -39,43 +39,43 @@ "eslint-plugin-node": "^8.0.1", "eslint-plugin-promise": "^4.0.1", "eslint-plugin-standard": "^4.0.0", - "karma-chai-dom": "1.1.0", + "karma": "4.4.1", "karma-chai": "0.1.0", + "karma-chai-dom": "1.1.0", "karma-chrome-launcher": "2.2.0", "karma-dirty-chai": "2.0.0", "karma-edge-launcher": "0.4.2", "karma-firefox-launcher": "1.1.0", "karma-ie-launcher": "1.0.0", - "karma-mocha-reporter": "2.2.5", "karma-mocha": "1.3.0", - "karma": "4.4.1", + "karma-mocha-reporter": "2.2.5", "mini-css-extract-plugin": "0.4.0", "mocha": "5.1.1", + "node-sass": "4.13.1", "node-sass-magic-importer": "5.3.2", "node-sass-tilde-importer": "^1.0.2", - "node-sass": "4.13.1", "on-build-webpack": "0.1.0", "optimize-css-assets-webpack-plugin": "4.0.1", "postcss-loader": "3.0.0", - "@rollup/plugin-node-resolve": "7.1.1", - "@rollup/plugin-commonjs": "11.0.2", + "regenerator-runtime": "^0.13.3", + "rollup": "1.32.1", "rollup-plugin-babel": "4.4.0", "rollup-plugin-eslint": "7.0.0", "rollup-plugin-scss": "2.4.0", "rollup-plugin-svelte": "5.2.1", "rollup-plugin-terser": "5.3.0", - "rollup": "1.32.1", "sass": "1.26.2", "sass-lint": "1.13.1", - "sasslint-webpack-plugin": "1.0.4", "sass-loader": "7.0.1", - "svelte-loader": "2.11.0", + "sasslint-webpack-plugin": "1.0.4", "svelte": "2.16.1", + "svelte-loader": "2.11.0", "ts-loader": "4.2.0", "typescript": "2.8.3", + "webpack": "4.42.1", "webpack-clean": "1.2.3", "webpack-cli": "3.3.10", - "webpack": "4.42.1" + "whatwg-fetch": "^3.0.0" }, "resolutions": { "acorn": "7.1.1", @@ -89,7 +89,6 @@ "minimist": "0.2.1", "mkdirp": "0.5.5", "mixin-deep": "1.3.2", - "node-sass": "4.13.1", "serialize-javascript": "^2.1.2", "set-value": "2.0.1" } diff --git a/yarn.lock b/yarn.lock index e8f2c01d..7aa5570e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3870,7 +3870,7 @@ har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" -har-validator@~5.1.0: +har-validator@~5.1.0, har-validator@~5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" dependencies: @@ -4842,10 +4842,20 @@ lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" +lodash.assign@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" + integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= + lodash.capitalize@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz#f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9" +lodash.clonedeep@^4.3.2: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.kebabcase@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" @@ -5188,7 +5198,7 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.12.1, nan@^2.13.2: +nan@^2.12.1, nan@^2.13.2, nan@^2.3.2: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -5236,7 +5246,7 @@ no-case@^2.2.0, no-case@^2.3.2: dependencies: lower-case "^1.1.1" -node-gyp@^3.8.0: +node-gyp@^3.3.1, node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" dependencies: @@ -5313,7 +5323,7 @@ node-sass-tilde-importer@^1.0.2: dependencies: find-parent-dir "^0.3.0" -node-sass@4.13.1, node-sass@^3.3.3: +node-sass@4, node-sass@4.13.1: version "4.13.1" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3" integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw== @@ -5336,6 +5346,28 @@ node-sass@4.13.1, node-sass@^3.3.3: stdout-stream "^1.4.0" "true-case-path" "^1.0.2" +node-sass@^3.3.3: + version "3.13.1" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.13.1.tgz#7240fbbff2396304b4223527ed3020589c004fc2" + integrity sha1-ckD7v/I5YwS0IjUn7TAgWJwAT8I= + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash.assign "^4.2.0" + lodash.clonedeep "^4.3.2" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.3.2" + node-gyp "^3.3.1" + npmlog "^4.0.0" + request "^2.61.0" + sass-graph "^2.1.1" + "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -6210,6 +6242,11 @@ psl@^1.1.24: version "1.1.33" resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.33.tgz#5533d9384ca7aab86425198e10e8053ebfeab661" +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + public-encrypt@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" @@ -6251,7 +6288,7 @@ punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" -punycode@^2.1.0: +punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" @@ -6533,6 +6570,32 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" +request@^2.61.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" @@ -6792,7 +6855,7 @@ safe-regex@^1.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" -sass-graph@^2.2.4: +sass-graph@^2.1.1, sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" dependencies: @@ -7569,6 +7632,14 @@ tough-cookie@~2.4.3: psl "^1.1.24" punycode "^1.4.1" +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"