Merge pull request #271 from wunderio/feature/updates-etc-again

Updates, various small improvements to configs etc

Author: vermario

.circleci/config.yml

@@ -145,7 +145,6 @@ commands:
             fi
 
             echo "export NEXT_PUBLIC_DRUPAL_BASE_URL=https://$drupal_domain" >> "$BASH_ENV"
-            echo "export NEXT_IMAGE_DOMAIN=$drupal_domain" >> "$BASH_ENV"
             echo "export NEXT_PUBLIC_FRONTEND_URL=https://$next_domain" >> "$BASH_ENV"
             echo "export AUTH_URL=https://$next_domain" >> "$BASH_ENV"
             echo "export DRUPAL_CLIENT_ID=$drupal_client_id" >> "$BASH_ENV"
@@ -160,7 +159,7 @@ commands:
 
             echo "Expanding special variable DRUPAL_CLIENT_ID = $drupal_client_id ..."
             sed -i -e "s/<|DRUPAL_CLIENT_ID|>/$drupal_client_id/g" $envvars_file
-            
+
             echo "Expanding special variable ES_HOST = $elasticsearch_host ..."
             sed -i -e "s/<|ES_HOST|>/$elasticsearch_host/g" $envvars_file
 

.ddev/config.yaml

@@ -33,7 +33,6 @@ web_environment:
   - ENVIRONMENT_NAME=ddev
   - HASH_SALT=notsosecurehashnotsosecurehashnotsosecurehash
   - NEXT_PUBLIC_DRUPAL_BASE_URL=https://next-drupal-starterkit.ddev.site
-  - NEXT_IMAGE_DOMAIN=next-drupal-starterkit.ddev.site
   - NEXT_PUBLIC_FRONTEND_URL=https://next-drupal-starterkit.ddev.site:3000
     # Environment variables for next_auth:
   - AUTH_SECRET=nextauth_secret_not_secure_used_only_locally

.lando.yml

@@ -135,7 +135,7 @@ services:
     globals:
       npm: latest
     overrides:
-      image: "cypress/included:cypress-13.6.4-node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1"
+      image: "cypress/included:cypress-13.15.1-node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1"
       ports:
         - "3000:3000"
         - "6006:6006"
@@ -152,10 +152,8 @@ services:
         DRUPAL_CLIENT_VIEWER_ID: drupal-client-viewer-id
         DRUPAL_CLIENT_VIEWER_SECRET: drupal_client_viewer_secret_not_secure_used_only_locally
         NEXT_PUBLIC_DRUPAL_BASE_URL: https://next-drupal-starterkit.lndo.site
-        NEXT_IMAGE_DOMAIN: next-drupal-starterkit.lndo.site
         NEXT_PUBLIC_FRONTEND_URL: https://frontend.lndo.site
         # Environment variables for next_auth:
-        # Environment variables for next_auth:
         AUTH_SECRET: nextauth_secret_not_secure_used_only_locally
         AUTH_TRUST_HOST: true
         AUTH_URL: https://frontend.lndo.site

next/.env.local.example

@@ -0,0 +1,14 @@
+##
+# This file contains env variables that are not generally required,
+# but can be useful for development and debugging.
+#
+# To use something in this file:
+#   1. Create a file .env.local with the same content as this one.
+#   2. Uncomment the variables you want to enable.
+##
+
+# Disable telemetry:
+# NEXT_TELEMETRY_DISABLED=1
+
+# Skip ESLint and TypeScript checks:
+# NEXT_BUILD_SKIP_CHECKS=1

next/.eslintrc.js

@@ -35,9 +35,10 @@ module.exports = {
         browser: true,
         node: true,
       },
-      plugins: ["n", "simple-import-sort"],
+      plugins: ["n", "simple-import-sort", "react", "@typescript-eslint"],
       extends: [
         "eslint:recommended",
+        "plugin:react/recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
         "next",
@@ -50,39 +51,25 @@ module.exports = {
         // Remove these if you want to enforce stricter rules.
         "@typescript-eslint/ban-ts-comment": "off",
         "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-non-null-assertion": "off",
         "@typescript-eslint/no-unsafe-argument": "off",
         "@typescript-eslint/no-unsafe-assignment": "off",
         "@typescript-eslint/no-unsafe-call": "off",
         "@typescript-eslint/no-unsafe-member-access": "off",
         "@typescript-eslint/no-unsafe-return": "off",
         "@typescript-eslint/restrict-template-expressions": "off",
-        "@typescript-eslint/no-empty-object-type": "off",
-        "@typescript-eslint/no-require-imports": "off",
-        "@typescript-eslint/no-unused-expressions": "off",
-        "@typescript-eslint/no-unused-vars": "off",
-        "@typescript-eslint/no-misused-promises": [
-          "error",
-          {
-            checksVoidReturn: {
-              attributes: false,
-            },
-          },
-        ],
 
         // Instead, `import { env } from "@/env"` to access environment variables.
         "n/no-process-env": ["error"],
 
-        "no-restricted-imports": [
+        // Allow unused variables only if they start with `_` or `err`.
+        "no-unused-vars": "off",
+        "@typescript-eslint/no-unused-vars": [
           "error",
           {
-            paths: [
-              // Restrict i18n imports to ensure SSR compatibility.
-              {
-                name: "react-i18next",
-                message: 'Import from "next-i18next" instead.',
-              },
-            ],
+            vars: "all",
+            varsIgnorePattern: "^_",
+            args: "after-used",
+            argsIgnorePattern: "^_|^err",
           },
         ],
 
@@ -96,9 +83,7 @@ module.exports = {
               // Packages. Put `next`/`react`-related packages first.
               ["^next", "^@next", "^react", "^@?\\w"],
               // Internal paths - change these to match your project structure defined in tsconfig.json.
-              ["^@/(components|lib|pages|styles|types)(/.*|$)"],
-              // UI library imports.
-              ["^@ui(/.*|$)"],
+              ["^@/(app|components|lib|pages|styles|types)(/.*|$)"],
               // Parent imports. Put `..` last.
               ["^\\.\\.(?!/?$)", "^\\.\\./?$"],
               // Other relative imports. Put same-folder imports and `.` last.

next/.gitignore

@@ -43,3 +43,6 @@ lerna-debug.log*
 # files generated by graphql-codegen
 /src/lib/gql
 /src/lib/graphql/schema.graphql
+
+# allow .env.local.example:
+!.env.local.example

next/.prettierrc

@@ -1 +1,5 @@
-{}
+{
+  "plugins": [
+    "prettier-plugin-tailwindcss"
+  ]
+}

next/codegen-access-token.ts

@@ -1,24 +1,23 @@
+/* eslint-disable n/no-process-env */
+/* eslint-disable @typescript-eslint/no-require-imports */
+
 /**
  * Gets an access token from Drupal and saves it the temporary directory,
  * so it can be used by graphql-codegen to authenticate to the Drupal GraphQL API.
  */
 void (async function getAndSaveAccessToken() {
   try {
-    /* eslint-disable @typescript-eslint/no-var-requires */
     const { loadEnvConfig } = require("@next/env");
     const fs = require("fs");
     const path = require("path");
     const os = require("os");
-    /* eslint-enable @typescript-eslint/no-var-requires */
 
     loadEnvConfig(process.cwd());
 
-    /* eslint-disable n/no-process-env */
     const oauthUrl = `${process.env.NEXT_PUBLIC_DRUPAL_BASE_URL}/oauth/token`;
     const credentials = Buffer.from(
       `${process.env.DRUPAL_CLIENT_ID}:${process.env.DRUPAL_CLIENT_SECRET}`,
     ).toString("base64");
-    /* eslint-enable n/no-process-env */
 
     const response = await fetch(oauthUrl, {
       method: "POST",

next/codegen.ts

@@ -1,3 +1,5 @@
+/* eslint-disable n/no-process-env */
+
 import { loadEnvConfig } from "@next/env";
 import type { CodegenConfig } from "@graphql-codegen/cli";
 import fs from "fs";
@@ -9,7 +11,6 @@ const token = fs.readFileSync(tokenFilePath, "utf8").trim();
 
 loadEnvConfig(process.cwd());
 
-/* eslint-disable-next-line n/no-process-env */
 const schemaUrl = `${process.env.NEXT_PUBLIC_DRUPAL_BASE_URL}/graphql`;
 
 const config: CodegenConfig = {

next/next.config.js next/next.config.mjsnext/next.config.js renamed to next/next.config.mjs

@@ -1,41 +1,58 @@
-const crypto = require("crypto");
+// @ts-check
+
+import { randomUUID } from "node:crypto";
+import createNextIntlPlugin from "next-intl/plugin";
 
-const createNextIntlPlugin = require("next-intl/plugin");
 const withNextIntl = createNextIntlPlugin();
 
+const imageHostname = String(process.env.NEXT_PUBLIC_DRUPAL_BASE_URL).split(
+  "://",
+)[1];
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  // Only generate standalone output in circle ci:
+  poweredByHeader: false,
   output: process.env.CIRCLECI ? "standalone" : undefined,
-  generateBuildId: async () => {
-    // This environment variable is set by CircleCI.
-    // adjust this to your needs if you use another CI/CD tool.
-    return process.env.CIRCLE_BUILD_NUM
-      ? `build-id-${process.env.CIRCLE_BUILD_NUM}`
-      : // If no build number is available, we generate a random build ID.
-        crypto.randomBytes(20).toString("hex");
-  },
+
   cacheHandler:
     // Only use the cache handler in production
     process.env.NODE_ENV === "production"
-      ? require.resolve("./cache-handler.mjs")
+      ? new URL("./cache-handler.mjs", import.meta.url).pathname
       : undefined,
   cacheMaxMemorySize: 0, // Disable in-memory cache
-  experimental: {
-    // This is required for the experimental feature of pre-populating the cache with the initial data
-    instrumentationHook: true,
-  },
-  poweredByHeader: false,
+
   images: {
     remotePatterns: [
       {
         protocol: "https",
-        hostname: process.env.NEXT_IMAGE_DOMAIN,
+        hostname: imageHostname,
         pathname: "**",
       },
     ],
   },
+
+  experimental: {
+    instrumentationHook: true,
+    swrDelta: 31536000, // 1 year
+  },
+
+  async generateBuildId() {
+    return process.env.CIRCLECI
+      ? String(process.env.CIRCLE_BUILD_NUM)
+      : randomUUID().split("-")[0];
+  },
+
+  async rewrites() {
+    return [
+      // Expose health check endpoint at /_ping:
+      {
+        source: "/_ping",
+        destination: "/api/health",
+      },
+    ];
+  },
+
   webpack(config) {
     // Grab the existing rule that handles SVG imports
     const fileLoaderRule = config.module.rules.find((rule) =>
@@ -57,9 +74,13 @@ const nextConfig = {
 
     return config;
   },
-  experimental: {
-    swrDelta: 31536000, // 1 year
+
+  eslint: {
+    ignoreDuringBuilds: Boolean(process.env.NEXT_BUILD_SKIP_CHECKS),
+  },
+  typescript: {
+    ignoreBuildErrors: Boolean(process.env.NEXT_BUILD_SKIP_CHECKS),
   },
 };
 
-module.exports = withNextIntl(nextConfig);
+export default withNextIntl(nextConfig);