Skip to content

Commit 11e2b71

Browse files
authored
Merge branch 'main' into fix/broken-map-marker-images
2 parents c9d490a + 1091cfd commit 11e2b71

File tree

81 files changed

+813
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+813
-729
lines changed

.eslintrc.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

eslint.config.mjs

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import { defineConfig } from 'eslint/config';
2+
import path from 'node:path';
3+
import { fileURLToPath } from 'node:url';
4+
import js from '@eslint/js';
5+
import { FlatCompat } from '@eslint/eslintrc';
6+
7+
const __filename = fileURLToPath(import.meta.url);
8+
const __dirname = path.dirname(__filename);
9+
const compat = new FlatCompat({
10+
baseDirectory: __dirname,
11+
recommendedConfig: js.configs.recommended,
12+
allConfig: js.configs.all,
13+
});
14+
15+
export default defineConfig([
16+
{
17+
extends: compat.extends('next/core-web-vitals', 'next/typescript'),
18+
19+
rules: {
20+
'react/no-unescaped-entities': 'off',
21+
'@next/next/no-html-link-for-pages': 'warn',
22+
'@typescript-eslint/no-unused-vars': [
23+
'warn',
24+
{
25+
varsIgnorePattern: '^_',
26+
argsIgnorePattern: '^_',
27+
caughtErrorsIgnorePattern: '^_|^error$|^e$',
28+
},
29+
],
30+
},
31+
},
32+
{
33+
ignores: [
34+
'node_modules/**',
35+
'.next/**',
36+
'out/**',
37+
'build/**',
38+
'next-env.d.ts',
39+
'.netlify/**',
40+
'netlify/**',
41+
],
42+
},
43+
]);

next.config.mjs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,16 @@ const __filename = fileURLToPath(import.meta.url); // get the resolved path to t
110110
const __dirname = path.dirname(__filename);
111111

112112
const nextConfig = {
113+
reactStrictMode: true,
113114
sassOptions: {
114115
includePaths: [path.join(__dirname, 'node_modules')],
116+
silenceDeprecations: [
117+
'abs-percent',
118+
'color-functions',
119+
'color-module-compat',
120+
'import',
121+
'legacy-js-api',
122+
],
115123
},
116124
pageExtensions: ['js', 'jsx', 'md', 'mdx', 'ts', 'tsx'],
117125
async headers() {

package.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "my-app",
2+
"name": "virtualcoffeeio",
33
"version": "0.1.0",
44
"private": true,
55
"engines": {
@@ -9,8 +9,8 @@
99
"scripts": {
1010
"preinstall": "npx only-allow pnpm",
1111
"format": "npx prettier --write --ignore-unknown --list-different \"**/*\"",
12-
"lint": "next lint",
13-
"build-member-files": "node scripts/loadMemberFiles.js",
12+
"lint": "eslint",
13+
"build-member-files": "tsx scripts/loadMemberFiles.js",
1414
"local-dev": "cross-env NODE_ENV=development pnpm netlify dev",
1515
"build": "next build",
1616
"start": "next start",
@@ -22,32 +22,34 @@
2222
"build-member-files": "src/content/members/**/*.ts"
2323
},
2424
"dependencies": {
25+
"@eslint/eslintrc": "^3.3.1",
26+
"@eslint/js": "^9.37.0",
2527
"@heroicons/react": "^2.2.0",
2628
"@imgix/js-core": "^3.8.0",
2729
"@mdx-js/loader": "^3.1.1",
2830
"@mdx-js/react": "^3.1.1",
29-
"@next/mdx": "15.5.4",
31+
"@next/mdx": "15.5.5",
3032
"@sindresorhus/slugify": "^2.2.1",
3133
"@types/mdx": "^2.0.13",
3234
"airtable": "^0.12.2",
3335
"bootstrap": "^4.6.2",
3436
"calendar-link": "^2.11.0",
3537
"front-matter": "^4.0.2",
3638
"graphql": "^16.11.0",
37-
"graphql-request": "^6.1.0",
39+
"graphql-request": "^7.2.0",
3840
"hast-util-to-string": "^2.0.0",
3941
"hastscript": "^8.0.0",
4042
"leaflet": "^1.9.4",
4143
"leaflet.markercluster": "^1.5.3",
4244
"luxon": "^3.7.2",
4345
"markdown-it": "^13.0.2",
4446
"mdast-util-toc": "^7.1.0",
45-
"next": "15.5.4",
47+
"next": "15.5.5",
4648
"npm-watch": "^0.13.0",
47-
"react": "19.1.1",
48-
"react-dom": "19.1.1",
49-
"react-leaflet-cluster": "^3.1.1",
49+
"react": "19.2.0",
50+
"react-dom": "19.2.0",
5051
"react-leaflet": "^5.0.0",
52+
"react-leaflet-cluster": "^3.1.1",
5153
"rehype-autolink-headings": "^6.1.1",
5254
"rehype-highlight": "^6.0.0",
5355
"rehype-sanitize": "^5.0.1",
@@ -62,26 +64,26 @@
6264
"unified": "^10.1.2"
6365
},
6466
"devDependencies": {
65-
"@faker-js/faker": "^8.4.1",
66-
"@netlify/functions": "^2.8.2",
67+
"@faker-js/faker": "^10.0.0",
6768
"@netlify/plugin-nextjs": "^5.13.5",
68-
"@types/leaflet": "^1.9.20",
69+
"@types/leaflet": "^1.9.21",
6970
"@types/leaflet.markercluster": "^1.5.6",
7071
"@types/luxon": "^3.7.1",
71-
"@types/node": "^24.7.0",
72+
"@types/node": "^24.7.2",
7273
"@types/react": "^19.2.2",
73-
"@types/react-dom": "^19.2.1",
74+
"@types/react-dom": "^19.2.2",
7475
"@types/require-dir": "^1.0.4",
7576
"@types/sanitize-html": "^2.16.0",
7677
"all-contributors-cli": "^6.26.1",
7778
"concurrently": "^9.2.1",
78-
"cross-env": "^7.0.3",
79+
"cross-env": "^10.1.0",
7980
"esbuild": "^0.25.10",
80-
"eslint": "^8.57.1",
81-
"eslint-config-next": "15.5.4",
81+
"eslint": "^9.37.0",
82+
"eslint-config-next": "15.5.5",
8283
"netlify-cli": "^23.9.1",
8384
"postcss": "^8.5.6",
8485
"prettier": "^3.6.2",
86+
"sass": "^1.93.2",
8587
"tailwindcss": "^3.4.18",
8688
"tsx": "^4.20.6",
8789
"typescript": "^5.9.3"

0 commit comments

Comments
 (0)