Skip to content

Commit

Permalink
Replace dart-sass by sass and update slash divisor
Browse files Browse the repository at this point in the history
  • Loading branch information
Aro Andriamaro committed May 24, 2021
1 parent 994dbef commit 98f6ec1
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 27 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -44,7 +44,6 @@
"babel-plugin-dynamic-import-node": "^2.3.0",
"coveralls": "^3.0.11",
"css-loader": "^3.4.2",
"dart-sass": "^1.25.0",
"date-fns": "2.11.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
Expand All @@ -64,6 +63,7 @@
"react-dom": "^16.13.1",
"react-syntax-highlighter": "^12.2.1",
"react-test-renderer": "^16.13.1",
"sass": "^1.34.0",
"sass-loader": "^8.0.2",
"scudd": "^0.0.1",
"storybook4-state": "^1.5.3",
Expand Down
6 changes: 4 additions & 2 deletions src/sass/default/Inliner.sass
@@ -1,9 +1,11 @@
@use 'sass:math'

.Formol_Inliner
margin: -$formol-field-margin / 2 0
margin: math.div(-$formol-field-margin, 2) 0

.Formol_Field
display: inline-block
margin: $formol-field-margin / 2 0
margin: math.div($formol-field-margin, 2) 0
vertical-align: top

&:not(:last-of-type)
Expand Down
4 changes: 3 additions & 1 deletion src/sass/default/fields/PasswordStrengthField.sass
@@ -1,3 +1,5 @@
@use 'sass:math'

.Formol_PasswordStrengthField
&__description
font-size: $formol-font-size * .85
Expand All @@ -16,7 +18,7 @@
&--score-#{$i} .Formol_PasswordStrengthField
&__strength
background-color: nth($strengths, $i + 1)
width: percentage(.1 + $i * (.9 / $steps))
width: percentage(.1 + $i * math.div(.9, $steps))

&__description
color: nth($strengths, $i + 1)
Expand Down
4 changes: 3 additions & 1 deletion src/sass/default/fields/RangeField.sass
@@ -1,3 +1,5 @@
@use 'sass:math'

.Formol_Field--type-range
.Formol_Field
&--focus
Expand Down Expand Up @@ -31,4 +33,4 @@
position: absolute

&__min, &__max
font-size: $formol-font-size / 1.25
font-size: math.div($formol-font-size, 1.25)
2 changes: 0 additions & 2 deletions webpack.config.babel.js
Expand Up @@ -3,7 +3,6 @@ import path from 'path'

import MiniCssExtractPlugin from 'mini-css-extract-plugin'
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
import sass from 'dart-sass'

import config from './package.json'

Expand Down Expand Up @@ -87,7 +86,6 @@ export default {
{
loader: 'sass-loader',
options: {
implementation: sass,
sassOptions: {
includePaths: [path.join(__dirname, 'src')],
},
Expand Down
50 changes: 30 additions & 20 deletions yarn.lock
Expand Up @@ -3468,20 +3468,20 @@ cheerio@^1.0.0-rc.3:
lodash "^4.15.0"
parse5 "^3.0.1"

"chokidar@>=2.0.0 <4.0.0":
version "3.3.1"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
"chokidar@>=3.0.0 <4.0.0":
version "3.5.1"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
dependencies:
anymatch "~3.1.1"
braces "~3.0.2"
glob-parent "~5.1.0"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.3.0"
readdirp "~3.5.0"
optionalDependencies:
fsevents "~2.1.2"
fsevents "~2.3.1"

chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.8:
version "2.1.8"
Expand Down Expand Up @@ -4107,13 +4107,6 @@ cyclist@^1.0.1:
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=

dart-sass@^1.25.0:
version "1.25.0"
resolved "https://registry.yarnpkg.com/dart-sass/-/dart-sass-1.25.0.tgz#e00c0348118916e9d81cb485297184c131af1dad"
integrity sha512-syNOAstJXAmvD3RifcDk3fiPMyYE2fY8so6w9gf2/wNlKpG0zyH+oiXubEYVOy1WAWkzOc72pbAxwx+3OU4JJA==
dependencies:
chokidar ">=2.0.0 <4.0.0"

dashdash@^1.12.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
Expand Down Expand Up @@ -5596,11 +5589,16 @@ fsevents@^1.2.7:
bindings "^1.5.0"
nan "^2.12.1"

fsevents@^2.1.2, fsevents@~2.1.2:
fsevents@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==

fsevents@~2.3.1:
version "2.3.2"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==

function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
Expand Down Expand Up @@ -8969,11 +8967,16 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7:
picomatch@^2.0.4, picomatch@^2.0.5:
version "2.2.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==

picomatch@^2.2.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==

pidtree@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
Expand Down Expand Up @@ -9960,12 +9963,12 @@ readdirp@^2.2.1:
micromatch "^3.1.10"
readable-stream "^2.0.2"

readdirp@~3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==
readdirp@~3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
dependencies:
picomatch "^2.0.7"
picomatch "^2.2.1"

realpath-native@^1.1.0:
version "1.1.0"
Expand Down Expand Up @@ -10378,6 +10381,13 @@ sass-loader@^8.0.2:
schema-utils "^2.6.1"
semver "^6.3.0"

sass@^1.34.0:
version "1.34.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.34.0.tgz#e46d5932d8b0ecc4feb846d861f26a578f7f7172"
integrity sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==
dependencies:
chokidar ">=3.0.0 <4.0.0"

sax@~1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
Expand Down

0 comments on commit 98f6ec1

Please sign in to comment.