Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ft/upgrade next to 15 #1001

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5f145b1
Upgrade Next JS
koechkevin Nov 11, 2024
deded81
Update ESLINT
koechkevin Nov 13, 2024
f9a4d16
Upgrade ESlint
koechkevin Nov 14, 2024
48e7f42
fix: Update eslint config to treat unused vars as errors and ignore u…
koechkevin Nov 15, 2024
786c674
Merge branch 'main' into ft/upgrade_next_to_15
koechkevin Nov 26, 2024
fc768f5
Fix eslint
koechkevin Nov 26, 2024
993cdc0
Update package-lock
koechkevin Nov 26, 2024
7296b99
Fixed relative imports
koechkevin Nov 27, 2024
96ce1ee
Undo edited chunks
koechkevin Nov 27, 2024
0373e1b
Retained exhaustive dependancies react hook waring
koechkevin Nov 27, 2024
4d81d4f
Reverted run_time_configs
koechkevin Nov 27, 2024
fef32c5
FIxed root config
koechkevin Nov 27, 2024
65ca9c4
chore: Update testing-library config to use flat/react and disable re…
koechkevin Nov 27, 2024
21a2185
chore: Update eslint config and fix relative imports
koechkevin Dec 2, 2024
b0ef845
chore: Update eslint config and fix relative imports
koechkevin Dec 3, 2024
f545563
chore: Update eslint config and dependencies for @eslint/eslintrc and…
koechkevin Dec 3, 2024
163097c
chore: Remove unused ESLint configuration and add eslint-plugin-react…
Dec 4, 2024
5d0f073
chore: Disable react-hooks/exhaustive-deps rule in ESLint configuration
Dec 4, 2024
eb417e0
chore: Update lint command to use next lint for fixing issues
Dec 4, 2024
c94b98f
chore: Remove obsolete ESLint configuration files across multiple app…
Dec 5, 2024
d9bbe3f
Merge branch 'main' into ft/upgrade_next_to_15
Dec 6, 2024
79be8ce
chore: Remove obsolete ESLint configuration files and update eslint c…
koechkevin Dec 9, 2024
897d7c8
use pnpm eslint
koechkevin Dec 13, 2024
9ae1a66
chore: update linting commands and streamline ESLint configuration ac…
Dec 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
39 changes: 0 additions & 39 deletions apps/charterafrica/.eslintignore

This file was deleted.

11 changes: 0 additions & 11 deletions apps/charterafrica/.eslintrc.js

This file was deleted.

38 changes: 38 additions & 0 deletions apps/charterafrica/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
const eslintConfig = require("eslint-config-commons-ui/next");

module.exports = [
{
ignores: [
"**/node_modules",
"**/.pnp",
"**/.pnp.js",
"**/.pnpm-debug.log",
"**/dist/",
"**/coverage",
"**/.next/",
"**/out/",
"**/build/",
"**/.DS_Store",
"**/*.pem",
"**/npm-debug.log*",
"**/yarn-debug.log*",
"**/yarn-error.log*",
"**/.vercel",
"**/.now",
"**/.turbo",
"**/test-results/",
"**/playwright-report/",
"**/public/",
],
},
{
settings: {
"import/resolver": {
webpack: {
config: "./eslint.webpack.config.js",
},
},
},
},
...eslintConfig,
];
1 change: 0 additions & 1 deletion apps/charterafrica/playwright.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable import/no-extraneous-dependencies */
const defaultConfig = require("playwright-config-commons-ui");

const { use, webServer } = defaultConfig;
Expand Down
14 changes: 7 additions & 7 deletions apps/charterafrica/public/infographic/run_time_config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
window.data_file = './data/data.json';
window.data_country_file = './data/countries.json';
const s = document.createElement('script');
const n = document.getElementsByTagName('script')[0];
s.async = 1;
s.src = './static/js/bundle.js';
n.parentNode.insertBefore(s, n);
window.data_file = './data/data.json';
window.data_country_file = './data/countries.json';
const s = document.createElement('script');
const n = document.getElementsByTagName('script')[0];
s.async = 1;
s.src = './static/js/bundle.js';
n.parentNode.insertBefore(s, n);
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Accordion from "./Accordion";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion apps/charterafrica/src/components/Articles/Articles.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const Articles = React.forwardRef(function Articles(props, ref) {
undefined,
{ scroll: false, shallow: true },
);
// eslint-disable-next-line react-hooks/exhaustive-deps
/* eslint react-hooks/exhaustive-deps: "off" */
koechkevin marked this conversation as resolved.
Show resolved Hide resolved
}, [query]);

if (filtering && articlesRef.current) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Articles from "./Articles";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const ArticlesFilterBar = React.forwardRef(
}
// We're only interested in initial isReady and not any subsequent
// router.query changes e.g. due to search
// eslint-disable-next-line react-hooks/exhaustive-deps
/* eslint react-hooks/exhaustive-deps: "off" */
}, [router.isReady]);

const handleChangeQ = (e, value) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import BackgroundBox from "./BackgroundBox";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import ComboBox from "./ComboBox";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Comments from "./Comments";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import CommunityPlatforms from "./CommunityPlatforms";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Consultations from "./Consultations";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import ContributorCard from "./ContributorCard";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
1 change: 0 additions & 1 deletion apps/charterafrica/src/components/Dataset/Dataset.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Dataset from "./Dataset";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import DatasetCard from "./DatasetCard";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import DatasetFilterBar from "./DatasetFilterBar";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion apps/charterafrica/src/components/Datasets/Datasets.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const Datasets = React.forwardRef(function Datasets(
scroll: false,
shallow: true,
});
// eslint-disable-next-line react-hooks/exhaustive-deps
/* eslint react-hooks/exhaustive-deps: "off" */
}, [query]);

if (filtering && datasetsRef.current) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Datasets from "./Datasets";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import DesktopNavBar from "./DesktopNavBar";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Document from "./Document";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import DocumentCard from "./DocumentCard";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import DocumentFilterBar from "./DocumentFilterBar";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Documents from "./Documents";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import DropdownMenu from "./DropdownMenu";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Ecosystem from "./Ecosystem";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
1 change: 0 additions & 1 deletion apps/charterafrica/src/components/Entity/Entity.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Entity from "./Entity";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
1 change: 0 additions & 1 deletion apps/charterafrica/src/components/Error/Error.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Error from "./Error";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import ErrorPage from "./ErrorPage";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Explainer from "./Explainer";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Explainers from "./Explainers";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
1 change: 0 additions & 1 deletion apps/charterafrica/src/components/FAQ/FAQ.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import FAQ from "./FAQ";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import FeaturedPostCard from "./FeaturedPostCard";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import FeaturedVideos from "./FeaturedVideos";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import FeaturedVideoCard from "./FeaturedVideoCard";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import FlourishChart from "./FlourishChart";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import FocalCountries from "./FocalCountries";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
1 change: 0 additions & 1 deletion apps/charterafrica/src/components/Footer/Footer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Footer from "./Footer";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Grantees from "./Grantees";

import theme from "@/charterafrica/theme";

// eslint-disable-next-line testing-library/render-result-naming-convention
const render = createRender({ theme });

const defaultProps = {
Expand Down
Loading
Loading