Merge branch 'main' into bugfix/project-temp-cleanup-2

Author: cscheid

news/changelog-1.7.md

@@ -41,18 +41,27 @@ All changes included in 1.7:
 
 - ([#12042](https://github.com/quarto-dev/quarto-cli/issues/12042)): Preserve Markdown content that follows YAML metadata in a `raw` .ipynb cell.
 
+## `quarto inspect`
+
+- ([#12336](https://github.com/quarto-dev/quarto-cli/issues/12336)): Clean up transient files created by `quarto inspect`.
+
 ## `html` format
 
 - ([#12277](https://github.com/quarto-dev/quarto-cli/pull/12277)): Provide light and dark plot and table renderings with `renderings: [light,dark]`
 - ([#11860](https://github.com/quarto-dev/quarto-cli/issues/11860)): ES6 modules that import other local JS modules in documents with `embed-resources: true` are now correctly embedded.
 - ([#1325](https://github.com/quarto-dev/quarto-cli/issues/1325)): Dark Mode pages should not flash light on reload. (Nor should Light Mode pages flash dark.)
+- ([#12307](https://github.com/quarto-dev/quarto-cli/issues/12307)): Tabsets using `tabby.js` in non-boostrap html (`theme: pandoc`, `theme: none` or `minimal: true`) now correctly render reactive content when `server: shiny` is used.
 
 ## `pdf` format
 
 - ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
 - ([#11903](https://github.com/quarto-dev/quarto-cli/issues/11903)): `crossref` configuration like `fig-title` or `tbl-title` now correctly supports multi word values, e.g. `fig-title: 'Supplementary Figure'`.
 - ([#11878](https://github.com/quarto-dev/quarto-cli/issues/11878), [#12085](https://github.com/quarto-dev/quarto-cli/issues/12085)): Correctly fixup raw LaTeX table having an unexpected table env with options (e.g `\begin{table}[!ht]`) to be handled as crossref table.
 
+## `revealjs` format
+
+- ([#12307](https://github.com/quarto-dev/quarto-cli/issues/12307)): Tabsets using `tabby.js` in Revealjs now correctly render reactive content when `server: shiny` is used.
+
 ### Quarto PDF engine
 
 - ([#12194](https://github.com/quarto-dev/quarto-cli/issues/12194)): More specific checks added in log parsing to automatically find missing fonts.

src/project/project-context.ts

@@ -69,6 +69,7 @@ import { ExecutionEngine, kMarkdownEngine } from "../execute/types.ts";
 import { projectResourceFiles } from "./project-resources.ts";
 
 import {
+  cleanupFileInformationCache,
   ignoreFieldsForProjectType,
   normalizeFormatYaml,
   projectConfigFile,
@@ -268,6 +269,7 @@ export async function projectContext(
           dir: join(dir, ".quarto"),
           prefix: "quarto-session-temp",
         });
+        const fileInformationCache = new Map();
         const result: ProjectContext = {
           resolveBrand: async (fileName?: string) =>
             projectResolveBrand(result, fileName),
@@ -287,7 +289,7 @@ export async function projectContext(
           },
           dir,
           engines: [],
-          fileInformationCache: new Map(),
+          fileInformationCache,
           files: {
             input: [],
           },
@@ -313,6 +315,7 @@ export async function projectContext(
           diskCache: await createProjectCache(join(dir, ".quarto")),
           temp,
           cleanup: () => {
+            cleanupFileInformationCache(result);
             result.diskCache.close();
             temp.cleanup();
           },
@@ -362,6 +365,7 @@ export async function projectContext(
           dir: join(dir, ".quarto"),
           prefix: "quarto-session-temp",
         });
+        const fileInformationCache = new Map();
         const result: ProjectContext = {
           resolveBrand: async (fileName?: string) =>
             projectResolveBrand(result, fileName),
@@ -382,7 +386,7 @@ export async function projectContext(
           dir,
           config: projectConfig,
           engines: [],
-          fileInformationCache: new Map(),
+          fileInformationCache,
           files: {
             input: [],
           },
@@ -405,6 +409,7 @@ export async function projectContext(
           diskCache: await createProjectCache(join(dir, ".quarto")),
           temp,
           cleanup: () => {
+            cleanupFileInformationCache(result);
             result.diskCache.close();
             temp.cleanup();
           },
@@ -434,6 +439,7 @@ export async function projectContext(
             dir: join(originalDir, ".quarto"),
             prefix: "quarto-session-temp",
           });
+          const fileInformationCache = new Map();
           const context: ProjectContext = {
             resolveBrand: async (fileName?: string) =>
               projectResolveBrand(context, fileName),
@@ -458,7 +464,7 @@ export async function projectContext(
                 [kProjectOutputDir]: flags?.outputDir,
               },
             },
-            fileInformationCache: new Map(),
+            fileInformationCache,
             files: {
               input: [],
             },
@@ -481,6 +487,7 @@ export async function projectContext(
             diskCache: await createProjectCache(join(temp.baseDir, ".quarto")),
             temp,
             cleanup: () => {
+              cleanupFileInformationCache(context);
               context.diskCache.close();
               temp.cleanup();
             },

src/project/project-shared.ts

@@ -4,7 +4,7 @@
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
 
-import { existsSync } from "../deno_ral/fs.ts";
+import { existsSync, safeRemoveSync } from "../deno_ral/fs.ts";
 import {
   dirname,
   isAbsolute,
@@ -582,3 +582,27 @@ export async function projectResolveBrand(
     }
   }
 }
+
+export function cleanupFileInformationCache(project: ProjectContext) {
+  project.fileInformationCache.forEach((entry) => {
+    if (entry?.target?.data) {
+      const data = entry.target.data as {
+        transient?: boolean;
+      };
+      if (data.transient && entry.target?.input) {
+        safeRemoveSync(entry.target?.input);
+      }
+    }
+  });
+}
+
+export async function withProjectCleanup<T>(
+  project: ProjectContext,
+  fn: (project: ProjectContext) => Promise<T>,
+): Promise<T> {
+  try {
+    return await fn(project);
+  } finally {
+    project.cleanup();
+  }
+}