turn on cached-only for dev as well, add puppeteer deps to cache

Author: cscheid

package/scripts/common/quarto

@@ -33,6 +33,8 @@ else
 fi
 QUARTO_SRC_PATH="$QUARTO_ROOT/src"
 DEV_PATH=$QUARTO_SRC_PATH/quarto.ts
+QUARTO_IMPORT_MAP_ARG=--importmap=$QUARTO_SRC_PATH/import_map.json
+
 if [ -f "$DEV_PATH" ]; then
   if [ "$1" == "--version" ] || [ "$1" == "-v" ]; then
     if [ "$QUARTO_FORCE_VERSION" != "" ]; then
@@ -48,9 +50,6 @@ if [ -f "$DEV_PATH" ]; then
     QUARTO_ACTION=run
   fi
 
-  # Local import map
-  QUARTO_IMPORT_MAP_ARG=--importmap=$QUARTO_SRC_PATH/import_map.json
-
   # Turn on type checking for dev version
   if [ -z ${QUARTO_NO_TYPECHECK+x} ]; then
     QUARTO_DENO_OPTIONS=--check
@@ -63,10 +62,12 @@ if [ -f "$DEV_PATH" ]; then
 
   export QUARTO_BIN_PATH=$SCRIPT_PATH
   export QUARTO_SHARE_PATH="${QUARTO_SHARE_PATH=$QUARTO_SRC_PATH/resources/}"
+  export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
+
   if [ -z ${QUARTO_DEBUG+x} ]; then
     export QUARTO_DEBUG=true
   fi
-  # QUARTO_CACHE_OPTIONS="--cached-only"
+  QUARTO_CACHE_OPTIONS="--cached-only"
 
   # Check for deno update
   QUARTO_DIST_CONFIG=$QUARTO_BIN_PATH/../config
@@ -91,7 +92,8 @@ else
   QUARTO_ACTION=run
   QUARTO_TARGET=${SCRIPT_PATH}/quarto.js
   export QUARTO_BIN_PATH=$SCRIPT_PATH
-  QUARTO_CACHE_OPTIONS=""
+  export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
+  QUARTO_CACHE_OPTIONS="--cached-only"
 
   # Turn off type checking for bundled version
   QUARTO_DENO_OPTIONS=--no-check
@@ -108,9 +110,6 @@ else
     fi
   fi
 
-  # release vendored import map
-  QUARTO_IMPORT_MAP_ARG=--importmap=$SCRIPT_PATH/vendor/import_map.json
-
   if [ "$1" == "--version" ] || [ "$1" == "-v" ]; then
     if [ "$QUARTO_FORCE_VERSION" != "" ]; then
       echo $QUARTO_FORCE_VERSION

package/scripts/vendoring/vendor.sh

@@ -27,15 +27,20 @@ else
     exit 1
   fi
 fi
+export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
 
 echo Revendoring quarto dependencies
 
+# remove deno_cache directory first
+if [ -d "$DENO_DIR" ]; then
+  rm -rf $DENO_DIR
+fi
+
 pushd ${QUARTO_SRC_PATH}
-today=`date +%Y-%m-%d`
-mv vendor vendor-${today}
 set +e
-$DENO_BIN_PATH install --vendor --no-config quarto.ts $QUARTO_ROOT/src/vendor_deps.ts $QUARTO_ROOT/tests/test-deps.ts $QUARTO_ROOT/package/scripts/deno_std/deno_std.ts --importmap=$QUARTO_SRC_PATH/import_map.json
-# FINISHME We need to move the vendor directory from .. to ./ after this is run.
+for entrypoint in quarto.ts vendor_deps.ts ../tests/test-deps.ts ../package/scripts/deno_std/deno_std.ts; do
+  $DENO_BIN_PATH install --allow-all --no-config --entrypoint $entrypoint $QUARTO_ROOT/package/scripts/deno_std/deno_std.ts --importmap=$QUARTO_SRC_PATH/import_map.json
+done
 return_code="$?"
 set -e
 if [[ ${return_code} -ne 0 ]]; then
@@ -46,6 +51,5 @@ if [[ ${return_code} -ne 0 ]]; then
 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/command/render/pandoc.ts

@@ -196,7 +196,7 @@ import {
   createMarkdownPipeline,
   MarkdownPipelineHandler,
 } from "../../core/markdown-pipeline.ts";
-import { getEnv } from "../../../package/src/util/utils.ts";
+import { getenv } from "../../core/env.ts";
 import {
   BrandFontBunny,
   BrandFontFile,
@@ -351,7 +351,7 @@ export async function runPandoc(
     // load the system lua libraries, which may not be compatible with
     // the lua version we are using
     if (Deno.env.get("QUARTO_LUA_CPATH") !== undefined) {
-      pandocEnv["LUA_CPATH"] = getEnv("QUARTO_LUA_CPATH");
+      pandocEnv["LUA_CPATH"] = getenv("QUARTO_LUA_CPATH");
     } else {
       pandocEnv["LUA_CPATH"] = "";
     }

src/core/log.ts

@@ -156,7 +156,7 @@ export class StdErrOutputHandler extends BaseHandler {
 
     return msg;
   }
-  log(msg: string): void {
+  override log(msg: string): void {
     const encoder = new TextEncoder();
     const data = encoder.encode(msg);
 

src/import_map.json

@@ -13,9 +13,10 @@
     "fmt/": "jsr:/@std/fmt@^0.224.0/",
     "fs/": "jsr:/@std/fs@^0.224.0/",
     "http/": "jsr:/@std/http@^0.224.0/",
-    "io/": "jsr:/@std/io@^0.224.0/",
-    "log": "jsr:/@std/log@^0.224.0",
-    "log/": "jsr:/@std/log@^0.224.0/",
+    "io": "jsr:/@std/io@0.224.0",
+    "io/": "jsr:/@std/io@0.224.0/",
+    "log": "jsr:/@std/log@0.224.0",
+    "log/": "jsr:/@std/log@0.224.0/",
     "node/": "jsr:/@std/node@^0.224.0/",
     "path": "jsr:@std/path@^0.224.0",
     "permissions/": "jsr:/@std/permissions@^0.224.0/",

src/vendor_deps.ts

@@ -9,3 +9,4 @@ This is only used by vendor.sh and should not be imported by any other code.
 
 // for puppeteer
 import { dirname, join, SEP } from "https://deno.land/std@0.93.0/path/mod.ts";
+import puppeteer from "https://deno.land/x/puppeteer@9.0.2/mod.ts";