Skip to content

Commit

Permalink
Fix using / for division deprecation warning in fontawesome-free.
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric-Guo committed Jan 3, 2022
1 parent ecff979 commit afc0b0b
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 5 deletions.
3 changes: 2 additions & 1 deletion app/assets/stylesheets/_custom.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:math";
@import "variables";

// Custom styles for this template
Expand Down Expand Up @@ -79,7 +80,7 @@ body:not(.sidebar-minimized) {
width: 50px;
height: 45px;
margin-top: -($sidebar-nav-link-padding-y + 0.25rem) !important;
margin-right: ($sidebar-nav-link-padding-x / 2);
margin-right: math.div($sidebar-nav-link-padding-x, 2);
margin-bottom: -$sidebar-nav-link-padding-y;
margin-left: -$sidebar-nav-link-padding-x;
line-height: 45px;
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"version": "0.0.1",
"private": true,
"scripts": {
"syncyarnlock": "syncyarnlock -s -k && yarn install --check-files"
"syncyarnlock": "syncyarnlock -s -k && yarn install --check-files",
"postinstall": "patch-package"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4",
Expand All @@ -16,8 +17,10 @@
"bootstrap": "^4.6.1",
"core-js": "^3.19.3",
"jquery": "^3.6.0",
"patch-package": "^6.4.7",
"perfect-scrollbar": "^1.5.3",
"popper.js": "^1.16.1",
"postinstall-postinstall": "^2.1.0",
"regenerator-runtime": "^0.13.9",
"stimulus": "^2.0.0",
"turbolinks": "^5.2.0"
Expand Down
52 changes: 52 additions & 0 deletions patches/@fortawesome+fontawesome-free+5.15.4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
diff --git a/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss b/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss
index 27c2ad5..6233427 100644
--- a/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss
+++ b/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss
@@ -1,10 +1,11 @@
+@use "sass:math";
// Icon Sizes
// -------------------------

// makes the font 33% larger relative to the icon container
.#{$fa-css-prefix}-lg {
- font-size: (4em / 3);
- line-height: (3em / 4);
+ font-size: math.div(4em, 3);
+ line-height: math.div(3em, 4);
vertical-align: -.0667em;
}

diff --git a/node_modules/@fortawesome/fontawesome-free/scss/_list.scss b/node_modules/@fortawesome/fontawesome-free/scss/_list.scss
index 8ebf333..abb3c41 100644
--- a/node_modules/@fortawesome/fontawesome-free/scss/_list.scss
+++ b/node_modules/@fortawesome/fontawesome-free/scss/_list.scss
@@ -1,9 +1,10 @@
+@use "sass:math";
// List Icons
// -------------------------

.#{$fa-css-prefix}-ul {
list-style-type: none;
- margin-left: $fa-li-width * 5/4;
+ margin-left: math.div($fa-li-width * 5, 4);
padding-left: 0;

> li { position: relative; }
diff --git a/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss b/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss
index b39f35e..c6bf168 100644
--- a/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss
+++ b/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss
@@ -1,3 +1,4 @@
+@use "sass:math";
// Variables
// --------------------------

@@ -9,7 +10,7 @@ $fa-version: "5.15.4" !default;
$fa-border-color: #eee !default;
$fa-inverse: #fff !default;
$fa-li-width: 2em !default;
-$fa-fw-width: (20em / 16);
+$fa-fw-width: math.div(20em, 16);
$fa-primary-opacity: 1 !default;
$fa-secondary-opacity: .4 !default;

127 changes: 124 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1229,6 +1229,11 @@
resolved "https://registry.npmmirror.com/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=

"@yarnpkg/lockfile@^1.1.0":
version "1.1.0"
resolved "https://registry.npmmirror.com/@yarnpkg/lockfile/download/@yarnpkg/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
integrity sha1-53qX+9NFt22DJF7c0X05OxtB+zE=

accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
version "1.3.7"
resolved "https://registry.npmmirror.com/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
Expand Down Expand Up @@ -1582,7 +1587,7 @@ braces@^2.3.1:
split-string "^3.0.2"
to-regex "^3.0.1"

braces@~3.0.2:
braces@^3.0.1, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.npmmirror.com/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha1-NFThpGLujVmeI23zNs2epPiv4Qc=
Expand Down Expand Up @@ -1861,6 +1866,11 @@ chrome-trace-event@^1.0.2:
resolved "https://registry.npmmirror.com/chrome-trace-event/download/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
integrity sha1-EBXs7UdB4V0GZkqVfbv1DQQeJqw=

ci-info@^2.0.0:
version "2.0.0"
resolved "https://registry.npmmirror.com/ci-info/download/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
integrity sha1-Z6npZL4xpR4V5QENWObxKDQAL0Y=

cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
version "1.0.4"
resolved "https://registry.npmmirror.com/cipher-base/download/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
Expand Down Expand Up @@ -2935,6 +2945,13 @@ find-up@^4.0.0:
locate-path "^5.0.0"
path-exists "^4.0.0"

find-yarn-workspace-root@^2.0.0:
version "2.0.0"
resolved "https://registry.npmmirror.com/find-yarn-workspace-root/download/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
integrity sha1-9H+40jnJAOt4F5qoG2ZnPqyI970=
dependencies:
micromatch "^4.0.2"

findup-sync@^3.0.0:
version "3.0.0"
resolved "https://registry.npmmirror.com/findup-sync/download/findup-sync-3.0.0.tgz?cache=0&sync_timestamp=1635767434432&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffindup-sync%2Fdownload%2Ffindup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
Expand Down Expand Up @@ -2998,6 +3015,15 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"

fs-extra@^7.0.1:
version "7.0.1"
resolved "https://registry.npmmirror.com/fs-extra/download/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
integrity sha1-TxicRKoSO4lfcigE9V6iPq3DSOk=
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-minipass@^2.0.0:
version "2.1.0"
resolved "https://registry.npmmirror.com/fs-minipass/download/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
Expand Down Expand Up @@ -3140,7 +3166,7 @@ globby@^6.1.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"

graceful-fs@^4.1.15, graceful-fs@^4.1.2:
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
version "4.2.8"
resolved "https://registry.npmmirror.com/graceful-fs/download/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
integrity sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo=
Expand Down Expand Up @@ -3559,6 +3585,13 @@ is-callable@^1.1.4, is-callable@^1.2.4:
resolved "https://registry.npmmirror.com/is-callable/download/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU=

is-ci@^2.0.0:
version "2.0.0"
resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261346753&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw=
dependencies:
ci-info "^2.0.0"

is-color-stop@^1.0.0:
version "1.1.0"
resolved "https://registry.npmmirror.com/is-color-stop/download/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
Expand Down Expand Up @@ -3622,6 +3655,11 @@ is-directory@^0.3.1:
resolved "https://registry.npmmirror.com/is-directory/download/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=

is-docker@^2.0.0:
version "2.2.1"
resolved "https://registry.npmmirror.com/is-docker/download/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
integrity sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao=

is-extendable@^0.1.0, is-extendable@^0.1.1:
version "0.1.1"
resolved "https://registry.npmmirror.com/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
Expand Down Expand Up @@ -3765,6 +3803,13 @@ is-wsl@^1.1.0:
resolved "https://registry.npmmirror.com/is-wsl/download/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=

is-wsl@^2.1.1:
version "2.2.0"
resolved "https://registry.npmmirror.com/is-wsl/download/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE=
dependencies:
is-docker "^2.0.0"

[email protected], isarray@^1.0.0, isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.npmmirror.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
Expand Down Expand Up @@ -3858,6 +3903,13 @@ json5@^2.1.2:
dependencies:
minimist "^1.2.5"

jsonfile@^4.0.0:
version "4.0.0"
resolved "https://registry.npmmirror.com/jsonfile/download/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
optionalDependencies:
graceful-fs "^4.1.6"

killable@^1.0.1:
version "1.0.1"
resolved "https://registry.npmmirror.com/killable/download/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
Expand Down Expand Up @@ -3887,6 +3939,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
resolved "https://registry.npmmirror.com/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=

klaw-sync@^6.0.0:
version "6.0.0"
resolved "https://registry.npmmirror.com/klaw-sync/download/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
integrity sha1-H9LP1W67YlAYERTwpYEWcJnCsow=
dependencies:
graceful-fs "^4.1.11"

klona@^2.0.4:
version "2.0.5"
resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635385466780&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
Expand Down Expand Up @@ -4093,6 +4152,14 @@ micromatch@^3.0.4, micromatch@^3.1.10:
snapdragon "^0.8.1"
to-regex "^3.0.2"

micromatch@^4.0.2:
version "4.0.4"
resolved "https://registry.npmmirror.com/micromatch/download/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
integrity sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k=
dependencies:
braces "^3.0.1"
picomatch "^2.2.3"

miller-rabin@^4.0.0:
version "4.0.1"
resolved "https://registry.npmmirror.com/miller-rabin/download/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
Expand Down Expand Up @@ -4485,6 +4552,14 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
dependencies:
wrappy "1"

open@^7.4.2:
version "7.4.2"
resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz?cache=0&sync_timestamp=1635048715897&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
integrity sha1-uBR+Jtzz5CYxbHMAif1x7dKcIyE=
dependencies:
is-docker "^2.0.0"
is-wsl "^2.1.1"

opn@^5.5.0:
version "5.5.0"
resolved "https://registry.npmmirror.com/opn/download/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
Expand Down Expand Up @@ -4512,6 +4587,11 @@ os-browserify@^0.3.0:
resolved "https://registry.npmmirror.com/os-browserify/download/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=

os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.npmmirror.com/os-tmpdir/download/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=

p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.npmmirror.com/p-finally/download/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
Expand Down Expand Up @@ -4634,6 +4714,25 @@ pascalcase@^0.1.1:
resolved "https://registry.npmmirror.com/pascalcase/download/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=

patch-package@^6.4.7:
version "6.4.7"
resolved "https://registry.npmmirror.com/patch-package/download/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
integrity sha1-IoLVPDl5CaDZ75La4/3rVYOCsUg=
dependencies:
"@yarnpkg/lockfile" "^1.1.0"
chalk "^2.4.2"
cross-spawn "^6.0.5"
find-yarn-workspace-root "^2.0.0"
fs-extra "^7.0.1"
is-ci "^2.0.0"
klaw-sync "^6.0.0"
minimist "^1.2.0"
open "^7.4.2"
rimraf "^2.6.3"
semver "^5.6.0"
slash "^2.0.0"
tmp "^0.0.33"

[email protected]:
version "0.0.1"
resolved "https://registry.npmmirror.com/path-browserify/download/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
Expand Down Expand Up @@ -4710,7 +4809,7 @@ picocolors@^1.0.0:
resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093442271&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw=

picomatch@^2.0.4, picomatch@^2.2.1:
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
version "2.3.1"
resolved "https://registry.npmmirror.com/picomatch/download/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
Expand Down Expand Up @@ -5417,6 +5516,11 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2
picocolors "^0.2.1"
source-map "^0.6.1"

postinstall-postinstall@^2.1.0:
version "2.1.0"
resolved "https://registry.npmmirror.com/postinstall-postinstall/download/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3"
integrity sha1-T393RB71OdFRLEC9BMcbBqRwTKM=

prepend-http@^1.0.0:
version "1.0.4"
resolved "https://registry.npmmirror.com/prepend-http/download/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
Expand Down Expand Up @@ -6012,6 +6116,11 @@ simple-swizzle@^0.2.2:
dependencies:
is-arrayish "^0.3.1"

slash@^2.0.0:
version "2.0.0"
resolved "https://registry.npmmirror.com/slash/download/slash-2.0.0.tgz?cache=0&sync_timestamp=1632753426618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fslash%2Fdownload%2Fslash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
integrity sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q=

snapdragon-node@^2.0.1:
version "2.1.1"
resolved "https://registry.npmmirror.com/snapdragon-node/download/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
Expand Down Expand Up @@ -6441,6 +6550,13 @@ timsort@^0.3.0:
resolved "https://registry.npmmirror.com/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=

tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.npmmirror.com/tmp/download/tmp-0.0.33.tgz?cache=0&sync_timestamp=1632753468037&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftmp%2Fdownload%2Ftmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
integrity sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=
dependencies:
os-tmpdir "~1.0.2"

to-arraybuffer@^1.0.0:
version "1.0.1"
resolved "https://registry.npmmirror.com/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
Expand Down Expand Up @@ -6588,6 +6704,11 @@ unique-slug@^2.0.0:
dependencies:
imurmurhash "^0.1.4"

universalify@^0.1.0:
version "0.1.2"
resolved "https://registry.npmmirror.com/universalify/download/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=

[email protected], unpipe@~1.0.0:
version "1.0.0"
resolved "https://registry.npmmirror.com/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
Expand Down

0 comments on commit afc0b0b

Please sign in to comment.