ci: fix vitest cacheDir

hyperse-io · May 23, 2024 · 09e66aa · 09e66aa
1 parent 3379b95
commit 09e66aa
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 43 deletions.
diff --git a/.github/workflows/ci-next-auth.yml b/.github/workflows/ci-next-auth.yml
@@ -53,11 +53,6 @@ jobs:
       - name: 📥 Monorepo install
         uses: ./.github/actions/yarn-nm-install
 
-      - name: Patch next typings
-        working-directory: './'
-        run: |
-          yarn patch-package
-
       - name: Typecheck
         working-directory: packages/next-auth
         run: |

diff --git a/.github/workflows/release-or-version-pr.yml b/.github/workflows/release-or-version-pr.yml
@@ -27,11 +27,6 @@ jobs:
       - name: 📥 Monorepo install
         uses: ./.github/actions/yarn-nm-install
 
-      - name: Patch next typings
-        working-directory: './'
-        run: |
-          yarn patch-package
-
       # @link https://github.com/changesets/action
       - name: Create Release Pull Request or Publish to npm
         id: changesets

diff --git a/package.json b/package.json
@@ -45,8 +45,7 @@
     "deps:update": "yarn dlx npm-check-updates@latest --configFileName .ncurc.json -u --deep --mergeConfig",
     "check:install": "yarn dlx @yarnpkg/[email protected] .",
     "install:playwright": "npx playwright install",
-    "postinstall": "is-ci || yarn husky",
-    "patch-package": "patch-package"
+    "postinstall": "is-ci || yarn husky"
   },
   "config": {
     "commitizen": {

diff --git a/packages/next-auth/vitest.config.ts b/packages/next-auth/vitest.config.ts
@@ -3,15 +3,13 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   plugins: [tsConfigPaths()],
+  cacheDir: '../../.cache/vitest/next-auth',
   test: {
     // Makebe suite for local debug
     testTimeout: 1000 * 30,
     globals: true,
     environment: 'node',
     passWithNoTests: true,
-    cache: {
-      dir: '../../.cache/vitest/next-auth',
-    },
     coverage: {
       provider: 'istanbul',
       reporter: ['json-summary', 'html'],

diff --git a/packages/next-core/vitest.config.ts b/packages/next-core/vitest.config.ts
@@ -3,15 +3,13 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   plugins: [tsConfigPaths()],
+  cacheDir: '../../.cache/vitest/next-core',
   test: {
     // Makebe suite for local debug
     testTimeout: 1000 * 30,
     globals: true,
     environment: 'node',
     passWithNoTests: true,
-    cache: {
-      dir: '../../.cache/vitest/next-core',
-    },
     coverage: {
       provider: 'istanbul',
       reporter: ['json-summary', 'html'],

diff --git a/packages/next-demo/vitest.config.ts b/packages/next-demo/vitest.config.ts
@@ -7,13 +7,11 @@ export default defineConfig({
   resolve: {
     alias: [],
   },
+  cacheDir: '../../.cache/vitest/next-demo',
   test: {
     setupFiles: 'dotenv/config',
     globals: true,
     exclude: [...configDefaults.exclude, '**/playwright/**'],
-    cache: {
-      dir: '../../.cache/vitest/next-demo',
-    },
     alias: {
       '@/': fileURLToPath(new URL('./src/', import.meta.url)),
     },

diff --git a/packages/next-env/vitest.config.ts b/packages/next-env/vitest.config.ts
@@ -3,15 +3,13 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   plugins: [tsConfigPaths()],
+  cacheDir: '../../.cache/vitest/next-env',
   test: {
     // Makebe suite for local debug
     testTimeout: 1000 * 30,
     globals: true,
     environment: 'node',
     passWithNoTests: true,
-    cache: {
-      dir: '../../.cache/vitest/next-env',
-    },
     coverage: {
       provider: 'istanbul',
       reporter: ['json-summary', 'html'],

diff --git a/packages/next-graphql/vitest.config.ts b/packages/next-graphql/vitest.config.ts
@@ -3,15 +3,13 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   plugins: [tsConfigPaths()],
+  cacheDir: '../../.cache/vitest/next-graphql',
   test: {
     // Makebe suite for local debug
     testTimeout: 1000 * 30,
     globals: true,
     environment: 'node',
     passWithNoTests: true,
-    cache: {
-      dir: '../../.cache/vitest/next-graphql',
-    },
     coverage: {
       provider: 'istanbul',
       reporter: ['json-summary', 'html'],

diff --git a/packages/next-prisma/vitest.config.ts b/packages/next-prisma/vitest.config.ts
@@ -3,15 +3,13 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   plugins: [tsConfigPaths()],
+  cacheDir: '../../.cache/vitest/next-prisma',
   test: {
     // Makebe suite for local debug
     testTimeout: 1000 * 30,
     globals: true,
     environment: 'node',
     passWithNoTests: true,
-    cache: {
-      dir: '../../.cache/vitest/next-prisma',
-    },
     coverage: {
       provider: 'istanbul',
       reporter: ['json-summary', 'html'],

diff --git a/patches/next+14.0.3.patch b/patches/next+14.0.3.patch