Merge a20f66a into stage

apps/decap/eslint.config.mjs

@@ -0,0 +1,15 @@
+import { defineConfig, frontend } from '@custom/eslint-config';
+
+export default defineConfig([
+  ...frontend,
+  {
+    ignores: [
+      'build/**',
+      'dist/**',
+      'node_modules/**',
+      'storybook-static/**',
+      'static/stories/webforms/**',
+      'vite.config.ts.**',
+    ],
+  },
+]);

apps/decap/package.json

@@ -8,7 +8,7 @@
     "prep:vite": "vite build",
     "prep:scripts": "tsup",
     "start": "GIT_REPO_DIRECTORY=../../ pnpm netlify-cms-proxy-server",
-    "test:static": "tsc --noEmit && eslint \"**/*.{ts,tsx,js,jsx}\" --ignore-path=\"./.eslintignore\"",
+    "test:static": "tsc --noEmit && eslint . --quiet",
     "test:unit": "vitest run --passWithNoTests"
   },
   "peerDependencies": {
@@ -36,15 +36,15 @@
   },
   "devDependencies": {
     "@amazeelabs/decap-cms-backend-token-auth": "^1.2.1",
+    "@custom/eslint-config": "workspace:*",
     "@types/node": "^18",
     "@types/react": "^18.2.46",
     "@types/react-dom": "^18.2.18",
-    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^6.17.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "netlify-cms-proxy-server": "^1.3.24",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.10"
+    "vite": "^5.0.10",
+    "vitest": "^1.1.1"
   }
 }

apps/decap/src/collections/page.ts

@@ -200,6 +200,7 @@ export const getPages: SilverbackSource<DecapPageSource> = () => {
     .forEach((file) => {
       const content = yaml.parse(fs.readFileSync(`${dir}/${file}`, 'utf-8'));
       const id = Object.values(content)
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .map((page: any) => page.id)
         .filter((id) => !!id)
         .pop();

apps/decap/src/helpers/preview.tsx

@@ -53,6 +53,7 @@ const responsiveImage: GraphQLFieldResolver<
 
 export async function query<TOperation extends AnyOperationId>(
   operation: TOperation,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   rootValue: any,
   variables: OperationVariables<TOperation> = {},
   getAssetUrl: (path: string) => string,
@@ -86,6 +87,7 @@ export async function query<TOperation extends AnyOperationId>(
 
 export function useQuery<TOperation extends AnyOperationId>(
   operation: TOperation,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   rootValue: any,
   variables: OperationVariables<TOperation> = {},
   getAssetUrl: (path: string) => string,
@@ -116,6 +118,7 @@ export type useQueryType = typeof useQuery;
 
 export function createPreview<TOperation extends AnyOperationId>(
   query: TOperation,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   schema: ZodType<any, ZodTypeDef, unknown>,
   Component: React.FC<{
     preview: Exclude<OperationResult<TOperation>['preview'], undefined>;
@@ -151,7 +154,7 @@ export function createPreview<TOperation extends AnyOperationId>(
         {data?.preview ? (
           <Component preview={data.preview} />
         ) : (
-          <div className="flex flex-col items-center mb-8 pt-12 pb-36">
+          <div className="mb-8 flex flex-col items-center pb-36 pt-12">
             <p>Loading...</p>
             <p>Please make sure all required fields are filled.</p>
           </div>

apps/decap/src/main.tsx

@@ -7,7 +7,7 @@ import {
 } from '@custom/schema';
 import { Page } from '@custom/ui/routes/Page';
 import CMS from 'decap-cms-app';
-import { InitOptions } from 'decap-cms-core';
+import { CmsBackendType, InitOptions } from 'decap-cms-core';
 
 import css from '../node_modules/@custom/ui/build/styles.css?raw';
 import { PageCollection, pageSchema } from './collections/page';
@@ -37,7 +37,6 @@ const cmsConfig: InitOptions = {
     load_config_file: false,
     publish_mode: 'editorial_workflow',
     media_folder: 'apps/decap/media',
-    // @ts-ignore
     backend: import.meta.env.DEV
       ? {
           // In development, use the in-memory backend.
@@ -53,7 +52,7 @@ const cmsConfig: InitOptions = {
           }
         : {
             // Otherwise, its production. Use the token auth backend.
-            name: 'token-auth',
+            name: 'token-auth' as CmsBackendType,
             api_root: '/.netlify/functions/github-proxy',
             repo: import.meta.env.VITE_DECAP_REPO,
             branch: import.meta.env.VITE_DECAP_BRANCH,

apps/preview/eslint.config.mjs

@@ -0,0 +1,8 @@
+import { defineConfig, frontend } from '@custom/eslint-config';
+
+export default defineConfig([
+  ...frontend,
+  {
+    ignores: ['build/**', 'dist/**', 'vite.config.ts.**'],
+  },
+]);

apps/preview/package.json

@@ -4,14 +4,15 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "test:static": "tsc --noEmit && eslint \"**/*.{ts,tsx,js,jsx}\" --ignore-path=\"./.gitignore\"",
+    "test:static": "tsc --noEmit && eslint . --quiet",
     "dev:app": "vite",
     "dev:server": "tsx watch server/index.ts",
     "prep:app": "vite build",
     "prep:server": "swc ./server -d ./build",
     "start": "node build/index.js"
   },
   "dependencies": {
+    "@custom/eslint-config": "workspace:*",
     "@custom/schema": "workspace:*",
     "@custom/ui": "workspace:*",
     "cookie-parser": "^1.4.6",
@@ -37,12 +38,7 @@
     "@types/react": "^18.2.46",
     "@types/react-dom": "^18.2.18",
     "@types/simple-oauth2": "^5.0.7",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.6",
     "tsx": "^4.7.1",
     "typescript": "^5.2.2",
     "vite": "^5.2.0"

apps/preview/server/index.ts

@@ -115,8 +115,10 @@ app.get('/oauth/callback', async (req, res) => {
   };
 
   try {
-    // @ts-ignore options due to missing redirect_uri.
-    const accessToken = await client.getToken(options);
+    const accessToken = await client.getToken(
+      // @ts-expect-error Missing redirect_uri.
+      options,
+    );
     console.log('/oauth/callback accessToken', accessToken);
     persistAccessToken(accessToken, req);
 
@@ -127,12 +129,9 @@ app.get('/oauth/callback', async (req, res) => {
     }
   } catch (error) {
     console.error(error);
-    return (
-      res
-        .status(500)
-        // @ts-ignore
-        .json(`Authentication failed with error: ${error.message}`)
-    );
+    return res
+      .status(500)
+      .json(`Authentication failed with error: ${error.message}`);
   }
 });
 

apps/preview/server/utils/oAuth2.ts

@@ -89,7 +89,7 @@ export const initializeSession = (server: Express): void => {
   const sessionMaxAgeInMilliseconds = SESSION_MAX_AGE * 1000;
   const MemoryStore = createMemoryStore(session);
 
-  const config = {
+  const config: Parameters<typeof session>[0] = {
     secret:
       oAuth2Config.sessionSecret || crypto.randomBytes(64).toString('hex'),
     resave: true, // seems to be needed for MemoryStore
@@ -106,7 +106,6 @@ export const initializeSession = (server: Express): void => {
 
   if (oAuth2Config.environmentType === 'production') {
     server.set('trust proxy', 1); // trust first proxy
-    // @ts-ignore
     config.cookie.secure = true; // serve secure cookies
   }
 
@@ -172,6 +171,7 @@ const encrypt = (text: string): string => {
     let encrypted = cipher.update(text);
     encrypted = Buffer.concat([encrypted, cipher.final()]);
     return iv.toString('hex') + ':' + encrypted.toString('hex');
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (error) {
     throw new Error('Encryption failed.');
   }
@@ -184,7 +184,6 @@ const decrypt = (encryptedText: string): string => {
 
   try {
     const textParts = encryptedText.split(':');
-    // @ts-ignore
     const iv = Buffer.from(textParts.shift(), 'hex');
 
     const encryptedData = Buffer.from(textParts.join(':'), 'hex');
@@ -198,6 +197,7 @@ const decrypt = (encryptedText: string): string => {
     const decrypted = decipher.update(encryptedData);
     const decryptedText = Buffer.concat([decrypted, decipher.final()]);
     return decryptedText.toString();
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (error) {
     throw new Error('Decryption failed.');
   }

apps/preview/src/App.tsx

@@ -13,7 +13,9 @@ declare global {
   }
 }
 
-const updates$ = webSocket<any>({
+type PreviewRefresh = Parameters<ReturnType<typeof usePreviewRefresh>>[0];
+
+const updates$ = webSocket<PreviewRefresh>({
   url: `${window.location.origin.replace('http', 'ws')}/__preview`,
 }).pipe(
   retry({

apps/publisher/eslint.config.mjs

@@ -0,0 +1,3 @@
+import { base, defineConfig } from '@custom/eslint-config';
+
+export default defineConfig([...base]);

apps/publisher/package.json

@@ -5,11 +5,13 @@
     "@amazeelabs/publisher": "^2.5.5"
   },
   "scripts": {
-    "test:static": "tsc --noEmit && eslint '**/*.{ts,tsx,js,jsx}' --ignore-path='./.gitignore'",
+    "test:static": "tsc --noEmit && eslint . --quiet",
     "dev": "cd ../website && pnpm clean && cd - && publisher",
     "open": "open http://127.0.0.1:8000/___status/"
   },
   "devDependencies": {
-    "@types/node": "^18"
+    "@custom/eslint-config": "workspace:*",
+    "@types/node": "^18",
+    "typescript": "^5.3.3"
   }
 }