Skip to content

Commit

Permalink
Upgrade frontend dependencies (#3970)
Browse files Browse the repository at this point in the history
Signed-off-by: Cintia Sanchez Garcia <cynthiasg@icloud.com>
  • Loading branch information
cynthia-sg authored Aug 7, 2024
1 parent bbdf2d9 commit fec9c9e
Show file tree
Hide file tree
Showing 74 changed files with 1,478 additions and 1,454 deletions.
3 changes: 2 additions & 1 deletion web/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import js from '@eslint/js';
import reactHooks from 'eslint-plugin-react-hooks';
import simpleImportSort from 'eslint-plugin-simple-import-sort';
import tseslint from 'typescript-eslint';
import globals from "globals";
import tseslint from 'typescript-eslint';

const config = [
js.configs.recommended,
Expand All @@ -20,6 +20,7 @@ const config = [
},
ignores: ['analytics.ts', 'jsonschema.ts'],
rules: {
'@typescript-eslint/no-require-imports': 'error',
'simple-import-sort/imports': 'error',
'simple-import-sort/exports': 'error',
},
Expand Down
35 changes: 18 additions & 17 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"dependencies": {
"@analytics/google-analytics-v3": "^0.6.1",
"analytics": "^0.8.13",
"analytics": "^0.8.14",
"apexcharts": "3.49.0",
"bootstrap": "^5.3.3",
"classnames": "^2.5.1",
Expand All @@ -25,27 +25,27 @@
"react-diff-view": "3.0.2",
"react-dom": "^18.3.1",
"react-icons": "^5.2.0",
"react-image-crop": "^11.0.5",
"react-image-crop": "^11.0.6",
"react-markdown": "^8.0.7",
"react-router-dom": "^6.24.0",
"react-router-dom": "^6.26.0",
"react-syntax-highlighter": "^15.5.0",
"regexify-string": "^1.0.17",
"rehype-github-alerts": "^3.0.0",
"remark-gfm": "^3.0.1",
"remark-parse": "^10.0.2",
"remark-strip-html": "^1.0.2",
"remark-unlink": "^4.0.1",
"semver": "^7.6.0",
"semver": "^7.6.3",
"tinycolor2": "^1.6.0",
"ua-parser-js": "^1.0.38",
"unified": "^10.1.2",
"yaml": "^2.4.5"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@eslint/js": "^9.5.0",
"@testing-library/dom": "^10.2.0",
"@testing-library/jest-dom": "^6.4.6",
"@eslint/js": "^9.8.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@testing-library/react-hooks": "^8.0.0",
"@testing-library/user-event": "^14.5.2",
Expand All @@ -54,27 +54,27 @@
"@types/jest": "^29.5.12",
"@types/json-schema": "^7.0.14",
"@types/json-schema-merge-allof": "^0.6.5",
"@types/lodash": "^4.17.5",
"@types/node": "^20.14.8",
"@types/lodash": "^4.17.7",
"@types/node": "^22.1.0",
"@types/react": "^18.3.3",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^18.3.0",
"@types/react-syntax-highlighter": "^15.5.13",
"@types/semver": "^7.5.8",
"eslint": "^9.5.0",
"eslint": "^9.8.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-simple-import-sort": "^12.1.0",
"globals": "^15.6.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^15.9.0",
"jest-fetch-mock": "^3.0.3",
"jest-mock": "^29.7.0",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"react-scripts": "^5.0.1",
"sass": "^1.77.6",
"sass": "^1.77.8",
"shx": "^0.3.4",
"typescript": "^5.5.2",
"typescript-eslint": "^7.13.1"
"typescript": "^5.5.4",
"typescript-eslint": "^8.0.1"
},
"proxy": "http://localhost:8000",
"scripts": {
Expand All @@ -88,6 +88,7 @@
"lint:fix": "eslint src --max-warnings 0 --fix",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
"format:diff": "prettier --list-different \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
"prettier:fix": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
"isready": "yarn format && yarn lint && yarn test --watchAll=false --passWithNoTests --verbose && yarn build"
},
"browser": {
Expand Down
2 changes: 1 addition & 1 deletion web/src/api/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ enableFetchMocks();

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const getData = (fixtureId: string): any => {
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-explicit-any
return require(`./__fixtures__/index/${fixtureId}.json`) as any;
};

Expand Down
3 changes: 3 additions & 0 deletions web/src/jsonschema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export interface JSONSchema4Object {

// Workaround for infinite type recursion
// https://github.com/Microsoft/TypeScript/issues/3496#issuecomment-128553540
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface JSONSchema4Array extends Array<JSONSchema4Type> {}

/**
Expand Down Expand Up @@ -278,6 +279,7 @@ export interface JSONSchema6Object {

// Workaround for infinite type recursion
// https://github.com/Microsoft/TypeScript/issues/3496#issuecomment-128553540
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface JSONSchema6Array extends Array<JSONSchema6Type> {}

/**
Expand Down Expand Up @@ -611,6 +613,7 @@ export interface JSONSchema7Object {

// Workaround for infinite type recursion
// https://github.com/Microsoft/TypeScript/issues/3496#issuecomment-128553540
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface JSONSchema7Array extends Array<JSONSchema7Type> {}

/**
Expand Down
2 changes: 1 addition & 1 deletion web/src/layout/common/ContentDefaultModal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { BrowserRouter as Router } from 'react-router-dom';
import { ContentDefaultModalKind } from '../../types';
import ContentDefaultModal from './ContentDefaultModal';

// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
const isVisibleItemInContainer = require('../../utils/isVisibleItemInContainer');

jest.mock('../../utils/isVisibleItemInContainer', () => jest.fn());
Expand Down
2 changes: 1 addition & 1 deletion web/src/layout/common/OrganizationInfo.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jest.mock('react-router-dom', () => ({
}));

const getMockOrganization = (fixtureId: string): Organization => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/OrganizationInfo/${fixtureId}.json`) as Organization;
};

Expand Down
2 changes: 1 addition & 1 deletion web/src/layout/common/PackageCard.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import PackageCard from './PackageCard';
jest.mock('../../utils/calculateDiffInYears');

const getMockPackage = (fixtureId: string): Package => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/PackageCard/${fixtureId}.json`) as Package;
};

Expand Down
2 changes: 1 addition & 1 deletion web/src/layout/common/SearchBar.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jest.mock('react-router-dom', () => ({
}));

const getMockSearch = (fixtureId: string): SearchResults => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/SearchBar/${fixtureId}.json`) as SearchResults;
};

Expand Down
2 changes: 1 addition & 1 deletion web/src/layout/common/SearchPackages.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jest.mock('../../api');
jest.mock('../../utils/alertDispatcher');

const getMockSearch = (fixtureId: string): SearchResults => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/SearchPackages/${fixtureId}.json`) as SearchResults;
};

Expand Down
1 change: 1 addition & 0 deletions web/src/layout/common/SearchRepositories.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jest.mock('../../api');
jest.mock('../../utils/alertDispatcher');

const getMockSearch = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/SearchRepositories/${fixtureId}.json`);
};

Expand Down
1 change: 1 addition & 0 deletions web/src/layout/controlPanel/UserContext.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import UserContext from './UserContext';
jest.mock('../../api');

const getMockOrgs = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/UserContext/${fixtureId}.json`);
};

Expand Down
1 change: 1 addition & 0 deletions web/src/layout/controlPanel/members/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jest.mock('../../../utils/authorizer', () => ({
}));

const getMembers = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`);
};

Expand Down
1 change: 1 addition & 0 deletions web/src/layout/controlPanel/organizations/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import OrganizationsSection from './index';
jest.mock('../../../api');

const getMockOrganizations = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ const mockWithSelectedOrgCtx = {
};

const getMockOrganizations = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/ClaimOwnershipModal/${fixtureId}org.json`);
};

const getMockRepositories = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/ClaimOwnershipModal/${fixtureId}repo.json`);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const mockWithSelectedOrgCtx = {
};

const getMockOrganizations = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/TransferModal/${fixtureId}.json`);
};

Expand Down
1 change: 1 addition & 0 deletions web/src/layout/controlPanel/repositories/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jest.mock('../../../api');
jest.mock('../../../utils/minutesToNearestInterval', () => () => 3);

const getMockRepository = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jest.mock('../../../../../utils/authorizer', () => ({
}));

const getMockAuthz = (fixtureId: string): OrganizationPolicy => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`) as OrganizationPolicy;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import UpdateOrg from './UpdateOrg';
jest.mock('../../../../../api');

const getMockOrganization = (fixtureId: string): Organization => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/UpdateOrg/${fixtureId}.json`) as Organization;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ProfileOrgSection from './index';
jest.mock('../../../../../api');

const getMockOrganization = (fixtureId: string): Organization => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`) as Organization;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jest.mock('moment', () => ({
}));

const getMockAPIKeys = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import UserSettings from './index';
jest.mock('../../../../../api');

const getMockProfile = (fixtureId: string): Profile => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`) as Profile;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ const mockOnSuccess = jest.fn();
const mockOnClose = jest.fn();

const getMockSubscriptions = (fixtureId: string): Package[] => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/Modal/${fixtureId}.json`) as Package[];
};

const getMockSearch = (fixtureId: string): SearchResults => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/Modal/${fixtureId}s.json`) as SearchResults;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Package } from '../../../../../../types';
import PackageCard from './PackageCard';

const getMockPackage = (fixtureId: string): Package => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/PackageCard/${fixtureId}.json`) as Package;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jest.mock('../../../../../../api');
jest.mock('../../../../../../utils/alertDispatcher');

const getMockSubscriptions = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ const mockOptOutList: OptOutItem[] = [
];

const getMockOrgs = () => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require('./__fixtures__/Modal/orgs.json');
};

const getMockRepos = (repoName?: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/Modal/${repoName || 'user'}.json`);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const scrollIntoViewMock = jest.fn();
window.HTMLElement.prototype.scrollIntoView = scrollIntoViewMock;

const getMockOptOut = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jest.mock('../../../../api');
jest.mock('../../../../utils/alertDispatcher');

const getmockWebhook = (fixtureId: string): Webhook => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/Card/${fixtureId}.json`) as Webhook;
};

Expand Down
4 changes: 2 additions & 2 deletions web/src/layout/controlPanel/settings/webhooks/Form.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jest.mock('../../../../api');
jest.mock('../../../common/Alert', () => (props: any) => <div>{props.message}</div>);

const getMockWebhook = (fixtureId: string): Webhook => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/Form/${fixtureId}.json`) as Webhook;
};

const getMockSearch = (fixtureId: string): SearchResults => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/Form/${fixtureId}s.json`) as SearchResults;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import LastNotificationsModal from './LastNotificationsModal';
jest.mock('../../../../api');

const getMockNotifications = (fixtureId: string): WebhookNotification[] => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/LastNotificationsModal/${fixtureId}.json`) as WebhookNotification[];
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import WebhooksSection from './index';
jest.mock('../../../../api');

const getMockWebhooks = (fixtureId: string) => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/index/${fixtureId}.json`);
};

Expand Down
2 changes: 1 addition & 1 deletion web/src/layout/home/RandomPackages.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import RandomPackages from './RandomPackages';
jest.mock('../../api');

const getMockRandomPackages = (fixtureId: string): Package[] => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/no-require-imports
return require(`./__fixtures__/RandomPackages/${fixtureId}.json`) as Package[];
};

Expand Down
Loading

0 comments on commit fec9c9e

Please sign in to comment.