Merge remote-tracking branch 'origin/main' into feature/enable-quarto-pub

Author: jjallaire

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -28,11 +28,23 @@ body:
     attributes:
       label: "`quarto check` Output"
       description: Paste the output of `quarto check`.
+      placeholder: |
+        Place the result in code block syntax for better readability
+
+        ```bash
+        <insert quarto check result here>
+        ```
 
   - type: textarea
     attributes:
       label: "`quarto tools check` Output"
       description: Paste the output of `quarto tools check`.
+      placeholder: |
+        Place the result in code block syntax for better readability
+
+        ```bash
+        <insert quarto tools check result here>
+        ```
 
   - type: checkboxes
     attributes:

configuration

@@ -42,9 +42,9 @@ export ALGOLIA_SEARCH_INSIGHTS_JS=2.0.3
 
 
 # Quarto Info Version
-export QUARTO_VERSION=0.9
+export QUARTO_VERSION=1.0
 export QUARTO_NAME=Quarto
-export QUARTO_BUILD_RUN_OFFSET=-594
+export QUARTO_BUILD_RUN_OFFSET=-1252
 
 # Configuration Target Directories
 export QUARTO_PACKAGE_DIR=package

src/command/render/pandoc.ts

@@ -177,7 +177,7 @@ export async function runPandoc(
   const cwd = dirname(options.source);
 
   // build the pandoc command (we'll feed it the input on stdin)
-  const cmd = [pandocBinaryPath()];
+  const cmd = [pandocBinaryPath(), "+RTS", "-K512m", "-RTS"];
 
   // build command line args
   const args = [...options.args];

src/command/render/project.ts

@@ -294,6 +294,12 @@ export async function renderProject(
         renderedFile.supporting = renderedFile.supporting.filter((file) =>
           file !== libDir
         );
+        // ensure that we don't have overlapping paths in supporting
+        renderedFile.supporting = renderedFile.supporting.filter((file) => {
+          return !renderedFile.supporting!.some((dir) =>
+            file.startsWith(dir) && file !== dir
+          );
+        });
         if (keepFiles) {
           renderedFile.supporting.map((file) => copyDir(file));
         } else {

src/command/use/cmd.ts

@@ -4,7 +4,7 @@
 * Copyright (C) 2021 by RStudio, PBC
 *
 */
-import { Command } from "cliffy/command/mod.ts";
+import { Command, ValidationError } from "cliffy/command/mod.ts";
 
 import { useTemplateCommand } from "./commands/template.ts";
 
@@ -19,4 +19,11 @@ export const useCommand = new Command()
   .description(
     "Automate document or project setup tasks.",
   )
+  .action((_options, type, _target) => {
+    if (type !== useTemplateCommand.getName()) {
+      throw new ValidationError(
+        `Unknown type '${type}'- did you mean 'template'?`,
+      );
+    }
+  })
   .command(useTemplateCommand.getName(), useTemplateCommand);

src/command/use/commands/template.ts

@@ -10,15 +10,14 @@ import {
   extensionSource,
 } from "../../../extension/extension-host.ts";
 import { info } from "log/mod.ts";
-import { Confirm, Input, Select } from "cliffy/prompt/mod.ts";
+import { Confirm, Input } from "cliffy/prompt/mod.ts";
 import { basename, dirname, join, relative } from "path/mod.ts";
 import { ensureDir, ensureDirSync, existsSync } from "fs/mod.ts";
 import { TempContext } from "../../../core/temp-types.ts";
 import { downloadWithProgress } from "../../../core/download.ts";
 import { withSpinner } from "../../../core/console.ts";
 import { unzip } from "../../../core/zip.ts";
 import { templateFiles } from "../../../extension/template.ts";
-import { kExtensionDir } from "../../../extension/extension-shared.ts";
 import { Command } from "cliffy/command/mod.ts";
 import { initYamlIntelligenceResourcesFromFilesystem } from "../../../core/schema/utils.ts";
 import { createTempContext } from "../../../core/temp.ts";

src/core/handlers/mermaid.ts

@@ -203,7 +203,6 @@ mermaid.initialize();
           const m = defEl.innerHTML.match(/id="([^\"]+)"/);
           if (m) {
             const id = m[1];
-            console.log("Will try to patch", id);
             idsToPatch.push(id);
           }
         }
@@ -328,7 +327,6 @@ mermaid.initialize();
 
       const attrs: Record<string, unknown> = {};
       if (isRevealjsOutput(handlerContext.options.context.format.pandoc)) {
-        console.log("Setting reveal to true");
         attrs.reveal = true;
       }
 

src/project/types/book/book-config.ts

@@ -239,9 +239,7 @@ function siteRepoUrl(site: Metadata) {
   const branch = site[kSiteRepoBranch] || "main";
   if (site[kSiteRepoSubdir]) {
     const subdir = ensureTrailingSlash(site[kSiteRepoSubdir] as string);
-    return pathWithForwardSlashes(
-      join(repoUrl, `tree/${branch}/${subdir}`),
-    );
+    return `${ensureTrailingSlash(repoUrl)}tree/${branch}/${subdir}`;
   } else {
     return repoUrl;
   }

src/publish/common/publish.ts

@@ -66,6 +66,7 @@ export interface PublishHandler<
   createDeploy: (
     siteId: string,
     files: Record<string, string>,
+    size: number,
   ) => Promise<Deploy>;
   getDeploy: (deployId: string) => Promise<Deploy>;
   uploadDeployFile: (
@@ -132,12 +133,12 @@ export async function handlePublish<
     message: `Preparing to publish ${type}`,
   }, async () => {
     const textDecoder = new TextDecoder();
+    let size = 0;
     for (const file of publishFiles.files) {
       const filePath = publishFilePath(file);
-      const sha1 = await crypto.subtle.digest(
-        "SHA-1",
-        Deno.readFileSync(filePath),
-      );
+      const fileBuffer = Deno.readFileSync(filePath);
+      size = size + fileBuffer.byteLength;
+      const sha1 = await crypto.subtle.digest("SHA-1", fileBuffer);
       const encodedSha1 = hexEncode(new Uint8Array(sha1));
       files.push([file, textDecoder.decode(encodedSha1)]);
     }
@@ -149,7 +150,11 @@ export async function handlePublish<
     for (const file of files) {
       deploy.files[`/${file[0]}`] = file[1];
     }
-    siteDeploy = await handler.createDeploy(target!.id, deploy.files);
+    siteDeploy = await handler.createDeploy(
+      target!.id,
+      deploy.files,
+      size,
+    );
 
     // wait for it to be ready
     while (true) {