Fix CI + GH deploy

Author: fschutt

.github/workflows/ci.yaml

@@ -35,17 +35,7 @@ jobs:
         uses: egor-tensin/setup-mingw@v2
         with:
           platform: "${{ contains(matrix.target-sys, 'x86_64') && 'x64' || 'i686' }}"
-          version: 12.2.0
-      - name: Uninstall MinGW if installed
-        if: ${{ matrix.target-abi == 'gnu' }}
-        shell: pwsh
-        run: |
-          if (choco list --local-only | Select-String "mingw") {
-            choco uninstall mingw -y
-          } else {
-            Write-Output "mingw is not installed"
-            exit 0
-          }
+          version: 13.2.0
       - name: Install toolchain for ${{ matrix.target-sys }}-${{ matrix.target-abi }}
         uses: dtolnay/rust-toolchain@stable
         with:

build.rs

@@ -0,0 +1,5 @@
+pub fn main() {
+    if std::env::var("TARGET").expect("Unable to get TARGET").contains("wasm") {
+        println!("cargo:rustc-cfg=feature=\"wasm\"");
+    }
+}

src/lib.rs

@@ -4,7 +4,6 @@ use std::collections::BTreeMap;
 
 use serde_derive::{Deserialize, Serialize};
 
-// #[cfg(target_family = "wasm")]
 /// Link / bookmark annotation handling
 pub mod annotation;
 pub mod wasm;

src/utils.rs

@@ -70,13 +70,13 @@ pub(crate) fn to_pdf_time_stamp_metadata(date: &OffsetDateTime) -> String {
     )
 }
 
-#[cfg(target_arch = "wasm")]
+#[cfg(target_family = "wasm")]
 pub(crate) fn to_pdf_xmp_date(_date: &OffsetDateTime) -> String {
     "D:1970-01-01T00:00:00+00'00'".to_string()
 }
 
 // D:2018-09-19T10:05:05+00'00'
-#[cfg(not(target_arch = "wasm"))]
+#[cfg(not(target_family = "wasm"))]
 pub(crate) fn to_pdf_xmp_date(date: &OffsetDateTime) -> String {
     // Since the time is in UTC, we know that the time zone
     // difference to UTC is 0 min, 0 sec, hence the 00'00

src/wasm.rs

@@ -75,7 +75,7 @@ pub struct PrintPdfApiReturn<T: serde::Serialize> {
 /// Data or error of the output of the function.
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 #[serde(untagged)]
-enum StatusOrData<T: serde::Serialize> {
+pub enum StatusOrData<T: serde::Serialize> {
     Ok(T),
     Error(String),
 }
@@ -99,7 +99,7 @@ enum StatusOrData<T: serde::Serialize> {
 /// // }
 /// ```
 #[allow(non_snake_case)]
-#[cfg_attr(feature = "wasm", wasm_bindgen::prelude::wasm_bindgen)]
+#[cfg_attr(target_family = "wasm", wasm_bindgen::prelude::wasm_bindgen)]
 pub fn Pdf_HtmlToPdfDocument(input: String) -> String {
     let input = match serde_json::from_str::<PrintPdfHtmlInput>(&input) {
         Ok(o) => o,
@@ -197,9 +197,8 @@ pub struct PrintPdfParseOutput {
 /// //    }
 /// // }
 /// ```
-#[cfg(feature = "wasm")]
 #[allow(non_snake_case)]
-#[wasm_bindgen::prelude::wasm_bindgen]
+#[cfg_attr(target_family = "wasm", wasm_bindgen::prelude::wasm_bindgen)]
 pub fn Pdf_BytesToPdfDocument(input: String) -> String {
     let input = match serde_json::from_str::<PrintPdfParseInput>(&input) {
         Ok(o) => o,
@@ -269,9 +268,8 @@ pub struct PrintPdfPageGetResourcesOutput {
 /// Helper function that takes a PDF page and outputs a list of all
 /// images IDs / fonts IDs that have to be gathered from the documents
 /// resources in order to render this page.
-#[cfg(feature = "wasm")]
 #[allow(non_snake_case)]
-#[wasm_bindgen::prelude::wasm_bindgen]
+#[cfg_attr(target_family = "wasm", wasm_bindgen::prelude::wasm_bindgen)]
 pub fn Pdf_GetResourcesForPage(input: String) -> String {
     let input = match serde_json::from_str::<PrintPdfPageGetResourcesInput>(&input) {
         Ok(o) => o,
@@ -316,9 +314,8 @@ pub struct PrintPdfPageToSvgOutput {
 }
 
 /// Takes a `PdfPage` JS object and outputs the SVG string for that page
-#[cfg(feature = "wasm")]
 #[allow(non_snake_case)]
-#[wasm_bindgen::prelude::wasm_bindgen]
+#[cfg_attr(target_family = "wasm", wasm_bindgen::prelude::wasm_bindgen)]
 pub fn Pdf_PdfPageToSvg(input: String) -> String {
     let input = match serde_json::from_str::<PrintPdfPageToSvgInput>(&input) {
         Ok(o) => o,
@@ -356,9 +353,8 @@ pub struct PrintPdfToBytesOutput {
 }
 
 /// Takes a `PdfDocument` JS object and returns the base64 PDF bytes
-#[cfg(feature = "wasm")]
 #[allow(non_snake_case)]
-#[wasm_bindgen::prelude::wasm_bindgen]
+#[cfg_attr(target_family = "wasm", wasm_bindgen::prelude::wasm_bindgen)]
 pub fn Pdf_PdfDocumentToBytes(input: String) -> String {
     let input = match serde_json::from_str::<PrintPdfToBytesInput>(&input) {
         Ok(o) => o,