diff --git a/server-ce/Dockerfile-base b/server-ce/Dockerfile-base index 929180a25b..f63cc9a8c8 100644 --- a/server-ce/Dockerfile-base +++ b/server-ce/Dockerfile-base @@ -44,6 +44,27 @@ RUN curl -fsSL "https://github.com/quarto-dev/quarto-cli/releases/download/v${QU && mkdir -p /var/www/.cache/quarto \ && chown -R www-data:www-data /var/www/.cache +# Pre-install popular Quarto extensions +# ----------------------------------------------------------------------- +# Extensions land in /opt/quarto-extensions/_extensions///. +# QuartoRunner copies them into each project's compile dir (no-clobber, +# so user-uploaded extensions in their project always take precedence). +# To add more: append another line: && quarto add --no-prompt / +# ----------------------------------------------------------------------- +RUN mkdir -p /opt/quarto-extensions \ +&& cd /opt/quarto-extensions \ + \ + # Typst document formats +&& quarto add --no-prompt igorlima/charged-ieee \ + \ + # RevealJS presentation plugins (official Quarto extensions) +&& quarto add --no-prompt quarto-ext/fontawesome \ +&& quarto add --no-prompt quarto-ext/attribution \ +&& quarto add --no-prompt quarto-ext/pointer \ +&& quarto add --no-prompt quarto-ext/drop \ + \ +&& chown -R www-data:www-data /opt/quarto-extensions + # Set up overleaf user and home directory # ----------------------------------------- diff --git a/services/clsi/app/js/QuartoRunner.js b/services/clsi/app/js/QuartoRunner.js index 1a7b60bebe..ebade99ca7 100644 --- a/services/clsi/app/js/QuartoRunner.js +++ b/services/clsi/app/js/QuartoRunner.js @@ -62,7 +62,12 @@ function _buildQuartoCommand(mainFile) { // LocalCommandRunner.replace() only replaces the FIRST $COMPILE_DIR // occurrence in the shell string, so the mv commands use relative paths // instead — the shell CWD is already set to the compile directory. + // Merge pre-installed extensions into the compile dir before rendering. + // -n (no-clobber) ensures project-uploaded extensions take precedence. + // The semicolon means a missing /opt/quarto-extensions dir doesn't abort. const cmd = + `mkdir -p _extensions && ` + + `cp -rn /opt/quarto-extensions/_extensions/. _extensions/ 2>/dev/null; ` + `quarto render ${inputPath} --embed-resources 2>&1 && ` + `(mv ${baseName}.pdf output.pdf 2>/dev/null || ` + `mv ${baseName}.html output.html 2>/dev/null)`