Skip to content

Commit

Permalink
Merge pull request #162 from mission-apprentissage/dependabot-fixes
Browse files Browse the repository at this point in the history
Dependabot fixes v2
  • Loading branch information
LucasDetre authored Dec 6, 2023
2 parents a3cf88e + 3e625e5 commit 413d8d2
Show file tree
Hide file tree
Showing 14 changed files with 3,088 additions and 3,436 deletions.
6 changes: 6 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

[[ -n $HUSKY_BYPASS ]] ||
echo "\nCHECKING COMMIT MESSAGE :" && \
npm run commitlint
7 changes: 7 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

echo "\nPREVENTING SENSIBLE FiLES COMMIT :" && \
npm run preventSensibleFilesCommit && \
echo "\nLINTING :" && \
npm run lint:staged
7 changes: 7 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

echo "\nTYPECHECKING :" && \
npm run typecheck && \
echo "\nLINTING :" && \
npm run lint
44 changes: 21 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
"license": "MIT",
"private": true,
"dependencies": {
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"eslint": "8.54.0",
"eslint-config-next": "13.0.1",
"eslint-import-resolver-typescript": "^3.5.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-mocha": "10.1.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-react": "^7.32.2",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"eslint": "8.55.0",
"eslint-config-next": "14.0.3",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-mocha": "10.2.0",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"eslint-plugin-unused-imports": "^3.0.0",
"global": "4.4.0"
},
"scripts": {
Expand All @@ -28,7 +28,11 @@
"prettier:fix": "prettier --write ./ui ./server ./shared",
"prettier:check": "prettier --check ./ui ./server ./shared",
"npm:release": "semantic-release",
"npm:release:local": "CI=true LOCAL_RELEASE=true semantic-release"
"npm:release:local": "CI=true LOCAL_RELEASE=true semantic-release",
"prepare": "husky install",
"typecheck": "yarn --cwd server typecheck && yarn --cwd ui typecheck",
"commitlint": "commitlint --config ./config/commitlint.config.js --edit $1",
"preventSensibleFilesCommit": "./git-hooks/preventSensibleFilesCommit.sh"
},
"workspaces": [
"ui",
Expand All @@ -38,22 +42,16 @@
"devDependencies": {
"@commitlint/cli": "18.4.3",
"@commitlint/config-conventional": "18.4.3",
"@semantic-release/changelog": "6.0.1",
"@semantic-release/changelog": "6.0.3",
"@semantic-release/exec": "6.0.3",
"@semantic-release/git": "10.0.1",
"husky": "4.3.8",
"lint-staged": "11.2.6",
"husky": "^8.0.0",
"lint-staged": "15.2.0",
"prettier": "3.0.3",
"semantic-release": "19.0.5",
"semantic-release-slack-bot": "3.5.2",
"semantic-release": "22.0.9",
"semantic-release-slack-bot": "4.0.2",
"typescript": "5.0.2"
},
"husky": {
"hooks": {
"pre-commit": "./git-hooks/preventSensibleFilesCommit.sh && lint-staged",
"commit-msg": "[[ -n $HUSKY_BYPASS ]] || commitlint --config ./config/commitlint.config.js -E HUSKY_GIT_PARAMS"
}
},
"lint-staged": {
"*.{ts,js,tsx}": [
"eslint",
Expand Down
6 changes: 3 additions & 3 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"@fastify/type-provider-typebox": "^3.5.0",
"@hapi/boom": "^10.0.1",
"@http-wizard/core": "^1.3.16",
"@json2csv/node": "^6.1.3",
"@json2csv/plainjs": "^6.1.3",
"@json2csv/node": "^7.0.4",
"@json2csv/plainjs": "^7.0.4",
"@slack/bolt": "^3.15.0",
"axios": "1.6.2",
"commander": "^10.0.0",
Expand All @@ -50,7 +50,7 @@
"shared": "*",
"stream-transform": "^3.2.2",
"ts-node": "^10.9.1",
"tsup": "^6.5.0",
"tsup": "^8.0.1",
"uglify-js": "^3.17.4",
"uuid": "^9.0.1",
"winston": "^3.10.0",
Expand Down
1 change: 1 addition & 0 deletions server/src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ export const logger = {
},
error: (
msg: string,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
{ error, ...details }: { error: Error } & Record<string, any>
) => {
const logOrigin = getLogOrigin();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ export const getDemandesRoute = (server: Server) => {
const { order, orderBy, ...filters } = request.query;
if (!request.user) throw Boom.forbidden();

console.log(filters);

const result = await findDemandes({
...filters,
user: request.user,
Expand Down
2 changes: 2 additions & 0 deletions shared/security/securityUtils.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Permission, PERMISSIONS } from "./permissions";

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type KeyOfUnion<T> = T extends any ? keyof T : never;

type KOfUnion<T> = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[D in KeyOfUnion<T>]: T extends { [Ks in D]: any } ? T[D] : never;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ export const QuadrantSection = ({
fontSize="xs"
as={NextLink}
target="_blank"
rel="noreferrer"
href={createParametrizedUrl("/intentions/restitution", {
filters: {
rentreeScolaire: "2024",
Expand Down
2 changes: 2 additions & 0 deletions ui/app/(wrapped)/panorama/components/InfoSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const InfoCard = ({
href={href}
key={href}
target="_blank"
rel="noreferrer"
>
{label}
</MenuItem>
Expand All @@ -96,6 +97,7 @@ const InfoCard = ({
as={Link}
href={links.href}
target="_blank"
rel="noreferrer"
>
Accéder à l'information
</Button>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/layoutClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default function RootLayoutClient({
const containerRef = useRef<HTMLDivElement>(null);
const scrollPosition = useRef<number>(0);

// @ts-ignore
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const handleScrolling = (e: any) => {
scrollPosition.current = e.target.scrollTop;
};
Expand Down
20 changes: 10 additions & 10 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
"typecheck": "tsc"
},
"dependencies": {
"@chakra-ui/icons": "^2.1.0",
"@chakra-ui/next-js": "^2.1.5",
"@chakra-ui/react": "^2.8.0",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/next-js": "^2.2.0",
"@chakra-ui/react": "^2.8.2",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@http-wizard/core": "^1.3.16",
"@http-wizard/react-query": "^1.3.16",
"@json2csv/formatters": "^7.0.3",
"@json2csv/plainjs": "^7.0.3",
"@json2csv/formatters": "^7.0.4",
"@json2csv/plainjs": "^7.0.4",
"@tanstack/react-query": "^4.29.3",
"@types/node": "18.11.18",
"@types/qs": "^6.9.7",
"@types/react": "18.0.27",
"@types/react-dom": "18.0.10",
"@types/react": "18.2.42",
"@types/react-dom": "18.2.17",
"axios": "1.6.2",
"echarts": "^5.4.2",
"framer-motion": "^10.9.1",
Expand All @@ -35,7 +35,7 @@
"react-dom": "18.2.0",
"react-hook-form": "^7.47.0",
"react-notion-x": "^6.16.0",
"react-select": "^5.7.4",
"react-select": "^5.8.0",
"server": "*",
"shared": "*",
"typescript": "5.0.2",
Expand Down
3 changes: 1 addition & 2 deletions ui/theme/theme.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { extendBaseTheme } from "@chakra-ui/react";
import chakraTheme from "@chakra-ui/theme";
import { extendBaseTheme, theme as chakraTheme } from "@chakra-ui/react";

import { BreadcrumbTheme } from "@/theme/Breadcrumb.theme";
import { cardTheme } from "@/theme/Card.theme";
Expand Down
Loading

0 comments on commit 413d8d2

Please sign in to comment.