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

Update dependencies #191

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

strategy:
matrix:
node-version: ['20.x']
node-version: ['22.x']

steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.11
v22.13.0
6,781 changes: 4,386 additions & 2,395 deletions apps/front/package-lock.json

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions apps/front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,40 +22,40 @@
"dependencies": {
"@cher-ami/css-flat": "^1.0.1",
"@cher-ami/debug": "^1.2.0",
"@cher-ami/router": "^3.5.0",
"@cher-ami/router": "^3.5.4",
"@cher-ami/utils": "^1.4.1",
"cross-fetch": "^4.0.0",
"cross-fetch": "^4.1.0",
"history": "^5.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@cher-ami/mfs": "^0.2.0",
"@eggjs/ip": "^2.0.2",
"@types/events": "^3.0.3",
"@types/node": "^20.11.16",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-legacy": "^5.3.0",
"@vitejs/plugin-react-swc": "^3.6.0",
"autoprefixer": "^10.4.17",
"chalk": "^5.3.0",
"compression": "^1.7.4",
"@types/node": "^22.10.5",
"@types/react": "^19.0.6",
"@types/react-dom": "^19.0.3",
"@vitejs/plugin-legacy": "^6.0.0",
"@vitejs/plugin-react-swc": "^3.7.2",
"autoprefixer": "^10.4.20",
"chalk": "^5.4.1",
"compression": "^1.7.5",
"cross-env": "^7.0.3",
"express": "^4.18.2",
"husky": "^9.0.10",
"ip": "^1.1.8",
"express": "^4.21.2",
"husky": "^9.1.7",
"portfinder-sync": "^0.0.2",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.70.0",
"sirv": "^2.0.4",
"terser": "^5.27.0",
"typescript": "^5.3.3",
"vite": "^5.0.12",
"vite-plugin-checker": "^0.6.4",
"vitest": "^1.2.2"
"rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.83.1",
"sirv": "^3.0.0",
"terser": "^5.37.0",
"typescript": "^5.7.3",
"vite": "^6.0.7",
"vite-plugin-checker": "^0.8.0",
"vitest": "^2.1.8"
},
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "4.6.1",
"@rollup/rollup-linux-x64-gnu": "4.30.1",
"esbuild-android-arm64": "^0.15.18",
"fsevents": "^2.3.3"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/front/src/components/baseButton/BaseButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { MutableRefObject } from "react"
import React, { RefObject } from "react"
import css from "./BaseButton.module.scss"
import { Link, openRoute, TOpenRouteParams } from "@cher-ami/router"
import { cls } from "@cher-ami/utils"
Expand All @@ -18,7 +18,7 @@ type TExternalLinkButton = {

type IProps = {
className?: string
label: string | JSX.Element
label: string | React.JSX.Element
ariaLabel: string
onClick?: () => void
tag: "button" | "a"
Expand Down Expand Up @@ -46,7 +46,7 @@ const log = debug(`front:${componentName}`)
*
*
*/
function BaseButton(props: IProps, ref: MutableRefObject<any>) {
function BaseButton(props: IProps, ref: RefObject<any>) {
const commonContent = (
<div className={cls(css.wrapper)}>
<div className={css.content}>{props.label}</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/front/src/components/noSSR/NoSSR.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { isBrowser } from "@cher-ami/utils"
* @param children
* @constructor
*/
export const NoSSR = ({ children }): JSX.Element => {
export const NoSSR = ({ children }): React.JSX.Element => {
const [shouldRender, setShouldRender] = useState(false)
useEffect(() => {
setShouldRender(isBrowser())
Expand Down
4 changes: 2 additions & 2 deletions apps/front/src/libs/core/CherScripts.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from "react"
type TScript = { tag: string; attr: { [x: string]: string } }

export const ScriptTag = ({ tag, attr }: TScript): JSX.Element => {
export const ScriptTag = ({ tag, attr }: TScript): React.JSX.Element => {
const T = tag
// @ts-ignore
if (attr.noModule === "") return <T {...attr} noModule />
else return <T {...attr} />
}

export const CherScripts = ({ scripts }: { scripts: TScript[] }): JSX.Element => (
export const CherScripts = ({ scripts }: { scripts: TScript[] }): React.JSX.Element => (
<>{scripts?.map((script, i) => <ScriptTag key={i} {...script} />)}</>
)
8 changes: 7 additions & 1 deletion apps/front/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import buildDotenvPlugin from "./config/vite-plugins/vite-plugin-build-dotenv"
import buildHtaccessPlugin from "./config/vite-plugins/vite-plugin-build-htaccess"
import { viteChersiteCustomLogger } from "./config/vite-plugins/vite-chersite-custom-logger"
import legacy from "@vitejs/plugin-legacy"
import ip from "ip"
import ip from "@eggjs/ip"
import portFinderSync from "portfinder-sync"
const log = debug("config:vite.config")

Expand Down Expand Up @@ -83,6 +83,12 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => {
},
postcss: {
plugins: [autoprefixer()]
},
preprocessorOptions: {
scss: {
api: "modern-compiler",
silenceDeprecations: ["legacy-js-api"] // Temporary before updating scss
}
}
},

Expand Down
2 changes: 1 addition & 1 deletion cli/tasks/setup/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import config from "../../config.js"
import path from "path"

// TODO assert { type: "json" } will change in the future
import packageJson from "../../../package.json" assert { type: "json" }
import packageJson from "../../../package.json" with { type: "json" }

import debug from "@cher-ami/debug"
const log = debug(`config:setup`)
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: "3.7"
services:
node:
image: node:20.11
image: node:22.13.0
ports:
- "${DOCKER_NODE_PORT:-5173}:5173" # vite dev server
- "24678:24678" # vite HMR
Expand Down
Loading
Loading