Upgrade deps and build fixes

This commit is contained in:
Darren Clarke 2023-07-23 11:21:39 +02:00
parent 38d3e9349c
commit c99972a95b
19 changed files with 757 additions and 284 deletions

View file

@ -206,7 +206,8 @@ zammad-docker-build:
- npm install npm@latest -g - npm install npm@latest -g
- npm install -g turbo - npm install -g turbo
- npm ci - npm ci
- turbo build --filter zammad-addon-* - turbo build --force --filter zammad-addon-*
- ls -al addons
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT} - DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT}
- docker push ${DOCKER_NS}:${DOCKER_TAG} - docker push ${DOCKER_NS}:${DOCKER_TAG}

View file

@ -20,7 +20,7 @@ export const Create: FC<CreateProps> = ({ templates }) => {
typography: { h1, h4 }, typography: { h1, h4 },
} = useAppContext(); } = useAppContext();
const router = useRouter(); const router = useRouter();
const pathname = usePathname(); const pathname = usePathname() ?? "";
const cookieName = "searchIntroComplete"; const cookieName = "searchIntroComplete";
const [cookies, setCookie] = useCookies([cookieName]); const [cookies, setCookie] = useCookies([cookieName]);
const searchIntroComplete = parseInt(cookies[cookieName], 10) || 0; const searchIntroComplete = parseInt(cookies[cookieName], 10) || 0;

View file

@ -65,8 +65,8 @@ export const GettingStartedDialog: FC = () => {
const router = useRouter(); const router = useRouter();
const [completedItems, setCompletedItems] = useState([] as any[]); const [completedItems, setCompletedItems] = useState([] as any[]);
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const pathname = usePathname(); const pathname = usePathname() ?? "";
const open = searchParams.get("tooltip")?.toString() === "checklist"; const open = searchParams?.get("tooltip")?.toString() === "checklist";
const toggleCompletedItem = (item: any) => { const toggleCompletedItem = (item: any) => {
if (completedItems.includes(item)) { if (completedItems.includes(item)) {
setCompletedItems(completedItems.filter((i) => i !== item)); setCompletedItems(completedItems.filter((i) => i !== item));
@ -94,7 +94,7 @@ export const GettingStartedDialog: FC = () => {
<Box sx={{ ...h4, mb: 3 }}>{t("getStartedChecklist")}</Box> <Box sx={{ ...h4, mb: 3 }}>{t("getStartedChecklist")}</Box>
</Grid> </Grid>
<Grid item> <Grid item>
<IconButton onClick={() => router.push(pathname)}> <IconButton onClick={() => router.push(pathname ?? "")}>
<CloseIcon sx={{ color: almostBlack, fontSize: "18px" }} /> <CloseIcon sx={{ color: almostBlack, fontSize: "18px" }} />
</IconButton> </IconButton>
</Grid> </Grid>

View file

@ -8,7 +8,7 @@ import { useAppContext } from "./AppProvider";
export const HelpButton: FC = () => { export const HelpButton: FC = () => {
const router = useRouter(); const router = useRouter();
const pathname = usePathname(); const pathname = usePathname() ?? "";
const [helpActive, setHelpActive] = useState(false); const [helpActive, setHelpActive] = useState(false);
const { const {
colors: { leafcutterElectricBlue }, colors: { leafcutterElectricBlue },

View file

@ -18,7 +18,7 @@ type HomeProps = {
export const Home: FC<HomeProps> = ({ visualizations }) => { export const Home: FC<HomeProps> = ({ visualizations }) => {
const router = useRouter(); const router = useRouter();
const pathname = usePathname(); const pathname = usePathname() ?? "";
const cookieName = "homeIntroComplete"; const cookieName = "homeIntroComplete";
const [cookies, setCookie] = useCookies([cookieName]); const [cookies, setCookie] = useCookies([cookieName]);
const t = useTranslate(); const t = useTranslate();

View file

@ -101,8 +101,8 @@ interface SidebarProps {
export const Sidebar: FC<SidebarProps> = ({ open }) => { export const Sidebar: FC<SidebarProps> = ({ open }) => {
const t = useTranslate(); const t = useTranslate();
const pathname = usePathname(); const pathname = usePathname() ?? "";
const section = pathname.split("/")[1]; const section = pathname?.split("/")[1];
const { const {
colors: { white }, // leafcutterElectricBlue, leafcutterLightBlue, colors: { white }, // leafcutterElectricBlue, leafcutterLightBlue,
} = useAppContext(); } = useAppContext();

View file

@ -40,9 +40,9 @@ export const Tooltip: FC<TooltipProps> = ({
colors: { white, leafcutterElectricBlue, almostBlack }, colors: { white, leafcutterElectricBlue, almostBlack },
} = useAppContext(); } = useAppContext();
const router = useRouter(); const router = useRouter();
const pathname = usePathname(); const pathname = usePathname() ?? "";
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const activeTooltip = searchParams.get('tooltip')?.toString(); const activeTooltip = searchParams?.get("tooltip")?.toString();
const open = activeTooltip === tooltipID; const open = activeTooltip === tooltipID;
const showNavigation = true; const showNavigation = true;

View file

@ -16,7 +16,7 @@ export const WelcomeDialog = () => {
colors: { white, leafcutterElectricBlue }, colors: { white, leafcutterElectricBlue },
typography: { h1, h6, p }, typography: { h1, h6, p },
} = useAppContext(); } = useAppContext();
const activeTooltip = searchParams.get('tooltip')?.toString(); const activeTooltip = searchParams?.get("tooltip")?.toString();
const open = activeTooltip === "welcome"; const open = activeTooltip === "welcome";
return ( return (

View file

@ -1,5 +1,6 @@
/// <reference types="next" /> /// <reference types="next" />
/// <reference types="next/image-types/global" /> /// <reference types="next/image-types/global" />
/// <reference types="next/navigation-types/compat/navigation" />
// NOTE: This file should not be edited // NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information. // see https://nextjs.org/docs/basic-features/typescript for more information.

View file

@ -29,7 +29,7 @@
"date-fns": "^2.30.0", "date-fns": "^2.30.0",
"http-proxy-middleware": "^2.0.6", "http-proxy-middleware": "^2.0.6",
"material-ui-popup-state": "^5.0.9", "material-ui-popup-state": "^5.0.9",
"next": "13.4.11", "next": "13.4.12",
"next-auth": "^4.22.3", "next-auth": "^4.22.3",
"next-http-proxy-middleware": "^1.2.5", "next-http-proxy-middleware": "^1.2.5",
"nodemailer": "^6.9.4", "nodemailer": "^6.9.4",
@ -40,20 +40,20 @@
"react-iframe": "^1.8.5", "react-iframe": "^1.8.5",
"react-markdown": "^8.0.7", "react-markdown": "^8.0.7",
"react-polyglot": "^0.7.2", "react-polyglot": "^0.7.2",
"sharp": "^0.32.3", "sharp": "^0.32.4",
"swr": "^2.2.0", "swr": "^2.2.0",
"tss-react": "^4.8.8", "tss-react": "^4.8.8",
"uuid": "^9.0.0" "uuid": "^9.0.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.22.9", "@babel/core": "^7.22.9",
"@types/node": "^20.4.2", "@types/node": "^20.4.4",
"@types/react": "18.2.15", "@types/react": "18.2.15",
"@types/uuid": "^9.0.2", "@types/uuid": "^9.0.2",
"babel-loader": "^9.1.3", "babel-loader": "^9.1.3",
"eslint": "^8.45.0", "eslint": "^8.45.0",
"eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb": "^19.0.4",
"eslint-config-next": "^13.4.11", "eslint-config-next": "^13.4.12",
"eslint-config-prettier": "^8.8.0", "eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5", "eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-jsx-a11y": "^6.7.1",

View file

@ -27,26 +27,26 @@
"graphql-request": "^6.1.0", "graphql-request": "^6.1.0",
"material-ui-popup-state": "^5.0.9", "material-ui-popup-state": "^5.0.9",
"mui-chips-input": "^2.0.2", "mui-chips-input": "^2.0.2",
"next": "13.4.11", "next": "13.4.12",
"next-auth": "^4.22.3", "next-auth": "^4.22.3",
"react": "18.2.0", "react": "18.2.0",
"react-cookie": "^4.1.1", "react-cookie": "^4.1.1",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-iframe": "^1.8.5", "react-iframe": "^1.8.5",
"react-polyglot": "^0.7.2", "react-polyglot": "^0.7.2",
"sharp": "^0.32.3", "sharp": "^0.32.4",
"swr": "^2.2.0", "swr": "^2.2.0",
"tss-react": "^4.8.8" "tss-react": "^4.8.8"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.22.9", "@babel/core": "^7.22.9",
"@types/node": "^20.4.2", "@types/node": "^20.4.4",
"@types/react": "18.2.15", "@types/react": "18.2.15",
"@types/uuid": "^9.0.2", "@types/uuid": "^9.0.2",
"babel-loader": "^9.1.3", "babel-loader": "^9.1.3",
"eslint": "^8.45.0", "eslint": "^8.45.0",
"eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb": "^19.0.4",
"eslint-config-next": "^13.4.11", "eslint-config-next": "^13.4.12",
"eslint-config-prettier": "^8.8.0", "eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5", "eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-jsx-a11y": "^6.7.1",

View file

@ -54,7 +54,7 @@
"jest-config-link": "*", "jest-config-link": "*",
"nodemon": "^3.0.1", "nodemon": "^3.0.1",
"pg-monitor": "^2.0.0", "pg-monitor": "^2.0.0",
"pino-pretty": "^10.0.1", "pino-pretty": "^10.1.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"tsc-watch": "^6.0.4", "tsc-watch": "^6.0.4",
"tsconfig-link": "*", "tsconfig-link": "*",

View file

@ -24,7 +24,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^29.5.3", "@types/jest": "^29.5.3",
"pino-pretty": "^10.0.1", "pino-pretty": "^10.1.0",
"nodemon": "^3.0.1", "nodemon": "^3.0.1",
"tsconfig-link": "*", "tsconfig-link": "*",
"eslint-config-link": "*", "eslint-config-link": "*",

View file

@ -14,15 +14,15 @@
"http-proxy-middleware": "^2.0.6", "http-proxy-middleware": "^2.0.6",
"jsonwebtoken": "^9.0.1", "jsonwebtoken": "^9.0.1",
"jwks-rsa": "^3.0.1", "jwks-rsa": "^3.0.1",
"next": "13.4.11", "next": "13.4.12",
"next-auth": "4.22.3", "next-auth": "4.22.3",
"ra-data-graphql": "^4.12.1", "ra-data-graphql": "^4.12.2",
"ra-i18n-polyglot": "^4.12.1", "ra-i18n-polyglot": "^4.12.2",
"ra-input-rich-text": "^4.12.1", "ra-input-rich-text": "^4.12.2",
"ra-language-english": "^4.12.1", "ra-language-english": "^4.12.2",
"ra-postgraphile": "^6.1.1", "ra-postgraphile": "^6.1.1",
"react": "18.2.0", "react": "18.2.0",
"react-admin": "^4.12.1", "react-admin": "^4.12.2",
"react-digit-input": "^2.1.0", "react-digit-input": "^2.1.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-qr-code": "^2.0.11", "react-qr-code": "^2.0.11",
@ -41,7 +41,7 @@
"fmt": "prettier --ignore-path .eslintignore \"**/*.{js,jsx,ts,tsx,graphql,md}\" --write" "fmt": "prettier --ignore-path .eslintignore \"**/*.{js,jsx,ts,tsx,graphql,md}\" --write"
}, },
"devDependencies": { "devDependencies": {
"@next/eslint-plugin-next": "^13.4.11", "@next/eslint-plugin-next": "^13.4.12",
"@types/hapi__wreck": "17.0.1", "@types/hapi__wreck": "17.0.1",
"@types/react": "18.2.15", "@types/react": "18.2.15",
"@types/react-mic": "12.4.3", "@types/react-mic": "12.4.3",

View file

@ -27,7 +27,7 @@
"jest-circus": "^29.6.1", "jest-circus": "^29.6.1",
"jest-junit": "^16.0.0", "jest-junit": "^16.0.0",
"nodemon": "^3.0.1", "nodemon": "^3.0.1",
"pino-pretty": "^10.0.1", "pino-pretty": "^10.1.0",
"prettier": "^3.0.0", "prettier": "^3.0.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typedoc": "^0.24.8", "typedoc": "^0.24.8",

973
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -57,7 +57,7 @@
"next-auth": "^4.22.3", "next-auth": "^4.22.3",
"pg-promise": "^11.5.0", "pg-promise": "^11.5.0",
"pino": "^8.14.1", "pino": "^8.14.1",
"pino-pretty": "^10.0.1", "pino-pretty": "^10.1.0",
"prom-client": "^14.x.x", "prom-client": "^14.x.x",
"uuid": "^9.0.0" "uuid": "^9.0.0"
} }

View file

@ -14,7 +14,7 @@
"@babel/preset-env": "7.22.9", "@babel/preset-env": "7.22.9",
"@babel/preset-typescript": "7.22.5", "@babel/preset-typescript": "7.22.5",
"eslint": "^8.45.0", "eslint": "^8.45.0",
"pino-pretty": "^10.0.1", "pino-pretty": "^10.1.0",
"prettier": "^3.0.0", "prettier": "^3.0.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"tsc-watch": "^6.0.4", "tsc-watch": "^6.0.4",

View file

@ -23,7 +23,7 @@
"eslint": "^8.45.0", "eslint": "^8.45.0",
"jest": "^29.6.1", "jest": "^29.6.1",
"jest-junit": "^16.0.0", "jest-junit": "^16.0.0",
"pino-pretty": "^10.0.1", "pino-pretty": "^10.1.0",
"prettier": "^3.0.0", "prettier": "^3.0.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"tsc-watch": "^6.0.4", "tsc-watch": "^6.0.4",