Skip to content

Commit

Permalink
refactor: upgrade rescript to v11 (uncurried)
Browse files Browse the repository at this point in the history
  • Loading branch information
czabaj authored Aug 12, 2024
2 parents 19e38c5 + 4f55c39 commit 6ef648d
Show file tree
Hide file tree
Showing 82 changed files with 9,530 additions and 5,122 deletions.
2 changes: 1 addition & 1 deletion .firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
}
}
}
}
}
10 changes: 5 additions & 5 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
"on":
on:
push:
branches:
- main
Expand All @@ -21,11 +21,11 @@ jobs:
VITE_FIREBASE_PROJECT_ID: ${{ vars.FIREBASE_PROJECT_ID }}
VITE_FIREBASE_STORAGE_BUCKET: ${{ vars.FIREBASE_STORAGE_BUCKET }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: yarn install --frozen-lockfile && yarn build && yarn install --cwd functions --frozen-lockfile
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEERBOOK2_PRODUCTION }}"
repoToken: ${{ secrets.GITHUB_TOKEN }}
firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEERBOOK2_PRODUCTION }}
channelId: live
projectId: ${{ vars.FIREBASE_PROJECT_ID }}
projectId: ${{ vars.FIREBASE_PROJECT_ID }}
23 changes: 18 additions & 5 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,29 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
'on': pull_request
on: pull_request
permissions:
checks: write
contents: read
pull-requests: write
jobs:
build_and_preview:
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
runs-on: ubuntu-latest
env:
VITE_FIREBASE_API_KEY: ${{ vars.FIREBASE_API_KEY }}
VITE_FIREBASE_APP_CHECK_TOKEN: ${{ vars.FIREBASE_APP_CHECK_TOKEN }}
VITE_FIREBASE_APP_ID: ${{ vars.FIREBASE_APP_ID }}
VITE_FIREBASE_AUTH_DOMAIN: ${{ vars.FIREBASE_AUTH_DOMAIN }}
VITE_FIREBASE_MEASUREMENT_ID: ${{ vars.FIREBASE_MEASUREMENT_ID }}
VITE_FIREBASE_MESSAGING_SENDER_ID: ${{ vars.FIREBASE_MESSAGING_SENDER_ID }}
VITE_FIREBASE_PROJECT_ID: ${{ vars.FIREBASE_PROJECT_ID }}
VITE_FIREBASE_STORAGE_BUCKET: ${{ vars.FIREBASE_STORAGE_BUCKET }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: yarn install --frozen-lockfile && yarn build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEERBOOK2_DA255 }}'
repoToken: ${{ secrets.GITHUB_TOKEN }}
firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEERBOOK2_DA255 }}
projectId: ${{ vars.FIREBASE_PROJECT_ID }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dist-ssr
.bsb.lock
.merlin
/lib/
*.res.js
*.bs.js

# Firebase
Expand Down
70 changes: 35 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
{
"dependencies": {
"@firebase-web-authn/browser": "^10.0.0",
"@nobleai/rescript-rxjs": "https://github.com/czabaj/rescript-rxjs#e9e24c22406f40dcaa70f3c0fd8deb07237d3dca",
"@oddbird/popover-polyfill": "^0.2.2",
"@rescript/core": "^0.4.0",
"@rescript/react": "^0.11.0",
"@rescriptbr/reform": "^12.1.0",
"@rescriptbr/reschema": "^3.0.3",
"@sentry/react": "^7.64.0",
"@sentry/vite-plugin": "^2.6.2",
"@oddbird/popover-polyfill": "^0.2.3",
"@rescript/core": "^1.5.2",
"@rescript/react": "^0.13.0",
"@sentry/react": "^7.106.0",
"@sentry/vite-plugin": "^2.14.3",
"dialog-polyfill": "^0.5.6",
"firebase": "^10.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intl": "^6.4.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-intl": "^6.6.8",
"reactfire": "^4.2.3",
"rescript-react-intl": "^3.0.0",
"rescript-react-update": "^3.0.1",
"rescript-webapi": "^0.8.0",
"rxfire": "^6.0.3",
"rescript-react-update": "^5.0.2",
"rescript-webapi": "^0.9.1",
"rxfire": "^6.0.5",
"rxjs": "^7.8.1"
},
"devDependencies": {
"@csstools/postcss-relative-color-syntax": "^2.0.1",
"@csstools/postcss-relative-color-syntax": "^2.0.10",
"@firebase-web-authn/extension": "^10.0.0",
"@firebase/rules-unit-testing": "^3.0.0",
"@jihchi/vite-plugin-rescript": "^5.3.0",
"@storybook/addon-essentials": "^7.3.0",
"@storybook/addon-interactions": "^7.3.0",
"@storybook/addon-links": "^7.3.0",
"@storybook/blocks": "^7.3.0",
"@storybook/react": "^7.3.0",
"@storybook/react-vite": "^7.3.0",
"@storybook/testing-library": "^0.2.0",
"@firebase/rules-unit-testing": "^3.0.1",
"@jihchi/vite-plugin-rescript": "^6.0.0",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
"@storybook/blocks": "^7.6.17",
"@storybook/react": "^7.6.17",
"@storybook/react-vite": "^7.6.17",
"@storybook/testing-library": "^0.2.2",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
"@vitejs/plugin-react": "^4.0.4",
"@testing-library/react": "^14.2.1",
"@vitejs/plugin-react": "^4.3.1",
"cssnano": "^6.0.1",
"jsdom": "^22.1.0",
"lenses-ppx": "^6.1.10",
"patch-package": "^8.0.0",
"postcss-combine-duplicated-selectors": "^10.0.3",
"postcss-preset-env": "^9.1.1",
"postcss-preset-env": "^9.6.0",
"postinstall-postinstall": "^2.1.0",
"prop-types": "^15.8.1",
"rescript": "^10.1.4",
"rescript-vitest": "^1.2.0",
"rescript": "^11.1.3",
"rescript-vitest": "^1.3.0",
"source-map-explorer": "^2.5.3",
"storybook": "^7.3.0",
"vite": "^4.4.9",
"vite-plugin-ejs": "^1.6.4",
"vite-plugin-pwa": "^0.16.4",
"vitest": "^0.34.1"
"storybook": "^7.6.17",
"vite": "^5.4.0",
"vite-plugin-ejs": "^1.7.0",
"vite-plugin-pwa": "^0.20.1",
"vitest": "^2.0.5"
},
"private": true,
"scripts": {
"analyze": "source-map-explorer 'dist/assets/*.js'",
"build": "vite build",
"build:rescript": "rescript build -with-deps",
"clean": "rescript clean -with-deps",
"format": "rescript format -all",
"postinstall": "patch-package",
"serve": "vite preview",
"start": "vite",
"storybook": "storybook dev --no-open --port 6006",
Expand Down
Loading

0 comments on commit 6ef648d

Please sign in to comment.