diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea17df1f..c12161d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,11 +10,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: lts/gallium - - uses: pnpm/action-setup@v2.2.4 name: Install pnpm id: pnpm-install @@ -22,18 +17,11 @@ jobs: version: 8 run_install: false - - name: Get pnpm store directory - id: pnpm-cache - run: | - echo "::set-output name=pnpm_cache_dir::$(pnpm store path)" - - - uses: actions/cache@v3 - name: Setup pnpm cache + - name: Install Node.js + uses: actions/setup-node@v3 with: - path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- + node-version: lts/gallium + cache: pnpm - name: Install dependencies run: pnpm install --frozen-lockfile diff --git a/package.json b/package.json index 2a708b85..29058238 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "license": "MIT", "dependencies": { "lodash.clonedeep": "^4.5.0", - "lru-cache": "~9.1.2" + "lru-cache": "^9.1.2" }, "devDependencies": { "@commitlint/cli": "17.6.5", @@ -53,7 +53,7 @@ "@types/node": "20.2.5", "@typescript-eslint/eslint-plugin": "5.59.9", "@typescript-eslint/parser": "5.59.9", - "@vitest/coverage-c8": "0.32.0", + "@vitest/coverage-v8": "0.32.0", "dotenv-cli": "7.2.1", "eslint": "8.42.0", "eslint-config-prettier": "8.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09088866..32eaa546 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,7 +9,7 @@ dependencies: specifier: ^4.5.0 version: 4.5.0 lru-cache: - specifier: ~9.1.2 + specifier: ^9.1.2 version: 9.1.2 devDependencies: @@ -37,7 +37,7 @@ devDependencies: '@typescript-eslint/parser': specifier: 5.59.9 version: 5.59.9(eslint@8.42.0)(typescript@5.1.3) - '@vitest/coverage-c8': + '@vitest/coverage-v8': specifier: 0.32.0 version: 0.32.0(vitest@0.32.0) dotenv-cli: @@ -979,17 +979,25 @@ packages: eslint-visitor-keys: 3.4.1 dev: true - /@vitest/coverage-c8@0.32.0(vitest@0.32.0): - resolution: {integrity: sha512-FeTzRN5VCL7B6YTRK5ZPQO2iwJzl2x7/mTQ/2uEeKZatAYBtvczeAYnzSUhCPev7p99+5skxMQZwqVcFTrVCdg==} + /@vitest/coverage-v8@0.32.0(vitest@0.32.0): + resolution: {integrity: sha512-VXXlWq9X/NbsoP/l/CHLBjutsFFww1UY1qEhzGjn/DY7Tqe+z0Nu8XKc8im/XUAmjiWsh2XV7sy/F0IKAl4eaw==} peerDependencies: - vitest: '>=0.30.0 <1' + vitest: '>=0.32.0 <1' dependencies: '@ampproject/remapping': 2.2.1 - c8: 7.14.0 + '@bcoe/v8-coverage': 0.2.3 + istanbul-lib-coverage: 3.2.0 + istanbul-lib-report: 3.0.0 + istanbul-lib-source-maps: 4.0.1 + istanbul-reports: 3.1.5 magic-string: 0.30.0 picocolors: 1.0.0 std-env: 3.3.3 + test-exclude: 6.0.0 + v8-to-istanbul: 9.1.0 vitest: 0.32.0 + transitivePeerDependencies: + - supports-color dev: true /@vitest/expect@0.32.0: @@ -1312,25 +1320,6 @@ packages: run-applescript: 5.0.0 dev: true - /c8@7.14.0: - resolution: {integrity: sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==} - engines: {node: '>=10.12.0'} - hasBin: true - dependencies: - '@bcoe/v8-coverage': 0.2.3 - '@istanbuljs/schema': 0.1.3 - find-up: 5.0.0 - foreground-child: 2.0.0 - istanbul-lib-coverage: 3.2.0 - istanbul-lib-report: 3.0.0 - istanbul-reports: 3.1.5 - rimraf: 3.0.2 - test-exclude: 6.0.0 - v8-to-istanbul: 9.1.0 - yargs: 16.2.0 - yargs-parser: 20.2.9 - dev: true - /cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} @@ -2441,14 +2430,6 @@ packages: is-callable: 1.2.7 dev: true - /foreground-child@2.0.0: - resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==} - engines: {node: '>=8.0.0'} - dependencies: - cross-spawn: 7.0.3 - signal-exit: 3.0.7 - dev: true - /form-data-encoder@2.1.4: resolution: {integrity: sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==} engines: {node: '>= 14.17'} @@ -3249,6 +3230,17 @@ packages: supports-color: 7.2.0 dev: true + /istanbul-lib-source-maps@4.0.1: + resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} + engines: {node: '>=10'} + dependencies: + debug: 4.3.4 + istanbul-lib-coverage: 3.2.0 + source-map: 0.6.1 + transitivePeerDependencies: + - supports-color + dev: true + /istanbul-reports@3.1.5: resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==} engines: {node: '>=8'} @@ -4570,6 +4562,7 @@ packages: /semver@5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} + hasBin: true dev: true /semver@6.3.0: