From 3fc2665ac4d151a79a494d26ea16fc0cffb9cbcb Mon Sep 17 00:00:00 2001 From: Charlotte Vermandel Date: Tue, 26 Jul 2022 17:08:20 +0200 Subject: [PATCH 1/5] Update CI to latest versions of dependencies --- .github/workflows/beta-tests.yml | 21 ++++------ .github/workflows/pre-release-tests.yml | 18 ++++---- .github/workflows/publish.yml | 4 +- .github/workflows/tests.yml | 55 ++++++++++++++----------- 4 files changed, 50 insertions(+), 48 deletions(-) diff --git a/.github/workflows/beta-tests.yml b/.github/workflows/beta-tests.yml index a1e8e612..fbd80e2e 100644 --- a/.github/workflows/beta-tests.yml +++ b/.github/workflows/beta-tests.yml @@ -14,7 +14,7 @@ jobs: outputs: docker-version: ${{ steps.grep-step.outputs.version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Grep docker beta version of Meilisearch id: grep-step run: | @@ -28,17 +28,12 @@ jobs: container: cypress/browsers:node12.18.3-chrome87-ff82 steps: - name: Checkout - uses: actions/checkout@v2 - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} + uses: actions/checkout@v3 - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: '14.x' + node-version: 16 + cache: yarn - name: Meilisearch (${{ needs.grep-docker-version.outputs.docker-version }}) setup with Docker run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} meilisearch --master-key=masterKey --no-analytics - name: Install dependencies @@ -46,7 +41,7 @@ jobs: - name: Setup Meilisearch Index run: yarn local:env:setup - name: Run local browser tests - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v3 with: # Tests are only done on one playground to avoid long testing time start: yarn local:env:react @@ -71,7 +66,7 @@ jobs: node: ['12', '14', '16'] name: integration-tests (Node.js ${{ matrix.node }}) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -79,7 +74,7 @@ jobs: ./node_modules key: ${{ hashFiles('yarn.lock') }} - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '14.x' - name: Meilisearch (${{ needs.grep-docker-version.outputs.docker-version }}) setup with Docker diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml index a9a4ad83..7bd231d8 100644 --- a/.github/workflows/pre-release-tests.yml +++ b/.github/workflows/pre-release-tests.yml @@ -15,7 +15,7 @@ jobs: container: cypress/browsers:node12.18.3-chrome87-ff82 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -23,9 +23,9 @@ jobs: ./node_modules key: ${{ hashFiles('yarn.lock') }} - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: "14.x" + node-version: '14.x' - name: Install dependencies run: yarn --dev && yarn --cwd ./tests/env/react - name: Grep latest version of Meilisearch @@ -41,7 +41,7 @@ jobs: - name: Setup Meilisearch Index run: yarn local:env:setup - name: Run local browser tests - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v3 with: # Tests are only done on one playground to avoid long testing time start: yarn local:env:react @@ -62,10 +62,10 @@ jobs: strategy: fail-fast: false matrix: - node: ["12", "14", "16"] + node: ['12', '14', '16'] name: integration-tests (Node.js ${{ matrix.node }}) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -88,7 +88,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest name: types-check steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -115,7 +115,7 @@ jobs: ./node_modules key: ${{ hashFiles('yarn.lock') }} - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 - name: Install dependencies run: yarn --dev - name: Build project diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4cdd80ef..fd947d03 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,8 +7,8 @@ jobs: publish-npm: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: 12 registry-url: https://registry.npmjs.org/ diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 78dbceb6..e3f7d852 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,42 +10,49 @@ on: - main jobs: + grep-docker-version: + runs-on: ubuntu-latest + outputs: + docker-version: ${{ steps.grep-step.outputs.version }} + steps: + - uses: actions/checkout@v3 + - name: Grep docker beta version of Meilisearch + id: grep-step + run: | + echo ::set-output name=version::latest cypress-run: + needs: ['grep-docker-version'] # Will not run if the event is a PR to bump-meilisearch-v* (so a pre-release PR) # Will still run for each push to bump-meilisearch-v* if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v') runs-on: ubuntu-latest - # Only test on Google Chrome - container: cypress/browsers:node12.18.3-chrome87-ff82 + services: + meilisearch: + image: getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} + env: + MEILI_MASTER_KEY: 'masterKey' + MEILI_NO_ANALYTICS: 'true' + ports: + - '7700:7700' steps: - name: Checkout - uses: actions/checkout@v2 - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} + uses: actions/checkout@v3 - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: "14.x" - - name: Download the latest stable version of Meilisearch - run: | - curl -L https://install.meilisearch.com | sh - chmod +x meilisearch - - name: Run Meilisearch - run: | - ./meilisearch --master-key=masterKey --no-analytics & + node-version: '14.x' + cache: yarn - name: Install dependencies run: yarn --dev && yarn --cwd ./tests/env/react - name: Setup Meilisearch Index run: yarn local:env:setup - name: Run local browser tests - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v3 with: + wait-on: 'http://localhost:7700' # Tests are only done on one playground to avoid long testing time start: yarn local:env:react + browser: chrome env: playground=local - uses: actions/upload-artifact@v2 if: failure() @@ -65,10 +72,10 @@ jobs: strategy: fail-fast: false matrix: - node: ["12", "14", "16"] + node: ['12', '14', '16'] name: integration-tests (Node.js ${{ matrix.node }}) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -91,7 +98,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -113,7 +120,7 @@ jobs: runs-on: ubuntu-latest name: types-check steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies uses: actions/cache@v2 with: @@ -121,7 +128,7 @@ jobs: ./node_modules key: ${{ hashFiles('yarn.lock') }} - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 - name: Install dependencies run: yarn --dev - name: Build project From ea66e61705ce115c1c396e8af471eb112fad59f7 Mon Sep 17 00:00:00 2001 From: Charlotte Vermandel Date: Tue, 26 Jul 2022 17:41:49 +0200 Subject: [PATCH 2/5] Ensure node 18 compatibility --- .github/workflows/beta-tests.yml | 2 +- .github/workflows/pre-release-tests.yml | 2 +- .github/workflows/tests.yml | 40 +++++++++++++------------ bors.toml | 3 +- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.github/workflows/beta-tests.yml b/.github/workflows/beta-tests.yml index fbd80e2e..07159753 100644 --- a/.github/workflows/beta-tests.yml +++ b/.github/workflows/beta-tests.yml @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - node: ['12', '14', '16'] + node: ['14', '16', '18'] name: integration-tests (Node.js ${{ matrix.node }}) steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml index 7bd231d8..f11ee7ad 100644 --- a/.github/workflows/pre-release-tests.yml +++ b/.github/workflows/pre-release-tests.yml @@ -62,7 +62,7 @@ jobs: strategy: fail-fast: false matrix: - node: ['12', '14', '16'] + node: ['14', '16', '18'] name: integration-tests (Node.js ${{ matrix.node }}) steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e3f7d852..a2de42c6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,7 @@ jobs: - name: Setup node uses: actions/setup-node@v3 with: - node-version: '14.x' + node-version: 16 cache: yarn - name: Install dependencies run: yarn --dev && yarn --cwd ./tests/env/react @@ -52,7 +52,6 @@ jobs: wait-on: 'http://localhost:7700' # Tests are only done on one playground to avoid long testing time start: yarn local:env:react - browser: chrome env: playground=local - uses: actions/upload-artifact@v2 if: failure() @@ -69,19 +68,26 @@ jobs: # Will still run for each push to bump-meilisearch-v* if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v') runs-on: ubuntu-latest + services: + meilisearch: + image: getmeili/meilisearch:latest + env: + MEILI_MASTER_KEY: 'masterKey' + MEILI_NO_ANALYTICS: 'true' + ports: + - '7700:7700' strategy: fail-fast: false matrix: - node: ['12', '14', '16'] + node: ['14', '16', '18'] name: integration-tests (Node.js ${{ matrix.node }}) steps: - uses: actions/checkout@v3 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Setup node + uses: actions/setup-node@v3 with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} + cache: yarn + node-version: ${{ matrix.node }} - name: Docker setup run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key='masterKey' - name: Install dependencies @@ -99,12 +105,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Setup node + uses: actions/setup-node@v3 with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} + node-version: 16 + cache: yarn - name: Install dependencies run: yarn install - name: Tests style @@ -121,14 +126,11 @@ jobs: name: types-check steps: - uses: actions/checkout@v3 - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} - name: Setup node uses: actions/setup-node@v3 + with: + node-version: 16 + cache: yarn - name: Install dependencies run: yarn --dev - name: Build project diff --git a/bors.toml b/bors.toml index dd0e2db4..5d18aad4 100644 --- a/bors.toml +++ b/bors.toml @@ -1,8 +1,9 @@ status = [ 'style-check', 'types-check', - 'integration-tests (Node.js 12)', 'integration-tests (Node.js 14)', + 'integration-tests (Node.js 16)', + 'integration-tests (Node.js 18)', 'cypress-run' ] # 1 hour timeout From 05cfa2f6e38740b41b5833cd5bafdca03491bbe6 Mon Sep 17 00:00:00 2001 From: Charlotte Vermandel Date: Tue, 26 Jul 2022 18:17:39 +0200 Subject: [PATCH 3/5] Remove additional docker in tests --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a2de42c6..c65ccad6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,8 +88,6 @@ jobs: with: cache: yarn node-version: ${{ matrix.node }} - - name: Docker setup - run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key='masterKey' - name: Install dependencies run: yarn install - name: Run tests From a0fe3c1e6d6c3d5ceb7599bf891f5a1808315214 Mon Sep 17 00:00:00 2001 From: Charlotte Vermandel Date: Tue, 26 Jul 2022 19:59:12 +0200 Subject: [PATCH 4/5] Update pre-release and beta ci --- .github/workflows/beta-tests.yml | 24 +++++++-- .github/workflows/pre-release-tests.yml | 67 ++++--------------------- .github/workflows/tests.yml | 19 ++----- 3 files changed, 33 insertions(+), 77 deletions(-) diff --git a/.github/workflows/beta-tests.yml b/.github/workflows/beta-tests.yml index 07159753..4d28b1a8 100644 --- a/.github/workflows/beta-tests.yml +++ b/.github/workflows/beta-tests.yml @@ -25,7 +25,14 @@ jobs: runs-on: ubuntu-latest needs: ['grep-docker-version'] # Only test on Google Chrome - container: cypress/browsers:node12.18.3-chrome87-ff82 + services: + meilisearch: + image: getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} + env: + MEILI_MASTER_KEY: 'masterKey' + MEILI_NO_ANALYTICS: 'true' + ports: + - '7700:7700' steps: - name: Checkout uses: actions/checkout@v3 @@ -34,8 +41,6 @@ jobs: with: node-version: 16 cache: yarn - - name: Meilisearch (${{ needs.grep-docker-version.outputs.docker-version }}) setup with Docker - run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} meilisearch --master-key=masterKey --no-analytics - name: Install dependencies run: yarn --dev && yarn --cwd ./tests/env/react - name: Setup Meilisearch Index @@ -43,15 +48,16 @@ jobs: - name: Run local browser tests uses: cypress-io/github-action@v3 with: + wait-on: 'http://localhost:7700' # Tests are only done on one playground to avoid long testing time start: yarn local:env:react env: playground=local - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: failure() with: name: cypress-screenshots path: cypress/screenshots - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: failure() with: name: cypress-videos @@ -60,6 +66,14 @@ jobs: tests: runs-on: ubuntu-latest needs: ['grep-docker-version'] + services: + meilisearch: + image: getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} + env: + MEILI_MASTER_KEY: 'masterKey' + MEILI_NO_ANALYTICS: 'true' + ports: + - '7700:7700' strategy: fail-fast: false matrix: diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml index f11ee7ad..2808460d 100644 --- a/.github/workflows/pre-release-tests.yml +++ b/.github/workflows/pre-release-tests.yml @@ -11,21 +11,14 @@ on: jobs: cypress-run: runs-on: ubuntu-latest - # Only test on Google Chrome - container: cypress/browsers:node12.18.3-chrome87-ff82 steps: - name: Checkout uses: actions/checkout@v3 - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} - name: Setup node uses: actions/setup-node@v3 with: - node-version: '14.x' + node-version: 16 + cache: yarn - name: Install dependencies run: yarn --dev && yarn --cwd ./tests/env/react - name: Grep latest version of Meilisearch @@ -41,17 +34,18 @@ jobs: - name: Setup Meilisearch Index run: yarn local:env:setup - name: Run local browser tests - uses: cypress-io/github-action@v3 + uses: cypress-io/github-action@v2 with: + wait-on: 'http://localhost:7700' # Tests are only done on one playground to avoid long testing time start: yarn local:env:react env: playground=local - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: failure() with: name: cypress-screenshots path: cypress/screenshots - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: failure() with: name: cypress-videos @@ -66,12 +60,11 @@ jobs: name: integration-tests (Node.js ${{ matrix.node }}) steps: - uses: actions/checkout@v3 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Setup node + uses: actions/setup-node@v3 with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} + cache: yarn + node-version: ${{ matrix.node }} - name: Get the latest Meilisearch RC run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV - name: Meilisearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker @@ -82,43 +75,3 @@ jobs: run: yarn test - name: Build project run: yarn build - - style: - name: style-check - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} - - name: Install dependencies - run: yarn install - - name: Tests style - run: yarn lint - - name: Yaml Style - uses: ibiqlik/action-yamllint@v3 - with: - config_file: .yamllint.yml - types_test: - runs-on: ubuntu-latest - name: types-check - steps: - - uses: actions/checkout@v3 - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: | - ./node_modules - key: ${{ hashFiles('yarn.lock') }} - - name: Setup node - uses: actions/setup-node@v3 - - name: Install dependencies - run: yarn --dev - - name: Build project - run: yarn build - - name: Run types check - run: yarn types diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c65ccad6..ef4e5898 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,25 +10,14 @@ on: - main jobs: - grep-docker-version: - runs-on: ubuntu-latest - outputs: - docker-version: ${{ steps.grep-step.outputs.version }} - steps: - - uses: actions/checkout@v3 - - name: Grep docker beta version of Meilisearch - id: grep-step - run: | - echo ::set-output name=version::latest cypress-run: - needs: ['grep-docker-version'] + runs-on: ubuntu-latest # Will not run if the event is a PR to bump-meilisearch-v* (so a pre-release PR) # Will still run for each push to bump-meilisearch-v* if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v') - runs-on: ubuntu-latest services: meilisearch: - image: getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} + image: getmeili/meilisearch:latest env: MEILI_MASTER_KEY: 'masterKey' MEILI_NO_ANALYTICS: 'true' @@ -53,12 +42,12 @@ jobs: # Tests are only done on one playground to avoid long testing time start: yarn local:env:react env: playground=local - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: failure() with: name: cypress-screenshots path: cypress/screenshots - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: failure() with: name: cypress-videos From 90305fb6f6c41c2591a518824a1a67a3700b20e0 Mon Sep 17 00:00:00 2001 From: Charlotte Vermandel Date: Tue, 26 Jul 2022 20:05:07 +0200 Subject: [PATCH 5/5] Upgrade outdated typescript rollup plugin not compatible with node 17 > --- package.json | 2 +- yarn.lock | 98 +++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 57c62256..3ecf2afc 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "rollup-plugin-babel": "^4.4.0", "rollup-plugin-node-polyfills": "^0.2.1", "rollup-plugin-terser": "^7.0.0", - "rollup-plugin-typescript2": "^0.30.0", + "rollup-plugin-typescript2": "^0.32.1", "shx": "^0.3.3", "ts-jest": "^27.0.7", "tslib": "^2.4.0", diff --git a/yarn.lock b/yarn.lock index 68f2a630..583b045b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1496,10 +1496,10 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@rollup/pluginutils@^4.1.0": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.1.tgz#1d4da86dd4eded15656a57d933fda2b9a08d47ec" - integrity sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ== +"@rollup/pluginutils@^4.1.2": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" + integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== dependencies: estree-walker "^2.0.1" picomatch "^2.2.2" @@ -2623,7 +2623,7 @@ common-tags@^1.8.0: commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== concat-map@0.0.1: version "0.0.1" @@ -3672,10 +3672,10 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -find-cache-dir@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" - integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== +find-cache-dir@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== dependencies: commondir "^1.0.1" make-dir "^3.0.2" @@ -3732,14 +3732,14 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -fs-extra@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== +fs-extra@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" + jsonfile "^6.0.1" + universalify "^2.0.0" fs-extra@^9.1.0: version "9.1.0" @@ -3893,11 +3893,16 @@ globby@^11.0.3: merge2 "^1.3.0" slash "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: +graceful-fs@^4.1.2, graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -4172,9 +4177,9 @@ is-color-stop@^1.0.0: rgba-regex "^1.0.0" is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== dependencies: has "^1.0.3" @@ -4950,13 +4955,6 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -5579,11 +5577,16 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2: +picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.2.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + picomatch@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" @@ -6185,14 +6188,6 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@1.20.0, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - resolve@^1.1.6: version "1.21.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f" @@ -6202,6 +6197,14 @@ resolve@^1.1.6: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -6266,16 +6269,16 @@ rollup-plugin-terser@^7.0.0: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup-plugin-typescript2@^0.30.0: - version "0.30.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.30.0.tgz#1cc99ac2309bf4b9d0a3ebdbc2002aecd56083d3" - integrity sha512-NUFszIQyhgDdhRS9ya/VEmsnpTe+GERDMmFo0Y+kf8ds51Xy57nPNGglJY+W6x1vcouA7Au7nsTgsLFj2I0PxQ== +rollup-plugin-typescript2@^0.32.1: + version "0.32.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.32.1.tgz#470ded8e1965efac02043cc0ef4a7fa36bed83b9" + integrity sha512-RanO8bp1WbeMv0bVlgcbsFNCn+Y3rX7wF97SQLDxf0fMLsg0B/QFF005t4AsGUcDgF3aKJHoqt4JF2xVaABeKw== dependencies: - "@rollup/pluginutils" "^4.1.0" - find-cache-dir "^3.3.1" - fs-extra "8.1.0" - resolve "1.20.0" - tslib "2.1.0" + "@rollup/pluginutils" "^4.1.2" + find-cache-dir "^3.3.2" + fs-extra "^10.0.0" + resolve "^1.20.0" + tslib "^2.4.0" rollup-pluginutils@^2.8.1: version "2.8.2" @@ -6848,11 +6851,6 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -6968,7 +6966,7 @@ uniqs@^2.0.0: resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= -universalify@^0.1.0, universalify@^0.1.2: +universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==