Merge branch 'main' into feat/multiple-categories-selection

Author: mcanouil

.air.toml

@@ -5,4 +5,4 @@ indent-style = "space"
 line-ending = "auto"
 persistent-line-breaks = true
 exclude = []
-default-exclude = true
+default-exclude = true

.github/workflows/actions/quarto-dev/action.yml

@@ -8,10 +8,9 @@ runs:
       uses: actions/cache@v4
       with:
         path: ./src/resources/deno_std/cache
-        key: ${{ runner.os }}-deno_std-1-${{ hashFiles('./src/resources/deno_std/deno_std.lock', './package/scripts/deno_std/deno_std.ts') }}
+        key: ${{ runner.os }}-deno_std-2-${{ hashFiles('./src/resources/deno_std/deno_std.lock', './package/scripts/deno_std/deno_std.ts') }}
         restore-keys: |
-          ${{ runner.os }}-deno_std-1-
-          ${{ runner.os }}-deno_std-
+          ${{ runner.os }}-deno_std-2-
 
     - name: Configure Quarto (.sh)
       if: runner.os != 'Windows'

.github/workflows/create-release.yml

@@ -193,10 +193,10 @@ jobs:
 
           source ./configuration
 
-          echo Placing custom Deno ${DENO:1}. See available versions at https://anaconda.org/conda-forge/deno/files
-          curl -L https://anaconda.org/conda-forge/deno/${DENO:1}/download/linux-64/deno-${DENO:1}-hcab8b69_0.conda --output deno.conda
+          echo Placing custom Deno ${DENO:1}. See available versions at https://anaconda.org/conda-forge/deno/files hbf66b88_0
+          curl -L https://anaconda.org/conda-forge/deno/${DENO:1}/download/linux-64/deno-${DENO:1}-hbf66b88_0.conda --output deno.conda
           unzip deno.conda
-          tar --use-compress-program=unzstd -xvf pkg-deno-${DENO:1}-hcab8b69_0.tar.zst
+          tar --use-compress-program=unzstd -xvf pkg-deno-${DENO:1}-hbf66b88_0.tar.zst
           cp bin/deno package/pkg-working/bin/tools/x86_64/deno
 
       - name: Make Tarball

.ruff.toml

@@ -0,0 +1,14 @@
+extend-exclude = [
+  "**/renv",
+  "**/.venv",
+  ".github",
+  ".vscode",
+  "**/node_modules",
+  "**/__pycache__",
+  "**/build",
+  # file with cell magic not parsed by ruff
+  "src/resources/jupyter/lang/python/cleanup.py",
+  "src/resources/jupyter/lang/python/setup.py",
+]
+# don't format .ipynb files as quarto cell comment 
+include = ["**/*.py"]

.vscode/extensions.json

@@ -4,6 +4,8 @@
     "esbenp.prettier-vscode",
     "sumneko.lua",
     "nvarner.typst-lsp",
-    "Posit.air-vscode"
+    "Posit.air-vscode",
+    "charliermarsh.ruff",
+    "tamasfe.even-better-toml"
   ]
 }

.vscode/settings.json

@@ -2,6 +2,18 @@
   "[typescript]": {
     "editor.defaultFormatter": "denoland.vscode-deno"
   },
+  "notebook.formatOnSave.enabled": false,
+  "notebook.codeActionsOnSave": {
+    "notebook.source.organizeImports": "explicit"
+  },
+  "pylint.enabled": false,
+  "[python]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "charliermarsh.ruff",
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit"
+    }
+  },
   "[r]": {
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "Posit.air-vscode"
@@ -13,6 +25,10 @@
   "[html]": {
     "editor.formatOnSave": false
   },
+  "[toml]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "tamasfe.even-better-toml"
+  },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "editor.tabSize": 2,

configuration

@@ -11,7 +11,7 @@
 # in src/command/check/check.ts
 
 # Binary dependencies
-export DENO=v1.46.3
+export DENO=v2.3.1
 # TODO figure out where 0.1.41 apple silicon libs are available
 export DENO_DOM=v0.1.41-alpha-artifacts
 export PANDOC=3.6.3

configure.cmd

@@ -69,30 +69,14 @@ echo Configuration done
 
 POPD
 
-if "%CI%" NEQ "true" (
-	echo Revendoring quarto dependencies
-
-  @REM for /F "tokens=2" %%i in ('date /t') do set today=%%i
-	@REM RENAME src\vendor src\vendor-%today%
-	@REM pushd src
-  @REM echo Vendor phase 1
-	@REM %QUARTO_DENO% vendor quarto.ts %QUARTO_ROOT%\tests\test-deps.ts --importmap=import_map.json
-	@REM if ERRORLEVEL NEQ 0 (
-	@REM   popd
-	@REM   echo deno vendor failed (likely because of a download error). Please run the configure script again.
-	@REM 	RMDIR vendor
-	@REM 	RENAME vendor-${today} vendor
-	@REM 	exit 1
-  @REM )
-	@REM popd
-	@REM %QUARTO_DENO% run --unstable --allow-all --importmap=src\import_map.json package\src\common\create-dev-import-map.ts
-)
+REM download typescript dependencies
+CALL package\scripts\vendoring\vendor.cmd
 
 ECHO Downloading Deno Stdlib
 CALL !QUARTO_PACKAGE_PATH!\scripts\deno_std\download.bat
 
-SET QUARTO_DENO_EXTRA_OPTIONS="--reload"
 IF EXIST !QUARTO_BIN_PATH!\quarto.cmd (
+  SET QUARTO_DENO_EXTRA_OPTIONS=--reload
   CALL "!QUARTO_BIN_PATH!\quarto" --version
 )
 

configure.sh

@@ -29,51 +29,58 @@ function download() {
 
 QUARTO_VENDOR_BINARIES=${QUARTO_VENDOR_BINARIES=true}
 
-DENO_BIN=${QUARTO_DENO=$QUARTO_BIN_PATH/tools/$DENO_DIR/deno}
+DENO_BIN=${QUARTO_DENO=$QUARTO_BIN_PATH/tools/$DENO_ARCH_DIR/deno}
 
 if [[ "${QUARTO_VENDOR_BINARIES}" = "true" ]]; then
-  DENO_VERSION_NO_V=$(echo $DENO | sed 's/v//')
-  if [[ (! -f "$DENO_BIN") || $("$DENO_BIN" --version | grep $DENO_VERSION_NO_V) == "" ]]; then
+  DENO_VERSION_NO_V=$(echo "$DENO" | sed 's/v//')
+  if [[ (! -f "$DENO_BIN") || $("$DENO_BIN" --version | grep "$DENO_VERSION_NO_V") == "" ]]; then
     # Ensure directory is there for Deno
     echo "Bootstrapping Deno..."
 
-    rm -rf $QUARTO_DIST_PATH
+    rm -rf "$QUARTO_DIST_PATH"
 
     ## Binary Directory
     mkdir -p "$QUARTO_BIN_PATH/tools"
-    cd $QUARTO_BIN_PATH/tools
+    pushd "$QUARTO_BIN_PATH/tools"
 
     # Download Deno
     for DENOFILE in $DENOFILES; do
       download "$DENOURL/$DENO/$DENOFILE" "$DENOFILE"
-      unzip -o $DENOFILE
-      
-      mkdir -p $DENO_DIR
-      mv deno $DENO_DIR
-      rm $DENOFILE
+      unzip -o "$DENOFILE"
+      mkdir -p "$DENO_ARCH_DIR"
+      mv deno "$DENO_ARCH_DIR"
+      rm "$DENOFILE"
     done
 
     # we create a symlink here so that we need only one quarto-cli.code-workspace file
-    ln -s $DENO_DIR/deno deno
+    ln -s $DENO_ARCH_DIR/deno deno
 
     # If a canary commit is provided, upgrade to that
-    if [ ! -z "$DENO_CANARY_COMMIT" ]; then
+    if [ -n "$DENO_CANARY_COMMIT" ]; then
       echo [Upgrading Deno to Canary]
-      ./deno upgrade --canary --version $DENO_CANARY_COMMIT
+      ./deno upgrade --canary --version "$DENO_CANARY_COMMIT"
     fi
 
     # write deno version file for later use
-    mkdir -p $QUARTO_BIN_PATH/../config
-    echo $DENO > $QUARTO_BIN_PATH/../config/deno-version
+    mkdir -p "$QUARTO_BIN_PATH/../config"
+    echo "$DENO" > "$QUARTO_BIN_PATH/../config/deno-version"
+
+    popd
   fi
-  export DENO_BIN_PATH=$QUARTO_BIN_PATH/tools/$DENO_DIR/deno
+  export DENO_BIN_PATH=$QUARTO_BIN_PATH/tools/$DENO_ARCH_DIR/deno
 else
   if [ -z "$DENO_BIN_PATH" ]; then
     echo "DENO_BIN_PATH is not set. You either need to allow QUARTO_VENDOR_BINARIES or set DENO_BIN_PATH to the path of a deno binary."
     exit 1
   fi
 fi
 
+if [ "$QUARTO_DENO_DIR" == "" ]; then
+  export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
+else
+  export DENO_DIR=$QUARTO_DENO_DIR
+fi
+
 echo "Downloading Deno Stdlib"
 "${QUARTO_PACKAGE_PATH}/scripts/deno_std/download.sh"
 
@@ -82,6 +89,11 @@ pushd "$QUARTO_PACKAGE_PATH/src/"
 # Run the configure command to bootstrap installation
 ./quarto-bld configure --log-level info
 
+popd
+
+# download typescript dependencies
+source package/scripts/vendoring/vendor.sh
+
 # Run the quarto command with 'reload', which will force the import_map dependencies
 # to be reloaded
 if ! quarto_loc="$(type -p quarto)" || [[ -z $quarto_loc ]]; then

dev-docs/add-typescript-dependency.md

@@ -10,4 +10,4 @@ We vendor all external dependencies to avoid downloads during the execution of q
 
 - If the dependency is meant to be exposed to quarto typescript script (through `quarto run`), then add the import to `package/scripts/deno_std/deno_std.ts` as well (notice the slightly different syntax there, and adapt accordingly).
 
-Then, run the `./package/scripts/vendoring/vendor.sh` scripts to update the vendored dependencies. This script will update `src/dev_import_map.json`, as well as files in `src/vendor`, `src/resources/deno_std`, and `src/resources/vendor`. Check those changes in version control.
+Then, rerun `./configure.sh`, which calls the `./package/scripts/vendoring/vendor.sh` scripts to update the deno cache with the downloaded dependencies.