Skip to content

Commit 8f0dc3a

Browse files
crisbetommalerba
authored andcommitted
build: update to latest scss bundler and resolve file size issue (#21016)
Updates to the latest version of `scss-bundle` and resolves an issue that was causing the theming bundle to be more than 15mb. (cherry picked from commit 7ca2af0)
1 parent ab86e0a commit 8f0dc3a

File tree

3 files changed

+53
-27
lines changed

3 files changed

+53
-27
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"rollup-plugin-sourcemaps": "^0.4.2",
158158
"run-sequence": "^1.2.2",
159159
"sass": "^1.24.4",
160-
"scss-bundle": "^3.0.2",
160+
"scss-bundle": "^3.1.2",
161161
"selenium-webdriver": "^3.6.0",
162162
"semver": "^6.3.0",
163163
"send": "^0.17.1",

src/material/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ scss_bundle(
2828
args = [
2929
"--entryFile=$(execpath :theming-bundle.scss)",
3030
"--outFile=$(execpath :_theming.scss)",
31+
32+
# The config file has to be passed in explicitly, otherwise the
33+
# bundler will still run, but produce massive bundle files.
34+
"--config=scss-bundle.config.json",
3135
],
3236
data = CDK_SCSS_LIBS + MATERIAL_SCSS_LIBS + [
3337
"theming-bundle.scss",

yarn.lock

Lines changed: 48 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,10 +1426,10 @@
14261426
dependencies:
14271427
"@types/node" "*"
14281428

1429-
"@types/fs-extra@^8.0.0":
1430-
version "8.0.1"
1431-
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.1.tgz#a2378d6e7e8afea1564e44aafa2e207dadf77686"
1432-
integrity sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==
1429+
"@types/fs-extra@^8.0.1":
1430+
version "8.1.1"
1431+
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
1432+
integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
14331433
dependencies:
14341434
"@types/node" "*"
14351435

@@ -3059,6 +3059,21 @@ chokidar@^3.0.2:
30593059
optionalDependencies:
30603060
fsevents "~2.1.1"
30613061

3062+
chokidar@^3.3.1:
3063+
version "3.4.3"
3064+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
3065+
integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
3066+
dependencies:
3067+
anymatch "~3.1.1"
3068+
braces "~3.0.2"
3069+
glob-parent "~5.1.0"
3070+
is-binary-path "~2.1.0"
3071+
is-glob "~4.0.1"
3072+
normalize-path "~3.0.0"
3073+
readdirp "~3.5.0"
3074+
optionalDependencies:
3075+
fsevents "~2.1.2"
3076+
30623077
chownr@^1.1.1:
30633078
version "1.1.1"
30643079
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
@@ -3331,10 +3346,10 @@ commander@^2.20.0, commander@~2.20.3:
33313346
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
33323347
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
33333348

3334-
commander@^3.0.0:
3335-
version "3.0.2"
3336-
resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
3337-
integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
3349+
commander@^4.0.1:
3350+
version "4.1.1"
3351+
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
3352+
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
33383353

33393354
commondir@^1.0.1:
33403355
version "1.0.1"
@@ -7749,10 +7764,10 @@ loglevel-plugin-prefix@^0.8.4:
77497764
resolved "https://registry.yarnpkg.com/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz#2fe0e05f1a820317d98d8c123e634c1bd84ff644"
77507765
integrity sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==
77517766

7752-
loglevel@^1.6.3:
7753-
version "1.6.6"
7754-
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
7755-
integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
7767+
loglevel@^1.6.6:
7768+
version "1.7.0"
7769+
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
7770+
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
77567771

77577772
long@^4.0.0:
77587773
version "4.0.0"
@@ -9927,6 +9942,13 @@ readdirp@~3.3.0:
99279942
dependencies:
99289943
picomatch "^2.0.7"
99299944

9945+
readdirp@~3.5.0:
9946+
version "3.5.0"
9947+
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
9948+
integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
9949+
dependencies:
9950+
picomatch "^2.2.1"
9951+
99309952
rechoir@^0.6.2:
99319953
version "0.6.2"
99329954
resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -10481,10 +10503,10 @@ sass-lookup@^3.0.0:
1048110503
dependencies:
1048210504
commander "^2.16.0"
1048310505

10484-
sass@^1.22.9:
10485-
version "1.23.7"
10486-
resolved "https://registry.yarnpkg.com/sass/-/sass-1.23.7.tgz#090254e006af1219d442f1bff31e139d5e085dff"
10487-
integrity sha512-cYgc0fanwIpi0rXisGxl+/wadVQ/HX3RhpdRcjLdj2o2ye/sxUTpAxIhbmJy3PLQgRFbf6Pn8Jsrta2vdXcoOQ==
10506+
sass@^1.23.7:
10507+
version "1.29.0"
10508+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.29.0.tgz#ec4e1842c146d8ea9258c28c141b8c2b7c6ab7f1"
10509+
integrity sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==
1048810510
dependencies:
1048910511
chokidar ">=2.0.0 <4.0.0"
1049010512

@@ -10518,28 +10540,28 @@ sax@>=0.6.0, sax@^1.2.4:
1051810540
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1051910541
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
1052010542

10521-
scss-bundle@^3.0.2:
10522-
version "3.0.2"
10523-
resolved "https://registry.yarnpkg.com/scss-bundle/-/scss-bundle-3.0.2.tgz#c6fd4d8738a938584070210beb9bd5eb69d87bbb"
10524-
integrity sha512-6OUFD+bD1ko/nrcXEGQ58NY/pTAQyj3LBfUyCpDeplcs8m8U7CWAfSuK49BrV5PEUGRXEh3oiETxqeG1vJSvrA==
10543+
scss-bundle@^3.1.2:
10544+
version "3.1.2"
10545+
resolved "https://registry.yarnpkg.com/scss-bundle/-/scss-bundle-3.1.2.tgz#8919dd7603d01a84822e8aab5210e5b0b50c548b"
10546+
integrity sha512-lvxTwCKDLgzmRWhGwJ834ggtnEhs0G9FxSJRWte+NwlshVvBcQ/kOHHkpAGDpCxIMNGz/Utl0yd/MWyQAOBhqg==
1052510547
dependencies:
1052610548
"@types/archy" "^0.0.31"
1052710549
"@types/debug" "^4.1.5"
10528-
"@types/fs-extra" "^8.0.0"
10550+
"@types/fs-extra" "^8.0.1"
1052910551
"@types/glob" "^7.1.1"
1053010552
"@types/lodash.debounce" "^4.0.6"
1053110553
"@types/sass" "^1.16.0"
1053210554
archy "^1.0.0"
10533-
chalk "^2.4.2"
10534-
chokidar "^3.0.2"
10535-
commander "^3.0.0"
10555+
chalk "^3.0.0"
10556+
chokidar "^3.3.1"
10557+
commander "^4.0.1"
1053610558
fs-extra "^8.1.0"
1053710559
globs "^0.1.4"
1053810560
lodash.debounce "^4.0.8"
10539-
loglevel "^1.6.3"
10561+
loglevel "^1.6.6"
1054010562
loglevel-plugin-prefix "^0.8.4"
1054110563
pretty-bytes "^5.3.0"
10542-
sass "^1.22.9"
10564+
sass "^1.23.7"
1054310565
tslib "^1.10.0"
1054410566

1054510567
scss-tokenizer@^0.2.3:

0 commit comments

Comments
 (0)