From ef4627165b4bd033452b05c1f6e34c242c2da3ac Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Thu, 29 Oct 2020 13:56:46 -0700 Subject: [PATCH] chore(deps-dev): bump carbon-components to v10.23.0 --- package.json | 3 +- scripts/build-css.js | 16 +++++----- yarn.lock | 73 ++++---------------------------------------- 3 files changed, 16 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index b05defdc..b8798586 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,11 @@ "flatpickr": "4.6.3" }, "devDependencies": { - "@carbon/themes": "^10.18.0", "@rollup/plugin-commonjs": "^15.0.0", "@rollup/plugin-node-resolve": "^9.0.0", "@tsconfig/svelte": "^1.0.10", "autoprefixer": "^9.8.6", - "carbon-components-10.22": "npm:carbon-components@10.22", + "carbon-components-10.23": "npm:carbon-components@10.23", "comment-parser": "^0.7.5", "gh-pages": "^3.1.0", "husky": "^4.3.0", diff --git a/scripts/build-css.js b/scripts/build-css.js index 33795bd7..b46d0221 100644 --- a/scripts/build-css.js +++ b/scripts/build-css.js @@ -18,12 +18,12 @@ const shared = { $css--default-type: true; $css--plex: true; - @import "node_modules/carbon-components-10.22/scss/globals/scss/_css--reset.scss"; - @import "node_modules/carbon-components-10.22/scss/globals/scss/_css--font-face.scss"; - @import "node_modules/carbon-components-10.22/scss/globals/scss/_css--helpers.scss"; - @import "node_modules/carbon-components-10.22/scss/globals/scss/_css--body.scss"; - @import "node_modules/carbon-components-10.22/scss/globals/grid/_grid.scss"; - @import "node_modules/carbon-components-10.22/scss/globals/scss/styles.scss"; + @import "node_modules/carbon-components-10.23/scss/globals/scss/_css--reset.scss"; + @import "node_modules/carbon-components-10.23/scss/globals/scss/_css--font-face.scss"; + @import "node_modules/carbon-components-10.23/scss/globals/scss/_css--helpers.scss"; + @import "node_modules/carbon-components-10.23/scss/globals/scss/_css--body.scss"; + @import "node_modules/carbon-components-10.23/scss/globals/grid/_grid.scss"; + @import "node_modules/carbon-components-10.23/scss/globals/scss/styles.scss"; `, components: ``, }; @@ -76,11 +76,13 @@ async function buildCss() { const outFile = path.resolve("css", theme + ".css"); const { css } = await sassRender({ data: ` + @import "node_modules/carbon-components-10.23/scss/globals/scss/_theme.scss"; + $feature-flags: ( enable-css-custom-properties: ${theme === "all"}, grid-columns-16: true, ); - @import "node_modules/@carbon/themes/scss/themes"; + ${themes[theme]} ${shared.globals} ${shared.components} diff --git a/yarn.lock b/yarn.lock index 9d1e56bc..596e92da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,39 +23,6 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@carbon/colors@^10.13.0": - version "10.13.0" - resolved "https://registry.npmjs.org/@carbon/colors/-/colors-10.13.0.tgz#8b17a4555dd00c4494471471c7813b3df5bab9a3" - integrity sha512-SVWgbwa5cjT4cnZ6xJZUB8KJakSIzEqvtD23RHOWpv/qLATXbCEWzSvsa7RO0hNaqYH5EYkYxFS2Y+qV/Mz9pA== - -"@carbon/import-once@^10.3.0": - version "10.3.0" - resolved "https://registry.npmjs.org/@carbon/import-once/-/import-once-10.3.0.tgz#58617da4efb6d7a11352d8e6b7209da1d39f364d" - integrity sha512-PFk3FhMe3psihYtCg3JsyPHismqglnbUqIpz1DCG5Gn/kt0HdVKhGvHdEq7E305rGoBUCKzMn/4xoY9v9mcmlg== - -"@carbon/layout@^10.13.0": - version "10.13.0" - resolved "https://registry.npmjs.org/@carbon/layout/-/layout-10.13.0.tgz#fd7ecaf1502f4d4ef1598816d9316dd6c84be5da" - integrity sha512-OgLe9/27zffC019rOGjWd4lavZO7BAkgUyKG+0Mg8IpzqqmGt7v8k4viMH5ThMt8y7Qk1LQfno/4ZzBItWi5Ow== - -"@carbon/themes@^10.18.0": - version "10.18.0" - resolved "https://registry.npmjs.org/@carbon/themes/-/themes-10.18.0.tgz#c244368c7c4ebe54964e85cee18cc0469e14cd1b" - integrity sha512-EkTdE6VpZufi4YanAmws26BBjRG2T/faEU/qFocDVBucexUlblE0ItU2VEhKz4J71TOj3xN8QUX8MVD2UvwdPA== - dependencies: - "@carbon/colors" "^10.13.0" - "@carbon/layout" "^10.13.0" - "@carbon/type" "^10.15.0" - color "^3.1.2" - -"@carbon/type@^10.15.0": - version "10.15.0" - resolved "https://registry.npmjs.org/@carbon/type/-/type-10.15.0.tgz#1b041cbf1a2bdd3ec3bf71ddaf148a396f99bb63" - integrity sha512-BXAGomXHjWhA8pWZMuAhLYBh3SzbaYQsm19oWYJWDxNUm2c9IIIWv7uD/uGagvmzFHqYOKorttuL8Qn3Z9jh7A== - dependencies: - "@carbon/import-once" "^10.3.0" - "@carbon/layout" "^10.13.0" - "@rollup/plugin-commonjs@^15.0.0": version "15.0.0" resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.0.0.tgz#690d15a9d54ba829db93555bff9b98ff34e08574" @@ -386,10 +353,10 @@ caniuse-lite@^1.0.30001109: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz#5d9998190258e11630d674fc50ea8e579ae0ced2" integrity sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA== -"carbon-components-10.22@npm:carbon-components@10.22": - version "10.22.0" - resolved "https://registry.npmjs.org/carbon-components/-/carbon-components-10.22.0.tgz#866791ca8e3f651054543d63f6a898cff6bcacf9" - integrity sha512-0cADWQf1e+6YsxXnjEz630Z7GZa3Z1ssO0UW/HnnJy03Dr+qdT3o6sIgSqObYLddJliAVcjeTlwJshZ9K4bWJQ== +"carbon-components-10.23@npm:carbon-components@10.23": + version "10.23.0" + resolved "https://registry.npmjs.org/carbon-components/-/carbon-components-10.23.0.tgz#56bdfffa95f518237a0bee2961b955c367a8b4c4" + integrity sha512-Meq//PMtSnAwoMKr2BpiOmjAivpSzc1D2Q0r3mudkQsz9dhYOzBQAsfEfoh8WKbDiD7rHWUM2fNkw0yQl4dahA== dependencies: flatpickr "4.6.1" lodash.debounce "^4.0.8" @@ -472,7 +439,7 @@ code-point-at@^1.0.0: resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0: version "1.9.3" resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -491,27 +458,11 @@ color-name@1.1.3: resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0, color-name@~1.1.4: +color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.2: - version "1.5.3" - resolved "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" - integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color@^3.1.2: - version "3.1.2" - resolved "https://registry.npmjs.org/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10" - integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - colorette@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" @@ -1185,11 +1136,6 @@ is-arrayish@^0.2.1: resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - is-callable@^1.1.4, is-callable@^1.2.2: version "1.2.2" resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" @@ -2324,13 +2270,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" - slash@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"