Merge branch 'main' into fix/issue9468

Author: mcanouil

.github/workflows/test-quarto-latexmk.yml

@@ -42,9 +42,9 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           cd package/src
-          ./quarto-bld compile-quarto-latexmk --target x86_64-apple-darwin --name tinitex
+          ./quarto-bld compile-quarto-latexmk --target aarch64-apple-darwin --name tinitex
           ls -R ../dist/bin
-          ../dist/bin/tinitex/x86_64-apple-darwin/tinitex --help
+          ../dist/bin/tinitex/aarch64-apple-darwin/tinitex --help
 
       - name: Test Linux
         if: runner.os == 'Linux'

news/changelog-1.5.md

@@ -158,6 +158,7 @@ All changes included in 1.5:
 - ([#9282](https://github.com/quarto-dev/quarto-cli/issues/9282)): Fix name clash in Lua local declarations for `mediabag` in bundled releases.
 - ([#9394](https://github.com/quarto-dev/quarto-cli/issues/9394)): Make `template` a required field in the `about` schema.
 - ([#9426](https://github.com/quarto-dev/quarto-cli/issues/9426)): Update `crossref.lua` filter to avoid crashes and hangs in documents with custom AST nodes.
+- ([#9492](https://github.com/quarto-dev/quarto-cli/issues/9492)): Improve performance of `quarto preview` when serving resource files of the following formats: HTML, PDF, DOCX, and plaintext.
 - Add support for `{{< lipsum >}}` shortcode, which is useful for emitting placeholder text. Provide a specific number of paragraphs (`{{< lipsum 3 >}}`).
 - Resolve data URIs in Pandoc's mediabag when rendering documents.
 - Increase v8's max heap size by default, to avoid out-of-memory errors when rendering large documents (also cf. https://github.com/denoland/deno/issues/18935).

package/scripts/vendoring/vendor.sh

@@ -46,3 +46,5 @@ else
   rm -rf vendor-${today}
 fi
 $DENO_BIN_PATH run --no-config --unstable-ffi --allow-all --importmap=$QUARTO_SRC_PATH/import_map.json $QUARTO_PACKAGE_PATH/src/common/create-dev-import-map.ts
+popd
+source configure.sh

src/project/serve/serve.ts

@@ -560,7 +560,20 @@ async function internalPreviewServer(
           watcher.project(),
           filePathRelative,
         );
+
+        if (!inputFile) {
+          // If we couldn't find a input file, check if this is a resource file.
+          // If so, we can bail out early, since we don't need to render it.
+          // This is great for performance, as refreshing the watcher can be slow.
+          const fileSourcePath = join(watcher.project().dir, filePathRelative);
+          const projectResourceFiles = watcher.project().files.resources;
+          if (projectResourceFiles?.includes(fileSourcePath)) {
+            return undefined;
+          }
+        }
+
         if (!inputFile || !existsSync(inputFile.file)) {
+          // If we got here, we need to look harder for an input file.
           inputFile = await inputFileForOutputFile(
             await watcher.refreshProject(),
             filePathRelative,

src/resources/filters/layout/docx.lua

@@ -90,7 +90,7 @@ function docxDivCaption(captionEl, align)
   local caption = pandoc.Para({
     pandoc.RawInline("openxml", docxParaStyles(align))
   })
-  tappend(caption.content, captionEl.content)
+  tappend(caption.content, captionEl and captionEl.content or pandoc.Inlines({}))
   return caption
 end
 

src/resources/filters/layout/lightbox.lua

@@ -144,7 +144,12 @@ function lightbox()
     subFloatEl = _quarto.ast.walk(subFloatEl, {
       traverse = 'topdown',
       Image = function(imgEl)
-        local caption_content = subFloatEl.caption_long.content or subFloatEl.caption_long
+        local caption_content
+        if subFloatEl.caption_long then
+          caption_content = subFloatEl.caption_long.content or subFloatEl.caption_long
+        else
+          caption_content = pandoc.Inlines({})
+        end
         local caption = full_caption_prefix(parentFloat, subFloatEl)
         tappend(caption, caption_content)
         local subImgModified = processImg(imgEl, { automatic = true, caption = caption, gallery = gallery })

src/resources/filters/quarto-pre/parsefiguredivs.lua

@@ -514,7 +514,8 @@ function parse_floatreftargets()
         local type = refType(identifier)
         local category = crossref.categories.by_ref_type[type]
         if category == nil then
-          warn("Figure with invalid crossref category: " .. identifier .. "\nWon't be able to cross-reference this figure.")
+          -- We've had too many reports of false positives for this, so we're disabling the warning
+          -- warn("Figure with invalid crossref category: " .. identifier .. "\nWon't be able to cross-reference this figure.")
           return nil
         end
         return quarto.FloatRefTarget({

tests/docs/smoke-all/2024/04/25/lightbox-no-caption.qmd

@@ -0,0 +1,17 @@
+---
+title: "lightbox no caption"
+lightbox: true
+format:
+  html: {}
+  docx: {}
+---
+
+::: {#fig-multi layout-nrow=3}
+
+![](la-palma-map.png){#fig-a}
+
+![](la-palma-map.png){#fig-b}
+
+Captions (a) bala; (b) bala
+:::
+