diff --git a/examples/react-firebase/.github/workflows/deploy.yml b/examples/react-firebase/.github/workflows/deploy.yml index ddd6e540..666041ee 100644 --- a/examples/react-firebase/.github/workflows/deploy.yml +++ b/examples/react-firebase/.github/workflows/deploy.yml @@ -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 }} @@ -30,7 +30,7 @@ jobs: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }} diff --git a/examples/react-firebase/.github/workflows/verify.yml b/examples/react-firebase/.github/workflows/verify.yml index e62001f5..3af64320 100644 --- a/examples/react-firebase/.github/workflows/verify.yml +++ b/examples/react-firebase/.github/workflows/verify.yml @@ -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 }} @@ -26,7 +26,7 @@ jobs: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }} diff --git a/examples/react-firestore/.github/workflows/deploy.yml b/examples/react-firestore/.github/workflows/deploy.yml index 3ccebed9..1de1ecac 100644 --- a/examples/react-firestore/.github/workflows/deploy.yml +++ b/examples/react-firestore/.github/workflows/deploy.yml @@ -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 }} @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }} - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }} diff --git a/examples/react-firestore/.github/workflows/verify.yml b/examples/react-firestore/.github/workflows/verify.yml index eefd474d..a11dcf12 100644 --- a/examples/react-firestore/.github/workflows/verify.yml +++ b/examples/react-firestore/.github/workflows/verify.yml @@ -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 }} @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }} - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }} @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }} - name: Cache Cypress Binary - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/Cypress key: ${{ runner.os }}-cypress-${{ steps.cache-settings.outputs.cypress }} - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} diff --git a/examples/react-firestore/functions/package.json b/examples/react-firestore/functions/package.json index 45352fae..686ee987 100644 --- a/examples/react-firestore/functions/package.json +++ b/examples/react-firestore/functions/package.json @@ -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", diff --git a/examples/react-firestore/functions/yarn.lock b/examples/react-firestore/functions/yarn.lock index e4096efd..9a38f1ee 100644 --- a/examples/react-firestore/functions/yarn.lock +++ b/examples/react-firestore/functions/yarn.lock @@ -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" @@ -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" @@ -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" diff --git a/examples/redux-firestore/.github/workflows/deploy.yml b/examples/redux-firestore/.github/workflows/deploy.yml index 78e7bf3f..430ed126 100644 --- a/examples/redux-firestore/.github/workflows/deploy.yml +++ b/examples/redux-firestore/.github/workflows/deploy.yml @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }} - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }} diff --git a/examples/redux-firestore/.github/workflows/verify.yml b/examples/redux-firestore/.github/workflows/verify.yml index 9c20b64b..f54c69a5 100644 --- a/examples/redux-firestore/.github/workflows/verify.yml +++ b/examples/redux-firestore/.github/workflows/verify.yml @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }} - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-app-${{ hashFiles('yarn.lock') }} @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }} - name: Cache Cypress Binary - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/Cypress key: ${{ runner.os }}-cypress-${{ steps.cache-settings.outputs.cypress }} - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} diff --git a/generators/app/templates/.github/workflows/deploy.yml b/generators/app/templates/.github/workflows/deploy.yml index c22adb2a..76ac7592 100644 --- a/generators/app/templates/.github/workflows/deploy.yml +++ b/generators/app/templates/.github/workflows/deploy.yml @@ -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 }} @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}<% } %><% } %> - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.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<% } %>') }} diff --git a/generators/app/templates/.github/workflows/verify.yml b/generators/app/templates/.github/workflows/verify.yml index 9b5d93c1..38d21b48 100644 --- a/generators/app/templates/.github/workflows/verify.yml +++ b/generators/app/templates/.github/workflows/verify.yml @@ -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 }} @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }}<% } %><% } %> - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.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<% } %>') }} @@ -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/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/firebase/emulators key: ${{ runner.os }}-firebase-${{ steps.cache-settings.outputs.firebase-tools }} - name: Cache Cypress Binary - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.cache/Cypress key: ${{ runner.os }}-cypress-${{ steps.cache-settings.outputs.cypress }} - name: Cache App Dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ${{ steps.cache-settings.outputs.dir }} key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} diff --git a/generators/app/templates/functions/package.json b/generators/app/templates/functions/package.json index 62efa78f..88f5b1a9 100644 --- a/generators/app/templates/functions/package.json +++ b/generators/app/templates/functions/package.json @@ -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') { %> diff --git a/package.json b/package.json index 0a6fa5f3..79878ca4 100644 --- a/package.json +++ b/package.json @@ -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": {