Refactor cache handler imports and configuration

Author: better-salmon

.github/workflows/tests.yml

@@ -68,7 +68,7 @@ jobs:
       - name: Replace Path with Sed
         run: |
           if [ "${{ matrix.handler }}" == "redis-strings" ]; then
-            sed -i 's/cache-handler-redis-stack/cache-handler-redis-strings/g' apps/cache-testing/next.config.js
+            sed -i 's/cache-handler-redis-stack/cache-handler-redis-strings/g' apps/cache-testing/next.config.ts
             sed -i 's/cache-handler-redis-stack/cache-handler-redis-strings/g' apps/cache-testing/src/instrumentation.ts
           fi
 

.vscode/settings.json

@@ -5,19 +5,13 @@
     }
   ],
   "typescript.surveys.enabled": false,
+  "typescript.tsdk": "node_modules/typescript/lib",
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
     "*.ts": "$(capture).test.ts, $(capture).test.tsx",
     "*.tsx": "$(capture).test.ts, $(capture).test.tsx"
   },
   "cSpell.words": ["nextjs", "prerendered", "codestyle"],
-  "grammarly.selectors": [
-    {
-      "language": "markdown",
-      "scheme": "file"
-    }
-  ],
-  // "typescript.tsdk": "node_modules/typescript/lib",
   "editor.defaultFormatter": "biomejs.biome",
   "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -49,6 +43,5 @@
   },
   "[typescriptreact]": {
     "editor.defaultFormatter": "biomejs.biome"
-  },
-  "grammarly.files.include": ["**/*.md", "**/*.mdx"]
+  }
 }

apps/cache-testing/cache-handler-local.js

@@ -1,7 +1,7 @@
 // @ts-check
 
 import { CacheHandler } from '@neshca/cache-handler';
-import createLruHandler from '@neshca/cache-handler/local-lru';
+import createLruHandler from '@neshca/cache-handler/handlers/local-lru';
 
 CacheHandler.onCreation(() => {
   const localHandler = createLruHandler();

apps/cache-testing/cache-handler-next-example.cjs renamed to apps/cache-testing/cache-handler-next-example.js

@@ -1,6 +1,6 @@
 const cache = new Map();
 
-module.exports = class CacheHandler {
+export default class CacheHandler {
   constructor(options) {
     this.options = options;
   }
@@ -32,4 +32,4 @@ module.exports = class CacheHandler {
       }
     }
   }
-};
+}

apps/cache-testing/cache-handler-redis-stack.cjs

@@ -1,8 +1,8 @@
 // @ts-check
 
 import { CacheHandler } from '@neshca/cache-handler';
-import createLruHandler from '@neshca/cache-handler/local-lru';
-import createRedisHandler from '@neshca/cache-handler/redis-stack';
+import createLruHandler from '@neshca/cache-handler/handlers/local-lru';
+import createRedisHandler from '@neshca/cache-handler/handlers/redis-stack';
 import { createClient } from 'redis';
 
 CacheHandler.onCreation(async () => {

apps/cache-testing/cache-handler-redis-stack.js

@@ -1,7 +1,7 @@
 // @ts-check
 
 import { CacheHandler } from '@neshca/cache-handler';
-import createRedisHandler from '@neshca/cache-handler/redis-strings';
+import createRedisHandler from '@neshca/cache-handler/handlers/redis-strings';
 import { createClient } from 'redis';
 
 CacheHandler.onCreation(async () => {

apps/cache-testing/cache-handler-redis-strings.js

@@ -1,11 +1,9 @@
-// @ts-check
-
 import path from 'node:path';
+import type { NextConfig } from 'next/types';
 
 const cacheHandler = path.resolve('./cache-handler-redis-stack.js');
 
-/** @type {import('next').NextConfig} */
-const nextConfig = {
+const nextConfig: NextConfig = {
   poweredByHeader: false,
   reactStrictMode: true,
   output: 'standalone',

apps/cache-testing/next.config.js renamed to apps/cache-testing/next.config.ts

@@ -28,14 +28,14 @@
     "@playwright/test": "1.50.1",
     "@repo/eslint-config": "workspace:*",
     "@repo/typescript-config": "workspace:*",
-    "@types/node": "22.13.5",
+    "@types/node": "22.13.9",
     "@types/react": "19.0.10",
     "@types/react-dom": "19.0.4",
     "dotenv-cli": "8.0.0",
     "eslint": "9.21.0",
     "fastify": "5.2.1",
     "pm2": "5.4.3",
     "tsx": "4.19.3",
-    "typescript": "5.7.3"
+    "typescript": "5.8.2"
   }
 }

apps/cache-testing/package.json

@@ -1,7 +1,7 @@
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     const { registerInitialCache } = await import(
-      '@neshca/cache-handler/instrumentation'
+      '@neshca/cache-handler/instrumentation/register-initial-cache'
     );
     const CacheHandler = (await import('../cache-handler-redis-stack.js'))
       .default;