Merge branch 'main' into production-deps-update

Author: candicecz

CHANGELOG.md

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

next-env.d.ts

@@ -3,10 +3,11 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "env-cmd -f .env.production yarn run generate-footer-content && yarn run generate-metadata-completeness-fields && yarn run generate-dataset-sitemaps && next build",
-    "build:staging": "env-cmd -f .env.staging yarn build",
-    "build:dev": "env-cmd -f .env.dev yarn build",
-    "postbuild": "env-cmd -f .env.production next-sitemap",
+    "build:core": "yarn generate-footer-content && yarn generate-metadata-completeness-fields && next build",
+    "build": "env-cmd -f .env.production yarn build:core",
+    "build:staging": "env-cmd -f .env.staging yarn build:core",
+    "build:dev": "env-cmd -f .env.dev  yarn build:core",
+    "postbuild": "env-cmd -f .env.production yarn generate-dataset-sitemaps && next-sitemap",
     "start": "next start",
     "lint": "next lint",
     "generate-schema-definitions": "env-cmd -f .env.production tsx scripts/generate-schema-definitions/index.ts",
@@ -18,24 +19,21 @@
     "release:minor": "standard-version --release-as minor",
     "release:patch": "standard-version --release-as patch",
     "release:major": "standard-version --release-as major",
-    "test": "npx jest"
+    "test": "jest",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@chakra-ui/react": "^2.10.7",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
-    "@next/third-parties": "^14.0.4",
+    "@next/third-parties": "^15.0.0",
     "@tanstack/react-query": "^5.51.11",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/react-hooks": "^8.0.1",
-    "@types/react-dom": "^18.2.4",
     "bottleneck": "^2.19.5",
     "framer-motion": "^10.18.0",
-    "next-sitemap": "^4.1.8",
     "next": "^15.4.7",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "next-sitemap": "^4.1.8",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-window": "^1.8.10"
   },
   "devDependencies": {
@@ -46,15 +44,19 @@
     "@emotion/babel-plugin": "^11.3.0",
     "@mdx-js/loader": "^2.3.0",
     "@mdx-js/react": "^2.3.0",
-    "@next/mdx": "^13.4.3",
+    "@next/mdx": "^15.0.0",
     "@react-spring/web": "^9.7.3",
     "@testing-library/dom": "^9.3.0",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^14.0.0",
+    "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.4.3",
     "@types/d3": "^7.4.0",
     "@types/d3-scale-chromatic": "^3.0.0",
     "@types/mdx": "^2.0.5",
     "@types/node": "^20.1.7",
-    "@types/react": "^18.2.6",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.3",
     "@types/react-window": "^1.8.8",
     "@types/styled-system": "^5.1.13",
     "@visx/annotation": "^3.12.0",
@@ -73,8 +75,8 @@
     "axios": "^1.12.0",
     "d3-scale-chromatic": "^3.0.0",
     "env-cmd": "^10.1.0",
-    "eslint": "7",
-    "eslint-config-next": "^13.2.1",
+    "eslint": "^9.0.0",
+    "eslint-config-next": "^15.0.0",
     "eslint-config-prettier": "^8.5.0",
     "fuse.js": "^6.6.2",
     "husky": "^8.0.3",
@@ -98,28 +100,13 @@
     "remark-gfm": "^3.0.1",
     "standard-version": "^9.5.0",
     "tsx": "^4.7.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.6.3",
     "unified": "^11.0.1",
     "usehooks-ts": "^3.0.2"
   },
   "resolutions": {
-    "@adobe/css-tools": "^4.3.2",
-    "@babel/helpers": "^7.26.10",
-    "@babel/runtime": "^7.26.10",
-    "brace-expansion": "^1.1.12",
-    "braces": "^3.0.3",
     "cookie": "^0.7.0",
-    "cross-spawn": "^7.0.5",
-    "esbuild": "^0.25.0",
-    "micromatch": "^4.0.8",
-    "nanoid": "^3.3.8",
-    "path-to-regexp": "^6.3.0",
-    "semver": "^7.5.2",
-    "tar-fs": "^3.1.1",
-    "tough-cookie": "^4.1.3",
-    "tmp": "0.2.4",
-    "ws": "^8.17.1",
-    "word-wrap": "^1.2.4"
+    "micromatch": "^4.0.8"
   },
   "version": "5.1.1"
 }

package.json

@@ -4,7 +4,7 @@ import { FaMagnifyingGlass } from 'react-icons/fa6';
 import { ScrollContainer } from 'src/components/scroll-container';
 import { TagWithUrl } from 'src/components/tag-with-url';
 
-interface SearchableItemsProps extends FlexProps {
+interface SearchableItemsProps extends Omit<FlexProps, 'onToggle'> {
   items: {
     name: string;
     value: string;

src/components/searchable-items/index.tsx

@@ -60,7 +60,9 @@ interface SelectProps extends UseDisclosureProps {
   onToggle: () => void;
 }
 
-interface SelectWithInputProps extends Omit<InputProps, 'id'>, SelectProps {
+interface SelectWithInputProps
+  extends Omit<InputProps, 'id' | 'onToggle'>,
+    SelectProps {
   ariaLabel: string;
 }
 
@@ -121,7 +123,9 @@ export const SelectWithInput: React.FC<SelectWithInputProps> = ({
   );
 };
 
-interface SelectWithButtonProps extends Omit<ButtonProps, 'id'>, SelectProps {}
+interface SelectWithButtonProps
+  extends Omit<ButtonProps, 'id' | 'onToggle'>,
+    SelectProps {}
 
 export const SelectWithButton: React.FC<SelectWithButtonProps> = ({
   children,

src/components/select/components/Select.tsx

@@ -57,6 +57,7 @@ const config = [
         },
       ];
     }),
+    tabIds: ['d'],
   } as FilterConfig,
 ];
 

src/views/search/components/filters/__tests__/hooks/useFilterQueries.test.tsx

@@ -8,7 +8,7 @@ import {
 } from 'react';
 import { useRouter } from 'next/router';
 import { defaultQuery } from '../config/defaultQuery';
-import { useSearchTabsContext } from './search-tabs-context';
+import { DEFAULT_TAB_ID, useSearchTabsContext } from './search-tabs-context';
 
 export type PaginationState = {
   from: number;
@@ -59,7 +59,7 @@ export const PaginationProvider = ({ children }: { children: ReactNode }) => {
     const urlFrom = parseInt(router.query.from as string);
     const urlSize = parseInt(router.query.size as string);
     const urlSort = router.query.sort as string;
-    const urlTab = router.query.tab as string;
+    const urlTab = (router.query.tab || DEFAULT_TAB_ID) as string;
 
     if (!isNaN(urlFrom) && urlTab) {
       setPaginationByTab(prev => ({

src/views/search/context/pagination-context.tsx

@@ -12,6 +12,8 @@ interface SearchContextValue {
   setFilters: (filters: Record<string, string[]>) => void;
 }
 
+export const DEFAULT_TAB_ID = tabs.find(t => t.isDefault)?.id || 'd';
+
 const SearchContext = createContext<SearchContextValue | undefined>(undefined);
 
 /**