Skip to content

Commit

Permalink
Utilise le KaTeX de zmd pour ZdS
Browse files Browse the repository at this point in the history
Pour être sûr d'avoir vraiment les mêmes versions dans les deux modules.

Fix #6140
  • Loading branch information
philippemilink committed Oct 7, 2021
1 parent b547584 commit d181638
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function spriteImages() {

// Prepares files for zmarkdown
function prepareZmd() {
return gulp.src(['node_modules/katex/dist/{katex.min.css,fonts/*}'])
return gulp.src(['zmd/node_modules/katex/dist/{katex.min.css,fonts/*}'])
.pipe(gulp.dest('dist/css/'))
}

Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"gulp-terser-js": "5.1.2",
"gulp.spritesmith": "6.12.1",
"jquery": "3.6.0",
"katex": "0.11.1",
"moment": "2.29.1",
"normalize.css": "8.0.1",
"postcss": "8.3.0"
Expand Down
28 changes: 15 additions & 13 deletions scripts/install_zds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,21 @@ if ! $(_in "-back" $@) && ( $(_in "+back" $@) || $(_in "+base" $@) || $(_in "+f
fi


# zmd (zmd has to be installed before the build the front)
if ! $(_in "-zmd" $@) && ( $(_in "+zmd" $@) || $(_in "+base" $@) || $(_in "+full" $@) ); then
print_info "* [+zmd] install zmarkdown dependencies" --bold

make zmd-install; exVal=$?

if [[ $exVal != 0 ]]; then
print_error "!! Cannot install zmd (use \`-zmd\` to skip)"
exit 1
fi

zds_fold_end
fi


# install front
if ! $(_in "-front" $@) && ( $(_in "+front" $@) || $(_in "+base" $@) || $(_in "+full" $@) ); then
print_info "* [+front] install front dependencies & build front" --bold
Expand All @@ -458,19 +473,6 @@ if ! $(_in "-front" $@) && ( $(_in "+front" $@) || $(_in "+base" $@) || $(_in "
fi


# zmd
if ! $(_in "-zmd" $@) && ( $(_in "+zmd" $@) || $(_in "+base" $@) || $(_in "+full" $@) ); then
print_info "* [+zmd] install zmarkdown dependencies" --bold

make zmd-install; exVal=$?

if [[ $exVal != 0 ]]; then
print_error "!! Cannot install zmd (use \`-zmd\` to skip)"
exit 1
fi
fi


# fixtures
if ! $(_in "-data" $@) && ( $(_in "+data" $@) || $(_in "+base" $@) || $(_in "+full" $@) ); then
print_info "* [+data] fixtures" --bold
Expand Down
9 changes: 1 addition & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"

commander@^2.19.0, commander@^2.20.0, commander@^2.8.1:
commander@^2.20.0, commander@^2.8.1:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
Expand Down Expand Up @@ -3649,13 +3649,6 @@ just-debounce@^1.0.0:
resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf"
integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==

katex@0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/katex/-/katex-0.11.1.tgz#df30ca40c565c9df01a466a00d53e079e84ffaa2"
integrity sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==
dependencies:
commander "^2.19.0"

keyv@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
Expand Down

0 comments on commit d181638

Please sign in to comment.