Migrate cache-testing app to module type

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.mjs
+            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/src/instrumentation.ts
           fi
 

apps/cache-testing/cache-handler-local.mjs renamed to apps/cache-testing/cache-handler-local.js

@@ -1,9 +1,9 @@
 // @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 { createClient } from 'redis';
+const { CacheHandler } = require('@neshca/cache-handler');
+const createLruHandler = require('@neshca/cache-handler/local-lru').default;
+const createRedisHandler = require('@neshca/cache-handler/redis-stack').default;
+const { createClient } = require('redis');
 
 CacheHandler.onCreation(async () => {
   if (!process.env.REDIS_URL) {
@@ -86,4 +86,4 @@ CacheHandler.onCreation(async () => {
   };
 });
 
-export default CacheHandler;
+module.exports = CacheHandler;

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

@@ -1,9 +1,9 @@
 // @ts-check
 
-const { CacheHandler } = require('@neshca/cache-handler');
-const createLruHandler = require('@neshca/cache-handler/local-lru').default;
-const createRedisHandler = require('@neshca/cache-handler/redis-stack').default;
-const { createClient } = require('redis');
+import { CacheHandler } from '@neshca/cache-handler';
+import createLruHandler from '@neshca/cache-handler/local-lru';
+import createRedisHandler from '@neshca/cache-handler/redis-stack';
+import { createClient } from 'redis';
 
 CacheHandler.onCreation(async () => {
   if (!process.env.REDIS_URL) {
@@ -86,4 +86,4 @@ CacheHandler.onCreation(async () => {
   };
 });
 
-module.exports = CacheHandler;
+export default CacheHandler;

apps/cache-testing/cache-handler-redis-stack.mjs renamed to apps/cache-testing/cache-handler-redis-stack.cjs

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   apps: [
     {
       name: 'app',

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

@@ -0,0 +1,67 @@
+import { cp, mkdir, readdir } from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const currentDir = path.dirname(fileURLToPath(import.meta.url));
+
+// Set common paths
+const STANDALONE_DIR = path.join(currentDir, '.next/standalone');
+const APP_DIR = path.join(STANDALONE_DIR, 'apps/cache-testing');
+const PUBLIC_DIR = path.join(currentDir, 'public');
+const STATIC_DIR = path.join(currentDir, '.next/static');
+const FETCH_CACHE_DIR = path.join(currentDir, '.next/cache/fetch-cache');
+const INSTANCES_DIR = path.join(currentDir, '.next/__instances');
+
+async function copyDir(src: string, dest: string) {
+  try {
+    await cp(src, dest, { recursive: true });
+  } catch (error) {
+    console.error(`Failed to copy from ${src} to ${dest}:`, error);
+    process.exit(1);
+  }
+}
+
+async function createInstanceDir(port: string) {
+  try {
+    await mkdir(path.join(INSTANCES_DIR, port), { recursive: true });
+  } catch (error) {
+    console.error(
+      `Failed to create ${path.join(INSTANCES_DIR, port)} directory:`,
+      error,
+    );
+    process.exit(1);
+  }
+}
+
+// Copy public directory to standalone app directory
+await copyDir(PUBLIC_DIR, path.join(APP_DIR, 'public'));
+
+// Copy static directory to standalone app/.next directory
+await copyDir(STATIC_DIR, path.join(APP_DIR, '.next/static'));
+
+try {
+  // Copy fetch cache directory to standalone app/.next directory
+  await mkdir(path.join(APP_DIR, '.next/cache/fetch-cache'), {
+    recursive: true,
+  });
+
+  const files = await readdir(FETCH_CACHE_DIR);
+
+  if (files.length > 0) {
+    await copyDir(
+      FETCH_CACHE_DIR,
+      path.join(APP_DIR, '.next/cache/fetch-cache'),
+    );
+  }
+} catch (_error) {
+  // Ignore errors - directory might not exist or be empty
+  console.error('No fetch cache files to copy');
+}
+
+// Create instance directories
+await createInstanceDir('3000');
+await createInstanceDir('3001');
+
+// Copy files from standalone directory to instance directories
+await copyDir(path.join(STANDALONE_DIR, '.'), path.join(INSTANCES_DIR, '3000'));
+await copyDir(path.join(STANDALONE_DIR, '.'), path.join(INSTANCES_DIR, '3001'));

apps/cache-testing/cache-handler-redis-strings.mjs renamed to apps/cache-testing/cache-handler-redis-strings.js

@@ -2,7 +2,7 @@
 
 import path from 'node:path';
 
-const cacheHandler = path.resolve('./cache-handler-redis-stack.mjs');
+const cacheHandler = path.resolve('./cache-handler-redis-stack.js');
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {