diff --git a/config/butler.config.sh b/config/butler.config.sh index 98f7f7e..9538698 100755 --- a/config/butler.config.sh +++ b/config/butler.config.sh @@ -35,6 +35,11 @@ if [ ! -e ../../conf/butler.defaults.js ]; then echo "" >> ../../conf/butler.defaults.js echo "module.exports = overrides;" >> ../../conf/butler.defaults.js + + if [ ! -e ../../patches ]; then + mkdir ../../patches + cp -r patches/* ../../patches + fi; fi; echo "" diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 63f2c6a..7343451 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8268,7 +8268,7 @@ "asap": { "version": "2.0.4", "from": "asap@latest", - "resolved": "https://unpm.uberinternal.com/asap/-/asap-2.0.4.tgz" + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz" }, "chownr": { "version": "1.0.1", diff --git a/package.json b/package.json index 3a1b3c0..8b665f4 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,14 @@ "gulp-sass": "^3.0", "install": "^0.5.4", "npm": "^3.7.5", + "patch-package": "^5.1.1", "postcss-reporter": "^1.3.3", "postcss-scss": "^0.1.6", "singularitygs": "^1.7.0", "stylelint": "^4.4.0", "stylelint-selector-bem-pattern": "^0.2.1" + }, + "devDependencies": { + "postinstall-prepare": "^1.0.1" } } diff --git a/patches/singularitygs+1.8.0.patch b/patches/singularitygs+1.8.0.patch new file mode 100644 index 0000000..5106f59 --- /dev/null +++ b/patches/singularitygs+1.8.0.patch @@ -0,0 +1,25 @@ +patch-package +--- a/node_modules/singularitygs/stylesheets/singularitygs/_api.scss ++++ b/node_modules/singularitygs/stylesheets/singularitygs/_api.scss +@@ -56,11 +56,19 @@ + $Right: (); + + @if $Direction == 'both' or $From == 'left' or ($Direction == 'rtl' and $From == 'opposite') { +- $Left: call('output-#{$output-style}', map-merge($Span-Map, ('direction': left))); ++ @if (function-exists('get-function')) { ++ $Left: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': left))); ++ } @else { ++ $Left: call('output-#{$output-style}', map-merge($Span-Map, ('direction': left))); ++ } + } + + @if $Direction == 'both' or $From == 'right' or ($Direction == 'ltr' and $From == 'opposite') { +- $Right: call('output-#{$output-style}', map-merge($Span-Map, ('direction': right))); ++ @if (function-exists('get-function')) { ++ $Right: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': right))); ++ } @else { ++ $Right: call('output-#{$output-style}', map-merge($Span-Map, ('direction': right))); ++ } + } + + $Left-Keys: map-keys($Left);