Merge pull request #52 from mfisher87/1.5.55

1.5.55

conda-forge.yml

@@ -9,4 +9,9 @@ github:
 test: native_and_emulated
 bot:
   version_updates:
-    skip: True
+    # Quarto uses the "pre-release" marker in GitHub to differentiate between
+    # full releases and pre-releases instead of communicating that information
+    # in the version number like the bot expects. This setting omits GitHub
+    # pre-releases from the bot's detection mechanism.
+    # Context: https://github.com/regro/cf-scripts/issues/2642
+    sources: ["githubreleases"]

recipe/bld.bat

@@ -5,6 +5,9 @@ SET DENO_BIN_PATH=%LIBRARY_BIN%\deno.exe
 SET QUARTO_PANDOC=%LIBRARY_BIN%\pandoc.exe
 SET QUARTO_ESBUILD=%LIBRARY_BIN%\esbuild.exe
 SET QUARTO_DART_SASS=%LIBRARY_BIN%\sass.exe
+:: IMPORTANT: With Typst 0.11.1, the executable moves to %LIBRARY_BIN%. This
+:: change will be required with Quarto 1.6.
+SET QUARTO_TYPST=%PREFIX%\bin\typst.exe
 
 :: Alter the configuration file with a dynamic value containing the full
 :: package version (e.g. 1.3.340). The only thing allowed in this file is
@@ -41,6 +44,9 @@ MKDIR %PREFIX%\etc\conda\activate.d
   echo SET "QUARTO_PANDOC=%LIBRARY_BIN:\=/%\pandoc.exe"
   echo SET "QUARTO_ESBUILD=%LIBRARY_BIN:\=/%\esbuild.exe"
   echo SET "QUARTO_DART_SASS=%LIBRARY_BIN:\=/%\sass.bat"
+  :: IMPORTANT: With Typst 0.11.1, the executable moves to %LIBRARY_BIN%. This
+  :: change will be required with Quarto 1.6.
+  echo SET "QUARTO_TYPST=%PREFIX:\=/%\bin\typst.exe"
   echo SET "QUARTO_SHARE_PATH=%LIBRARY_PREFIX:\=/%\share\quarto"
   echo SET "QUARTO_CONDA_PREFIX=%LIBRARY_PREFIX:\=/%"
 ) > %PREFIX%\etc\conda\activate.d\quarto.bat
@@ -52,6 +58,7 @@ MKDIR %PREFIX%\etc\conda\deactivate.d
   echo SET QUARTO_PANDOC=
   echo SET QUARTO_ESBUILD=
   echo SET QUARTO_DART_SASS=
+  echo SET QUARTO_TYPST=
   echo SET QUARTO_SHARE_DIR=
   echo set QUARTO_CONDA_PREFIX=
 ) > %PREFIX%\etc\conda\deactivate.d\quarto.bat

recipe/build.sh

@@ -15,6 +15,7 @@ export DENO_BIN_PATH=$NATIVE_PREFIX/bin/deno
 export QUARTO_DENO_DOM=$DENO_DOM_PLUGIN
 export QUARTO_PANDOC=$NATIVE_PREFIX/bin/pandoc
 export QUARTO_ESBUILD=$NATIVE_PREFIX/bin/esbuild
+export QUARTO_TYPST=$NATIVE_PREFIX/bin/typst
 
 export QUARTO_DIST_PATH=$PREFIX
 
@@ -41,6 +42,7 @@ mkdir -p $PREFIX/etc/conda/activate.d
   export QUARTO_DENO_DOM=$DENO_DOM_PLUGIN
   export QUARTO_PANDOC=$PREFIX/bin/pandoc
   export QUARTO_ESBUILD=$PREFIX/bin/esbuild
+  export QUARTO_TYPST=$PREFIX/bin/typst
   export QUARTO_DART_SASS=$PREFIX/bin/sass
   export QUARTO_SHARE_PATH=$PREFIX/share/quarto
   export QUARTO_CONDA_PREFIX=$PREFIX
@@ -53,6 +55,7 @@ mkdir -p $PREFIX/etc/conda/deactivate.d
   unset QUARTO_DENO_DOM
   unset QUARTO_PANDOC
   unset QUARTO_ESBUILD
+  unset QUARTO_TYPST
   unset QUARTO_DART_SASS
   unset QUARTO_SHARE_PATH
   unset QUARTO_CONDA_PREFIX

recipe/meta.yaml

@@ -1,9 +1,10 @@
-{% set version = "1.4.557" %}
-{% set sha256 = "d763346011f8a8034308d1f3d805c9a80049aa20893f7358778aac8bbea41778" %}
+{% set version = "1.5.55" %}
+{% set sha256 = "01409348fdb2f88db64862ee5165defdf79610c3a61d5d46b871d4c5c2247587" %}
 {% set build_number = 0 %}
 {% set deno_version = load_file_regex(load_file='configuration', regex_pattern='export\sDENO=v(\S+)') %}
 {% set deno_dom_version = load_file_regex(load_file='configuration', regex_pattern='export DENO_DOM=v([^-]+)') %}
 {% set pandoc_version = load_file_regex(load_file='configuration', regex_pattern='export PANDOC=(\S+)') %}
+{% set typst_version = load_file_regex(load_file='configuration', regex_pattern='export TYPST=(\S+)') %}
 
 package:
   name: quarto
@@ -26,6 +27,7 @@ requirements:
     - deno-dom  {{ deno_dom_version.group(1) if deno_dom_version else "" }}
     - esbuild
     - pandoc    {{ pandoc_version.group(1) if pandoc_version else "" }}
+    - typst     {{ typst_version.group(1) if typst_version else "" }}
   run:
     # Deno, deno-dom and pandoc have proven to be fickle
     #    regarding Quarto's source code. The pinning here
@@ -37,6 +39,7 @@ requirements:
     # we vendor deno-dom JS dependencies, so it is important
     #  that the version at runtime matches the one at build time
     - {{ pin_compatible("deno-dom", max_pin="x.x.x") }}
+    - typst     {{ typst_version.group(1) if typst_version else "" }}
     - esbuild
     - dart-sass
 

recipe/patches/0001-remove-QUARTO_VERSION-from-configuration.patch

@@ -6,32 +6,27 @@ QUARTO_VERSION=${PKG_VERSION}`.
 
 TODO: Propose this comment change to upstream.
 diff --git a/configuration b/configuration
-index 0b6bef3..77c00a0 100644
+index 7db77dd2c..8b2e7484a 100644
 --- a/configuration
 +++ b/configuration
-@@ -1,11 +1,16 @@
- #!/bin/bash
-
--
- # This file contains the global configuration for the quarto configuration
- #
+@@ -6,6 +6,12 @@
  # The configuration is used both as a local runtime version of Quarto for developers
  # but it also used when packaging (e.g. run configure.sh, then prepare-dist.sh, then package.sh)
  # deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
 +#
 +# WARNING: The windows build process (started with `configure.cmd`) will
-+# replace the export statements with set statements to create a Windows
++# replace the `export` statements with `set` statements to create a Windows
 +# configuration. For that reason, this file should only contain `export`
 +# statements assigning static values to variables. There should be no variable
 +# expansion in the assignments, e.g. `export foo=${BAR}`.
-
+ 
  # Binary dependencies
- export DENO=v1.28.2
-@@ -44,7 +49,6 @@ export ALGOLIA_SEARCH_INSIGHTS_JS=2.0.3
-
-
+ export DENO=v1.41.0
+@@ -56,7 +62,6 @@ export ALGOLIA_SEARCH_INSIGHTS_JS=2.0.3
+ 
+ 
  # Quarto Info Version
--export QUARTO_VERSION=1.4
+-export QUARTO_VERSION=1.5
  export QUARTO_NAME=Quarto
- export QUARTO_BUILD_RUN_OFFSET=-1690
-
+
+ # Folder names. These are not the same as paths (those variable names end in _PATH).