diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 277763b..91874ff 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -18,3 +18,5 @@ jobs: 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", 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",