Merge pull request #569 from thoth-pub/feature/568_build_wasm_from_cargo

Feature/568 build wasm from cargo
thoth-pub · Feb 29, 2024 · cec4dff · cec4dff
2 parents 83b5b6b + 8477140
commit cec4dff
Show file tree

Hide file tree

Showing 26 changed files with 528 additions and 866 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -4,7 +4,8 @@
 .github
 .gitignore
 db/
-target/
+**/target/
+**/pkg/
 LICENSE
 README.md
 Dockerfile
@@ -13,3 +14,4 @@ Makefile
 docker-compose.yml
 docker-compose.dev.yml
 CHANGELOG.md
+
diff --git a/.github/workflows/build_test_and_check.yml b/.github/workflows/build_test_and_check.yml
@@ -33,21 +33,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20.10.0'
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-    - uses: jetli/wasm-pack-action@v0.3.0
-      with:
-        version: 'v0.12.1'
-    - name: Install rollup
-      run: sudo npm install -g rollup@4.9.1
-    - name: Compile WASM
-      run: wasm-pack build thoth-app/ --target web --release
-    - name: Pack APP
-      run: rollup thoth-app/main.js --format iife --file thoth-app/pkg/thoth_app.js
     - name: Build binary
       uses: actions-rs/cargo@v1
       with:
@@ -57,26 +42,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20.10.0'
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-    - uses: jetli/wasm-pack-action@v0.3.0
-      with:
-        version: 'v0.12.1'
-    - name: Install rollup
-      run: sudo npm install -g rollup@4.9.1
-    - name: Compile WASM
-      run: wasm-pack build thoth-app/ --target web --release
-    - name: Pack APP
-      run: rollup thoth-app/main.js --format iife --file thoth-app/pkg/thoth_app.js
-    - name: Build binary
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: --verbose
     - name: Run tests
       uses: actions-rs/cargo@v1
       with:
@@ -86,26 +51,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20.10.0'
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-    - uses: jetli/wasm-pack-action@v0.3.0
-      with:
-        version: 'v0.12.1'
-    - name: Install rollup
-      run: sudo npm install -g rollup@4.9.1
-    - name: Compile WASM
-      run: wasm-pack build thoth-app/ --target web --release
-    - name: Pack APP
-      run: rollup thoth-app/main.js --format iife --file thoth-app/pkg/thoth_app.js
-    - name: Build binary
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: --verbose
     - name: Run linting
       uses: actions-rs/cargo@v1
       with:

diff --git a/.github/workflows/run_migrations.yml b/.github/workflows/run_migrations.yml
@@ -41,21 +41,6 @@ jobs:
           - 5432:5432
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20.10.0'
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-    - uses: jetli/wasm-pack-action@v0.3.0
-      with:
-        version: 'v0.12.1'
-    - name: Install rollup
-      run: sudo npm install -g rollup@4.9.1
-    - name: Compile WASM
-      run: wasm-pack build thoth-app/ --target web --release
-    - name: Pack APP
-      run: rollup thoth-app/main.js --format iife --file thoth-app/pkg/thoth_app.js
     - name: Build binary
       uses: actions-rs/cargo@v1
       with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,13 +6,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Changed
+  - [568](https://github.com/thoth-pub/thoth/issues/568) - Allow building `thoth-app` directly from cargo, using a build script in `thoth-app-server`
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Build `thoth-app` with `trunk, instead of `wasm-pack`
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Optionally load `thoth-export-server` env variables from `.env` at build time
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Optionally load `thoth-app` env variables from `.env` at build time
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `jsonwebtoken` to v9.2.0
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Mark `jsonwebtoken` as an optional dependency, built with the `backend` feature
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `env\_logger` to v0.11.2
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `semver` to v1.0.22
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `gloo-storage` to v0.3.0
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `gloo-timers` to v0.3.0
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `strum` to v0.26.1
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade`reqwest-retry` to v0.3.0
   - [499](https://github.com/thoth-pub/thoth/issues/499) - Default main\_contribution to true
 
 ### Fixed
   - [564](https://github.com/thoth-pub/thoth/issues/564) - Fix error in BibTeX not outputting editors in work types other than edited volume
   - [447](https://github.com/thoth-pub/thoth/issues/447) - Prevents Google Books Onix3 format output from Export API if Thoth record doesn't contain at least one BIC, BISAC or LCC subject code
   - [404](https://github.com/thoth-pub/thoth/issues/404) - Prevents JSTOR Onix3 format output from Export API if Thoth record doesn't contain at least one BISAC subject code
 
+### Security
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `actix-web` to v4.5.1
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `tempfile` to v3.10.1
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `openssl` to v0.10.64
+  - [569](https://github.com/thoth-pub/thoth/pull/569) - Upgrade `serde\_yaml` to v0.9.25
+
 ## [[0.11.16]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.16) - 2024-02-19
 ### Changed
   - [561](https://github.com/thoth-pub/thoth/issues/561) - Add "Publisher Website" as a location platform