Make all versions of next and react match

This commit is contained in:
Darren Clarke 2023-05-25 06:30:36 +00:00
parent 656f3fbe71
commit 935290bbdc
7 changed files with 2459 additions and 4127 deletions

View file

@ -29,14 +29,14 @@
"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.8", "material-ui-popup-state": "^5.0.8",
"next": "^13.4", "next": "13.4.3",
"next-auth": "^4.22.1", "next-auth": "^4.22.1",
"next-http-proxy-middleware": "^1.2.5", "next-http-proxy-middleware": "^1.2.5",
"nodemailer": "^6.9.2", "nodemailer": "^6.9.2",
"react": "^18", "react": "18.2.0",
"react-cookie": "^4.1.1", "react-cookie": "^4.1.1",
"react-cookie-consent": "^8.0.1", "react-cookie-consent": "^8.0.1",
"react-dom": "^18", "react-dom": "18.2.0",
"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",
@ -46,7 +46,7 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.21.8", "@babel/core": "^7.21.8",
"@types/react": "^18", "@types/react": "18.2.7",
"@types/uuid": "^9.0.1", "@types/uuid": "^9.0.1",
"babel-loader": "^9.1.2", "babel-loader": "^9.1.2",
"eslint": "^8.41.0", "eslint": "^8.41.0",
@ -57,6 +57,6 @@
"eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2", "eslint-plugin-react": "^7.32.2",
"typescript": "^5.0.4" "typescript": "5.0.4"
} }
} }

View file

@ -23,6 +23,10 @@ export default withAuth(
const authorizedDomains = ["redaranj.com", "digiresilience.org"]; const authorizedDomains = ["redaranj.com", "digiresilience.org"];
const userDomain = token?.email?.toLowerCase().split("@").pop() ?? "unauthorized.net"; const userDomain = token?.email?.toLowerCase().split("@").pop() ?? "unauthorized.net";
if (authorizedDomains.includes(userDomain)) {
return true;
}
return false; return false;
}, },
} }

View file

@ -1,4 +1,5 @@
module.exports = { /** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true, reactStrictMode: true,
rewrites: async () => ({ rewrites: async () => ({
fallback: [ fallback: [
@ -9,3 +10,5 @@ module.exports = {
], ],
}), }),
}; };
module.exports = nextConfig;

View file

@ -27,11 +27,11 @@
"graphql-request": "^6.1.0", "graphql-request": "^6.1.0",
"http-proxy-middleware": "^2.0.6", "http-proxy-middleware": "^2.0.6",
"material-ui-popup-state": "^5.0.8", "material-ui-popup-state": "^5.0.8",
"next": "^13", "next": "13.4.3",
"next-auth": "^4.22.1", "next-auth": "^4.22.1",
"next-http-proxy-middleware": "^1.2.5", "next-http-proxy-middleware": "^1.2.5",
"react": "^18", "react": "18.2.0",
"react-dom": "^18", "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.1", "sharp": "^0.32.1",
@ -39,7 +39,7 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.21.8", "@babel/core": "^7.21.8",
"@types/react": "^18", "@types/react": "18.2.7",
"@types/uuid": "^9.0.1", "@types/uuid": "^9.0.1",
"babel-loader": "^9.1.2", "babel-loader": "^9.1.2",
"eslint": "^8.41.0", "eslint": "^8.41.0",
@ -50,6 +50,6 @@
"eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2", "eslint-plugin-react": "^7.32.2",
"typescript": "^5.0.4" "typescript": "5.0.4"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "es2020", "target": "es5",
"lib": ["dom", "dom.iterable", "esnext"], "lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true, "allowJs": true,
"skipLibCheck": true, "skipLibCheck": true,
@ -14,6 +14,9 @@
"isolatedModules": true, "isolatedModules": true,
"jsx": "preserve", "jsx": "preserve",
"incremental": true, "incremental": true,
"paths": {
"@/*": ["./*"]
},
"baseUrl": "." "baseUrl": "."
}, },
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],

View file

@ -20,10 +20,10 @@
"ra-input-rich-text": "^4.10.6", "ra-input-rich-text": "^4.10.6",
"ra-language-english": "^4.10.6", "ra-language-english": "^4.10.6",
"ra-postgraphile": "^6.1.0", "ra-postgraphile": "^6.1.0",
"react": "^18", "react": "18.2.0",
"react-admin": "^4.10.6", "react-admin": "^4.10.6",
"react-digit-input": "^2.1.0", "react-digit-input": "^2.1.0",
"react-dom": "^18", "react-dom": "18.2.0",
"react-qr-code": "^2.0.11", "react-qr-code": "^2.0.11",
"react-redux": "^8.0.5", "react-redux": "^8.0.5",
"react-timer-hook": "^3.0.6", "react-timer-hook": "^3.0.6",
@ -42,12 +42,12 @@
"devDependencies": { "devDependencies": {
"@next/eslint-plugin-next": "^13.4.3", "@next/eslint-plugin-next": "^13.4.3",
"@types/hapi__wreck": "17.0.1", "@types/hapi__wreck": "17.0.1",
"@types/react": "^18", "@types/react": "18.2.7",
"@types/react-mic": "12.4.3", "@types/react-mic": "12.4.3",
"babel-preset-link": "*", "babel-preset-link": "*",
"eslint-config-link": "*", "eslint-config-link": "*",
"jest-config-link": "*", "jest-config-link": "*",
"tsconfig-link": "*", "tsconfig-link": "*",
"typescript": "^5.0.4" "typescript": "5.0.4"
} }
} }

6540
package-lock.json generated

File diff suppressed because it is too large Load diff