Merge branch 'main' into fix/issue10235

Author: mcanouil

.vscode/launch.json

@@ -14,6 +14,7 @@
       "runtimeExecutable": "${workspaceFolder}/package/dist/bin/tools/deno",
       "runtimeArgs": [
         "run",
+        "--unstable-kv",
         "--unstable-ffi",
         "--importmap=${workspaceFolder}/src/import_map.json",
         "--inspect-brk",
@@ -42,6 +43,7 @@
       "runtimeArgs": [
         "test",
         "--config=test-conf.json",
+        "--unstable-kv",
         "--unstable-ffi",
         "--allow-all",
         "--check",

news/changelog-1.6.md

@@ -15,6 +15,13 @@ All changes included in 1.6:
 - ([#10168](https://github.com/quarto-dev/quarto-cli/issues/10168)): support `csl` bibliography style.
 - ([#10181](https://github.com/quarto-dev/quarto-cli/issues/10181)): Remove workaround for image dimensions which is no longer necessary and mishandled image paths with spaces.
 - ([#10217](https://github.com/quarto-dev/quarto-cli/issues/10217)): Explicitly compute units for image dimensions in `typst` format when they're not given.
+- ([#10212](https://github.com/quarto-dev/quarto-cli/issues/10212)): Moves Pandoc variables to the function declaration for the default template.
+
+## Engines
+
+### `julia`
+
+- ([#10225](https://github.com/quarto-dev/quarto-cli/issues/10225)): Handle API change in is_manifest_current in Julia 1.11
 
 ## Other Fixes and Improvements
 

package/launcher/src/main.rs

@@ -82,6 +82,7 @@ fn main() {
 
     // Define the base deno options
     let mut deno_options: Vec<String> = vec![
+        String::from("--unstable-kv"),
         String::from("--unstable-ffi"),
         String::from("--no-config"),
         String::from("--cached-only"),

package/scripts/common/quarto

@@ -169,7 +169,7 @@ fi
 export DENO_TLS_CA_STORE=system,mozilla
 export DENO_NO_UPDATE_CHECK=1
 # Be sure to include any already defined QUARTO_DENO_OPTIONS
-QUARTO_DENO_OPTIONS="--unstable-ffi --no-config ${QUARTO_CACHE_OPTIONS} --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
+QUARTO_DENO_OPTIONS="--unstable-ffi --unstable-kv --no-config ${QUARTO_CACHE_OPTIONS} --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
 
 # --enable-experimental-regexp-engine is required for /regex/l, https://github.com/quarto-dev/quarto-cli/issues/9737
 if [ "$QUARTO_DENO_V8_OPTIONS" != "" ]; then

package/scripts/windows/quarto.cmd

@@ -99,7 +99,7 @@ IF NOT DEFINED QUARTO_DENO (
 
 SET "DENO_TLS_CA_STORE=system,mozilla"
 SET "DENO_NO_UPDATE_CHECK=1"
-SET "QUARTO_DENO_OPTIONS=--unstable-ffi --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi"
+SET "QUARTO_DENO_OPTIONS=--unstable-kv --unstable-ffi --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi"
 
 REM Add expected V8 options to QUARTO_DENO_V8_OPTIONS
 IF DEFINED QUARTO_DENO_V8_OPTIONS (

package/src/quarto-bld

@@ -17,4 +17,4 @@ export DENO_NO_UPDATE_CHECK=1
 
 # TODO: Consider generating a source map or something to get a good stack
 # Create the Deno bundle
-"$QUARTO_DENO" run --unstable-ffi --allow-env --allow-read --allow-write --allow-run --allow-net --allow-ffi --v8-flags=--stack-trace-limit=100 --importmap="${SCRIPT_PATH}/../../src/dev_import_map.json" "$SCRIPT_PATH/bld.ts" $@
+"$QUARTO_DENO" run --unstable-kv --unstable-ffi --allow-env --allow-read --allow-write --allow-run --allow-net --allow-ffi --v8-flags=--stack-trace-limit=100 --importmap="${SCRIPT_PATH}/../../src/dev_import_map.json" "$SCRIPT_PATH/bld.ts" $@

package/src/quarto-bld.cmd

@@ -9,4 +9,4 @@ if NOT DEFINED QUARTO_DENO (
 SET "RUST_BACKTRACE=full"
 SET "DENO_NO_UPDATE_CHECK=1"
 
-"%QUARTO_DENO%" run --unstable-ffi --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi --importmap=%~dp0\..\..\src\dev_import_map.json %~dp0\bld.ts %*
+"%QUARTO_DENO%" run --unstable-kv --unstable-ffi --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi --importmap=%~dp0\..\..\src\dev_import_map.json %~dp0\bld.ts %*

package/src/util/deno.ts

@@ -20,6 +20,7 @@ export async function bundle(
   }
   denoBundleCmd.push(denoExecPath);
   denoBundleCmd.push("bundle");
+  denoBundleCmd.push("--unstable-kv");
   denoBundleCmd.push("--unstable-ffi");
   denoBundleCmd.push(
     "--importmap=" + configuration.importmap,
@@ -54,6 +55,7 @@ export async function compile(
   }
   denoBundleCmd.push(denoExecPath);
   denoBundleCmd.push("compile");
+  denoBundleCmd.push("--unstable-kv");
   denoBundleCmd.push("--unstable-ffi");
   denoBundleCmd.push(
     "--importmap=" + configuration.importmap,
@@ -85,6 +87,7 @@ export async function install(
   }
   denoBundleCmd.push(denoExecPath);
   denoBundleCmd.push("install");
+  denoBundleCmd.push("--unstable-kv");
   denoBundleCmd.push("--unstable-ffi");
   denoBundleCmd.push(
     "--importmap=" + configuration.importmap,

src/core/run/deno.ts

@@ -44,6 +44,7 @@ export const denoRunHandler: RunHandler = {
           importMap,
           "--cached-only",
           "--allow-all",
+          "--unstable-kv",
           "--unstable-ffi",
           script,
           ...args,

src/core/sass.ts

@@ -15,9 +15,7 @@ import { dartCompile } from "./dart-sass.ts";
 
 import * as ld from "./lodash.ts";
 import { lines } from "./text.ts";
-import { md5Hash } from "./hash.ts";
-import { debug } from "../deno_ral/log.ts";
-import { safeExistsSync } from "./path.ts";
+import { sassCache } from "./sass/cache.ts";
 
 export interface SassVariable {
   name: string;
@@ -300,10 +298,6 @@ export async function compileWithCache(
   cacheIdentifier?: string,
 ) {
   if (cacheIdentifier) {
-    // Calculate a hash for the input and identifier
-    const identifierHash = md5Hash(cacheIdentifier);
-    const inputHash = md5Hash(input);
-
     // If there are imports, the computed input Hash is incorrect
     // so we should be using a session cache which will cache
     // across renders, but not persistently
@@ -313,50 +307,8 @@ export async function compileWithCache(
     const cacheDir = useSessionCache
       ? join(temp.baseDir, "sass")
       : quartoCacheDir("sass");
-    const cacheIdxPath = join(cacheDir, "index.json");
-
-    const outputFile = `${identifierHash}.css`;
-    const outputFilePath = join(cacheDir, outputFile);
-
-    // Check whether we can use a cached file
-    let cacheIndex: { [key: string]: { key: string; hash: string } } = {};
-    let writeCache = true;
-    if (existsSync(outputFilePath)) {
-      try {
-        cacheIndex = JSON.parse(Deno.readTextFileSync(cacheIdxPath));
-        const existingEntry = cacheIndex[identifierHash];
-        writeCache = !existingEntry || (existingEntry.hash !== inputHash);
-      } catch {
-        debug(`The scss cache index file ${cacheIdxPath} can't be read.`);
-      }
-    }
-
-    // We need to refresh the cache
-    if (writeCache) {
-      try {
-        await dartCompile(
-          input,
-          outputFilePath,
-          temp,
-          loadPaths,
-          compressed,
-        );
-      } catch (error) {
-        // Compilation failed, so clear out the output file (if exists)
-        // which will be invalid CSS
-        try {
-          if (safeExistsSync(outputFilePath)) {
-            Deno.removeSync(outputFilePath);
-          }
-        } finally {
-          //doesn't matter
-        }
-        throw error;
-      }
-      cacheIndex[identifierHash] = { key: cacheIdentifier, hash: inputHash };
-      Deno.writeTextFileSync(cacheIdxPath, JSON.stringify(cacheIndex));
-    }
-    return outputFilePath;
+    const cache = await sassCache(cacheDir);
+    return cache.getOrSet(input, loadPaths, temp, cacheIdentifier, compressed);
   } else {
     const outputFilePath = temp.createFile({ suffix: ".css" });
     // Skip the cache and just compile