From 90d0b9680ed7fea92627b6c5af1ff4f63367c392 Mon Sep 17 00:00:00 2001 From: Charles Le Maux Date: Mon, 5 Aug 2024 18:39:07 +0200 Subject: [PATCH 1/4] [+] Added firebase webframeworks experiments --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6fb6652..0ff04ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "servii-front", "private": true, - "version": "0.0.0", + "version": "1.9.45", "type": "module", "scripts": { "dev": "vite", From 8d9fceb9728b78d84a64f84a0942eb8267604758 Mon Sep 17 00:00:00 2001 From: Charles Le Maux Date: Mon, 5 Aug 2024 18:46:18 +0200 Subject: [PATCH 2/4] [~] Rewrote CI workflows --- .github/workflows/firebase-hosting-merge.yml | 5 ++++- .github/workflows/firebase-hosting-pull-request.yml | 5 ++++- firebase.json | 11 ++++------- package-lock.json | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 277763b..8c565f0 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -11,10 +11,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: npm ci && npm run build + - run: npm ci + - run: build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_SERVI_E6705 }} channelId: live projectId: servi-e6705 + env: + FIREBASE_CLI_EXPERIMENTS: webframeworks diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index fb2f8fb..2cabd15 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -13,9 +13,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: npm ci && npm run build + - run: npm ci + - run: build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_SERVI_E6705 }} projectId: servi-e6705 + env: + FIREBASE_CLI_EXPERIMENTS: webframeworks diff --git a/firebase.json b/firebase.json index e86731b..86e197e 100644 --- a/firebase.json +++ b/firebase.json @@ -4,17 +4,14 @@ "indexes": "firestore.indexes.json" }, "hosting": { - "public": "dist", + "source": ".", "ignore": [ "firebase.json", "**/.*", "**/node_modules/**" ], - "rewrites": [ - { - "source": "**", - "destination": "/index.html" - } - ] + "frameworksBackend": { + "region": "europe-west1" + } } } diff --git a/package-lock.json b/package-lock.json index 33c1e1b..cacaeac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "servii-front", - "version": "0.0.0", + "version": "1.9.45", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "servii-front", - "version": "0.0.0", + "version": "1.9.45", "dependencies": { "@fortawesome/free-solid-svg-icons": "^6.5.2", "@fortawesome/react-fontawesome": "^0.2.2", From 4f377cea2f801fa14570a28f3c49d00dfa84f59e Mon Sep 17 00:00:00 2001 From: charleslemaux <146107581+charleslemaux@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:47:25 +0200 Subject: [PATCH 3/4] Update firebase-hosting-merge.yml --- .github/workflows/firebase-hosting-merge.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 8c565f0..27aaef0 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -11,8 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: npm ci - - run: build + - run: npm ci && npm build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: ${{ secrets.GITHUB_TOKEN }} From 99a2ba5df79ed6ee075de9ded6b43f6749a0d2c6 Mon Sep 17 00:00:00 2001 From: charleslemaux <146107581+charleslemaux@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:48:50 +0200 Subject: [PATCH 4/4] [~] firebase-hosting-merge.yml --- .github/workflows/firebase-hosting-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 27aaef0..91874ff 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: npm ci && npm build + - run: npm ci && npm run build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: ${{ secrets.GITHUB_TOKEN }}