From 08bbae94fd17afa43226dac3cce40eb2afb9cdaf Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:07:20 +0200 Subject: [PATCH 01/13] Update turbo --- package.json | 4 ++-- pnpm-lock.yaml | 58 +++++++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 4f2ec8d00..ef3edfe5c 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "publih-packages": "turbo run build test && changeset version && changeset publish" }, "devDependencies": { - "turbo": "^2.2.1", - "@changesets/cli": "^2.27.9" + "@changesets/cli": "^2.27.9", + "turbo": "^2.2.3" }, "packageManager": "pnpm@9.12.2" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba5c907ac..e6fd952fd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^2.27.9 version: 2.27.9 turbo: - specifier: ^2.2.1 - version: 2.2.1 + specifier: ^2.2.3 + version: 2.2.3 fdm-calculator: dependencies: @@ -5671,38 +5671,38 @@ packages: tslib@2.8.0: resolution: {integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==} - turbo-darwin-64@2.2.1: - resolution: {integrity: sha512-jltMdSQ+7rQDVaorjW729PCw6fwAn1MgZSdoa0Gil7GZCOF3SnR/ok0uJw6G5mdm6F5XM8ZTlz+mdGzBLuBRaA==} + turbo-darwin-64@2.2.3: + resolution: {integrity: sha512-Rcm10CuMKQGcdIBS3R/9PMeuYnv6beYIHqfZFeKWVYEWH69sauj4INs83zKMTUiZJ3/hWGZ4jet9AOwhsssLyg==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.2.1: - resolution: {integrity: sha512-RHW0c1NonsJXXlutlZeunmhLanf0/WbeizFfYgWuTEaJE4MbbhyD/RG4Fm/7iob5kxQ4Es2TzfDPqyMqpIO0GA==} + turbo-darwin-arm64@2.2.3: + resolution: {integrity: sha512-+EIMHkuLFqUdJYsA3roj66t9+9IciCajgj+DVek+QezEdOJKcRxlvDOS2BUaeN8kEzVSsNiAGnoysFWYw4K0HA==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.2.1: - resolution: {integrity: sha512-RasrjV+i2B90hoR8r6B2Btf2/ebNT5MJbhkpY0G1EN06E1IkjCKfAXj/1Dwmjy9+Zo0NC2r69L3HxRrtpar8jQ==} + turbo-linux-64@2.2.3: + resolution: {integrity: sha512-UBhJCYnqtaeOBQLmLo8BAisWbc9v9daL9G8upLR+XGj6vuN/Nz6qUAhverN4Pyej1g4Nt1BhROnj6GLOPYyqxQ==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.2.1: - resolution: {integrity: sha512-LNkUUJuu1gNkhlo7Ky/zilXEiajLoGlWLiKT1XV5neEf+x1s+aU9Hzd/+HhSVMiyI8l7z6zLbrM1a6+v4co/SQ==} + turbo-linux-arm64@2.2.3: + resolution: {integrity: sha512-hJYT9dN06XCQ3jBka/EWvvAETnHRs3xuO/rb5bESmDfG+d9yQjeTMlhRXKrr4eyIMt6cLDt1LBfyi+6CQ+VAwQ==} cpu: [arm64] os: [linux] - turbo-windows-64@2.2.1: - resolution: {integrity: sha512-Mn5tlFrLzlQ6tW6wTWNlyT1osXuDUg0VT1VAjRpmRXlK2Zi3oKVVG0rs0nkkq4rmuheryD1xyuGPN9nFKbAn/A==} + turbo-windows-64@2.2.3: + resolution: {integrity: sha512-NPrjacrZypMBF31b4HE4ROg4P3nhMBPHKS5WTpMwf7wydZ8uvdEHpESVNMOtqhlp857zbnKYgP+yJF30H3N2dQ==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.2.1: - resolution: {integrity: sha512-bvYOJ3SMN00yiem+uAqwRMbUMau/KiMzJYxnD0YkFo6INc08z8gZi5g0GLZAR7g/L3JegktX3UQW2cJvryjvLg==} + turbo-windows-arm64@2.2.3: + resolution: {integrity: sha512-fnNrYBCqn6zgKPKLHu4sOkihBI/+0oYFr075duRxqUZ+1aLWTAGfHZLgjVeLh3zR37CVzuerGIPWAEkNhkWEIw==} cpu: [arm64] os: [win32] - turbo@2.2.1: - resolution: {integrity: sha512-clZFkh6U6NpsLKBVZYRjlZjRTfju1Z5STqvFVaOGu5443uM75alJe1nCYH9pQ9YJoiOvXAqA2rDHWN5kLS9JMg==} + turbo@2.2.3: + resolution: {integrity: sha512-5lDvSqIxCYJ/BAd6rQGK/AzFRhBkbu4JHVMLmGh/hCb7U3CqSnr5Tjwfy9vc+/5wG2DJ6wttgAaA7MoCgvBKZQ==} hasBin: true type-check@0.4.0: @@ -12923,32 +12923,32 @@ snapshots: tslib@2.8.0: {} - turbo-darwin-64@2.2.1: + turbo-darwin-64@2.2.3: optional: true - turbo-darwin-arm64@2.2.1: + turbo-darwin-arm64@2.2.3: optional: true - turbo-linux-64@2.2.1: + turbo-linux-64@2.2.3: optional: true - turbo-linux-arm64@2.2.1: + turbo-linux-arm64@2.2.3: optional: true - turbo-windows-64@2.2.1: + turbo-windows-64@2.2.3: optional: true - turbo-windows-arm64@2.2.1: + turbo-windows-arm64@2.2.3: optional: true - turbo@2.2.1: + turbo@2.2.3: optionalDependencies: - turbo-darwin-64: 2.2.1 - turbo-darwin-arm64: 2.2.1 - turbo-linux-64: 2.2.1 - turbo-linux-arm64: 2.2.1 - turbo-windows-64: 2.2.1 - turbo-windows-arm64: 2.2.1 + turbo-darwin-64: 2.2.3 + turbo-darwin-arm64: 2.2.3 + turbo-linux-64: 2.2.3 + turbo-linux-arm64: 2.2.3 + turbo-windows-64: 2.2.3 + turbo-windows-arm64: 2.2.3 type-check@0.4.0: dependencies: From 8c52ca3657c8f885690c8be846f31c787f3467d0 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:08:19 +0200 Subject: [PATCH 02/13] Use specific task for building docs --- .github/workflows/deploy-docs-test.yml | 4 ++-- .github/workflows/deploy-docs.yml | 2 +- fdm-docs/package.json | 1 + package.json | 3 ++- turbo.json | 10 +++++++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-docs-test.yml b/.github/workflows/deploy-docs-test.yml index 51b11b815..3e8220173 100644 --- a/.github/workflows/deploy-docs-test.yml +++ b/.github/workflows/deploy-docs-test.yml @@ -29,8 +29,8 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'pnpm' - + - name: Install dependencies run: pnpm install --frozen-lockfile - name: Build website - run: pnpm build \ No newline at end of file + run: pnpm build-docs \ No newline at end of file diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 5842d6606..1fe56fbf1 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -33,7 +33,7 @@ jobs: - name: Install dependencies run: pnpm install --frozen-lockfile - name: Build website - run: pnpm build + run: pnpm build-docs - name: Upload Build Artifact uses: actions/upload-pages-artifact@v3 diff --git a/fdm-docs/package.json b/fdm-docs/package.json index 363cb7d7e..8c0c03cd2 100644 --- a/fdm-docs/package.json +++ b/fdm-docs/package.json @@ -7,6 +7,7 @@ "start": "docusaurus start", "watch-docs": "pnpm start", "build": "docusaurus build", + "build-docs": "docusaurus build", "swizzle": "docusaurus swizzle", "deploy": "docusaurus deploy", "clear": "docusaurus clear", diff --git a/package.json b/package.json index ef3edfe5c..2bf25dfa0 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,9 @@ "scripts": { "test": "turbo run test", "build": "turbo run build", + "build-docs": "turbo run build-docs", "watch": "turbo run watch", - "publih-packages": "turbo run build test && changeset version && changeset publish" + "publish-packages": "turbo run build test && changeset version && changeset publish" }, "devDependencies": { "@changesets/cli": "^2.27.9", diff --git a/turbo.json b/turbo.json index 4fea9fdb6..2e166313b 100644 --- a/turbo.json +++ b/turbo.json @@ -3,12 +3,20 @@ "tasks": { "build": { "outputs": [ - "dist/**" + "dist/**", "build/**" ], "dependsOn": [ "^build" ] }, + "build-docs": { + "outputs": [ + "build/**" + ], + "dependsOn": [ + "^build-docs" + ] + }, "check-types": { "dependsOn": [ "^check-types" From e7408eae7d2cddb0d62ad48cb265c34ef7a709dd Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:15:07 +0200 Subject: [PATCH 03/13] Install only dependencies for fdm-docs on those actions --- .github/workflows/deploy-docs-test.yml | 2 +- .github/workflows/deploy-docs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-docs-test.yml b/.github/workflows/deploy-docs-test.yml index 3e8220173..902ec6e71 100644 --- a/.github/workflows/deploy-docs-test.yml +++ b/.github/workflows/deploy-docs-test.yml @@ -31,6 +31,6 @@ jobs: cache: 'pnpm' - name: Install dependencies - run: pnpm install --frozen-lockfile + run: pnpm install --frozen-lockfile --filter fdm-docs - name: Build website run: pnpm build-docs \ No newline at end of file diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 1fe56fbf1..bf467fa13 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -31,7 +31,7 @@ jobs: cache: 'pnpm' - name: Install dependencies - run: pnpm install --frozen-lockfile + run: pnpm install --frozen-lockfile --filter fdm-docs - name: Build website run: pnpm build-docs From ce1cf63597623d0db8e69a2a177d54c35efef519 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:16:55 +0200 Subject: [PATCH 04/13] check if deployment works --- .github/workflows/deploy-docs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index bf467fa13..44665ed0f 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -5,6 +5,9 @@ defaults: working-directory: ./fdm-docs on: + pull_request: + branches: + - main push: branches: - main From c27a25062399ea5b0fbb56c43b73330c1ab87862 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:19:34 +0200 Subject: [PATCH 05/13] Fix build path --- .github/workflows/deploy-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 44665ed0f..b6e5781a5 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -41,7 +41,7 @@ jobs: - name: Upload Build Artifact uses: actions/upload-pages-artifact@v3 with: - path: build + path: ./build deploy: name: Deploy to GitHub Pages From 9f8e291ea0538220b8ee55e426c0616b6445d865 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:21:24 +0200 Subject: [PATCH 06/13] Another fix for build path --- .github/workflows/deploy-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index b6e5781a5..71d57a371 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -41,7 +41,7 @@ jobs: - name: Upload Build Artifact uses: actions/upload-pages-artifact@v3 with: - path: ./build + path: ./fdm-docs/build deploy: name: Deploy to GitHub Pages From f86708252a66f93c3f85415a9a2da8aea2bcd9cf Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:32:03 +0200 Subject: [PATCH 07/13] Use gh-pages branch to deploy --- .github/workflows/deploy-docs.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 71d57a371..70088e5a9 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -59,6 +59,29 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout gh-pages branch + uses: actions/checkout@v4 + with: + ref: gh-pages # Checkout the gh-pages branch + + - name: Download Build Artifact + uses: actions/download-artifact@v3 + with: + name: build-artifact # + + - name: Prepare gh-pages + run: | + rm -rf * # Remove existing content on gh-pages + mv build-artifact/* ./ # Move built files to root + + - name: Commit and push changes + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "Deploy Docusaurus site to gh-pages" + branch: gh-pages # Push to the gh-pages branch + - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 + with: + folder: . From 8e29c37fbbaad615e6d8b2ef3ec6c8ee1fb7a419 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:08:45 +0200 Subject: [PATCH 08/13] Revert from branch to action --- .github/workflows/deploy-docs.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 70088e5a9..71d57a371 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -59,29 +59,6 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout gh-pages branch - uses: actions/checkout@v4 - with: - ref: gh-pages # Checkout the gh-pages branch - - - name: Download Build Artifact - uses: actions/download-artifact@v3 - with: - name: build-artifact # - - - name: Prepare gh-pages - run: | - rm -rf * # Remove existing content on gh-pages - mv build-artifact/* ./ # Move built files to root - - - name: Commit and push changes - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: "Deploy Docusaurus site to gh-pages" - branch: gh-pages # Push to the gh-pages branch - - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 - with: - folder: . From 61f39e7e8f8f708670df560d8e6b31a6a83be5ca Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:12:14 +0200 Subject: [PATCH 09/13] Fix baseUrl --- fdm-docs/docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdm-docs/docusaurus.config.ts b/fdm-docs/docusaurus.config.ts index 20346489b..3114fd3d2 100644 --- a/fdm-docs/docusaurus.config.ts +++ b/fdm-docs/docusaurus.config.ts @@ -11,7 +11,7 @@ const config: Config = { url: 'https://your-docusaurus-site.example.com', // Set the // pathname under which your site is served // For GitHub pages deployment, it is often '//' - baseUrl: '/', + baseUrl: '/fdm/', // GitHub pages deployment config. // If you aren't using GitHub pages, you don't need these. From 9ef07cdc64e068b01612fd0f2b416139bb13c586 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:14:48 +0200 Subject: [PATCH 10/13] Set production url --- fdm-docs/docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdm-docs/docusaurus.config.ts b/fdm-docs/docusaurus.config.ts index 3114fd3d2..f85fc6662 100644 --- a/fdm-docs/docusaurus.config.ts +++ b/fdm-docs/docusaurus.config.ts @@ -8,7 +8,7 @@ const config: Config = { favicon: 'img/favicon.ico', // Set the production url of your site here - url: 'https://your-docusaurus-site.example.com', + url: 'https://svenvw.github.io/fdm', // Set the // pathname under which your site is served // For GitHub pages deployment, it is often '//' baseUrl: '/fdm/', From b57100cf9172b9365782eeb92526f0a93abe72e1 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:18:42 +0200 Subject: [PATCH 11/13] Update changelog --- fdm-docs/CHANGELOG.md | 6 ++++++ fdm-docs/package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fdm-docs/CHANGELOG.md b/fdm-docs/CHANGELOG.md index 163b9cefb..86a2dc616 100644 --- a/fdm-docs/CHANGELOG.md +++ b/fdm-docs/CHANGELOG.md @@ -1,5 +1,11 @@ # fdm-docs +## 0.1.1 + +### Patch Changes + +- Fix deployment to GitHub Pages + ## 0.1.0 ### Minor Changes diff --git a/fdm-docs/package.json b/fdm-docs/package.json index 8c0c03cd2..f2b6641a2 100644 --- a/fdm-docs/package.json +++ b/fdm-docs/package.json @@ -1,6 +1,6 @@ { "name": "fdm-docs", - "version": "0.1.0", + "version": "0.1.1", "private": true, "scripts": { "docusaurus": "docusaurus", From 9a65f51ea6745d672262316402160d40e362c0e4 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:19:29 +0200 Subject: [PATCH 12/13] Deploy only when pushing to main --- .github/workflows/deploy-docs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 71d57a371..91f9822b7 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -5,9 +5,6 @@ defaults: working-directory: ./fdm-docs on: - pull_request: - branches: - - main push: branches: - main From aa3dcbfd624db1c432278f58afc967c0ea1e3268 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:22:23 +0200 Subject: [PATCH 13/13] Fix url --- fdm-docs/docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdm-docs/docusaurus.config.ts b/fdm-docs/docusaurus.config.ts index f85fc6662..aa55ae160 100644 --- a/fdm-docs/docusaurus.config.ts +++ b/fdm-docs/docusaurus.config.ts @@ -8,7 +8,7 @@ const config: Config = { favicon: 'img/favicon.ico', // Set the production url of your site here - url: 'https://svenvw.github.io/fdm', + url: 'https://svenvw.github.io', // Set the // pathname under which your site is served // For GitHub pages deployment, it is often '//' baseUrl: '/fdm/',