Skip to content

Commit

Permalink
v7.6.6 (#383)
Browse files Browse the repository at this point in the history 
* v7.6.6 fix(functions): add missing tslib

* fix(ci): update step versions

* fix: move tslib to dependencies (not dev)
  • Loading branch information
@prescottprue
prescottprue authored Apr 22, 2021
1 parent 6e59310 commit 797e5ee
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 40 deletions.
4 changes: 2 additions & 2 deletions examples/react-firebase/.github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.8.0
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ github.token }}

Expand All @@ -30,7 +30,7 @@ jobs:
echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions examples/react-firebase/.github/workflows/verify.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.8.0
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ github.token }}

Expand All @@ -26,7 +26,7 @@ jobs:
echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions examples/react-firestore/.github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.8.0
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ github.token }}

Expand All @@ -31,13 +31,13 @@ jobs:
echo "::set-output name=firebase-tools::$(yarn list -s --depth=0 --pattern firebase-tools | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }}
Expand Down
12 changes: 6 additions & 6 deletions examples/react-firestore/.github/workflows/verify.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.8.0
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ github.token }}

Expand All @@ -27,13 +27,13 @@ jobs:
echo "::set-output name=firebase-tools::$(yarn list -s --depth=0 --pattern firebase-tools | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }}
Expand Down Expand Up @@ -153,19 +153,19 @@ jobs:
echo "::set-output name=cypress::$(yarn list -s --depth=0 --pattern cypress | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}

- name: Cache Cypress Binary
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress-${{ steps.cache-settings.outputs.cypress }}

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
Expand Down
3 changes: 2 additions & 1 deletion examples/react-firestore/functions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"dependencies": {
"firebase-admin": "^9.6.0",
"firebase-functions": "^3.13.2",
"glob": "^7.1.6"
"glob": "^7.1.6",
"tslib": "^2.2.0"
},
"devDependencies": {
"@firebase/rules-unit-testing": "^1.1.11",
Expand Down
21 changes: 13 additions & 8 deletions examples/react-firestore/functions/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1570,10 +1570,10 @@ find-up@^4.0.0, find-up@^4.1.0:
locate-path "^5.0.0"
path-exists "^4.0.0"

firebase-admin@^9.5.0:
version "9.5.0"
resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.5.0.tgz#438bc343f1fa0644c2bdbeb36eefec3eda3bf966"
integrity sha512-OPXFOTDcAE+NORpfhq7YMEDk+vFClBtjfpkrjm2JHRxb8DpMm+K3AcusonFPU/WOH4FhiVN9JHB0+NPE20S3gQ==
firebase-admin@^9.6.0:
version "9.6.0"
resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.6.0.tgz#eabb0513f5aa0ebc473934669895d2a4d7e4e8a3"
integrity sha512-GNrxsQsZ6alz9u+uYmX84qcixxYQnfOrByxVgEHWiCI9JSCbMOQ/1Px2A6+Coz5zzFokTgXsHnIg+Qz7hMlNZg==
dependencies:
"@firebase/database" "^0.8.1"
"@firebase/database-types" "^0.6.1"
Expand All @@ -1593,10 +1593,10 @@ firebase-functions-test@^0.2.3:
"@types/lodash" "^4.14.104"
lodash "^4.17.5"

firebase-functions@^3.13.1:
version "3.13.1"
resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.13.1.tgz#a34e61ab328903fe88a9532d267f031d9a0d9e23"
integrity sha512-tmYHN9OWWIij/8xO72AD2sKHm9T8pdLPYXy5RWk9VidP8+LDOUZ68vq1g1WKeSkRR7WyVYQ3scU2QoMDfe9T8g==
firebase-functions@^3.13.2:
version "3.13.2"
resolved "https://registry.yarnpkg.com/firebase-functions/-/firebase-functions-3.13.2.tgz#e5728b91a51f16f538e53c4f50497056b5702d58"
integrity sha512-XHgAQZqA62awr4l9mNlJv6qnv5MkMkLuo+hafdW0T7IJj1PgrZtuIo5x+ib2npAcB0XhX5Sg0QR1hMYPAlfbaA==
dependencies:
"@types/express" "4.17.3"
cors "^2.8.5"
Expand Down Expand Up @@ -3337,6 +3337,11 @@ tslib@^1.11.1:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==

tslib@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==

tunnel-agent@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
Expand Down
4 changes: 2 additions & 2 deletions examples/redux-firestore/.github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ jobs:
echo "::set-output name=firebase-tools::$(yarn list -s --depth=0 --pattern firebase-tools | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }}
Expand Down
10 changes: 5 additions & 5 deletions examples/redux-firestore/.github/workflows/verify.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ jobs:
echo "::set-output name=firebase-tools::$(yarn list -s --depth=0 --pattern firebase-tools | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }}
Expand Down Expand Up @@ -153,19 +153,19 @@ jobs:
echo "::set-output name=cypress::$(yarn list -s --depth=0 --pattern cypress | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}

- name: Cache Cypress Binary
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress-${{ steps.cache-settings.outputs.cypress }}

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions generators/app/templates/.github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.8.0
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ github.token }}

Expand All @@ -31,13 +31,13 @@ jobs:
echo "::set-output name=firebase-tools::$(yarn list -s --depth=0 --pattern firebase-tools | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}<% } %><% } %>

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: <% if(!useYarn) { %>~/.npm<% } else { %>${{ steps.cache-settings.outputs.dir }}<% } %>
key: ${{ runner.os }}-app-${{ hashFiles('<% if(useYarn) { %>yarn.lock<% } else { %>package-lock.json<% } %>') }}
Expand Down
12 changes: 6 additions & 6 deletions generators/app/templates/.github/workflows/verify.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.8.0
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ github.token }}

Expand All @@ -27,13 +27,13 @@ jobs:
echo "::set-output name=firebase-tools::$(yarn list -s --depth=0 --pattern firebase-tools | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}<% } %><% } %>

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: <% if(!useYarn) { %>~/.npm<% } else { %>${{ steps.cache-settings.outputs.dir }}<% } %>
key: ${{ runner.os }}-app-${{ hashFiles('<% if(useYarn) { %>yarn.lock<% } else { %>package-lock.json<% } %>') }}
Expand Down Expand Up @@ -153,19 +153,19 @@ jobs:
echo "::set-output name=cypress::$(yarn list -s --depth=0 --pattern cypress | tail -n 1 | sed 's/.*@//g')"
- name: Cache Firebase Emulator Binaries
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/firebase/emulators
key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}

- name: Cache Cypress Binary
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress-${{ steps.cache-settings.outputs.cypress }}

- name: Cache App Dependencies
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ${{ steps.cache-settings.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
Expand Down
3 changes: 2 additions & 1 deletion generators/app/templates/functions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"dependencies": {
"firebase-admin": "^9.6.0",
"firebase-functions": "^3.13.2",
"glob": "^7.1.6"
"glob": "^7.1.6"<% if(typescriptCloudFunctions) { %>,
"tslib": "^2.2.0"<% } %>
},
"devDependencies": {<% if(includeFunctionsTests) { %>
"@firebase/rules-unit-testing": "^1.1.11",<% } %><% if(typescriptCloudFunctions) { %><% if(includeFunctionsTests && functionsTestTool === 'mocha') { %>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-react-firebase",
"version": "7.6.5",
"version": "7.6.6",
"description": "React and Firebase project generator (with option for Redux).",
"main": "generators/index.js",
"scripts": {
Expand Down

0 comments on commit 797e5ee

Please sign in to comment.