From 3610a9dc32ba29f202c3b31bd44e7f67cb334ee0 Mon Sep 17 00:00:00 2001 From: Joseph Chamochumbi Date: Mon, 13 Mar 2023 17:13:55 +0100 Subject: [PATCH] refactor: Ensure crypto is not browserified --- .gitignore | 3 + demo-app/.vscode/settings.json | 4 + demo-app/next.config.js | 7 +- demo-app/package.json | 11 +- demo-app/src/components/CaptureDialog.tsx | 6 +- demo-app/src/components/Navigation.tsx | 22 +- demo-app/src/components/PokeArticle.tsx | 4 +- demo-app/src/hooks/usePokemon.ts | 2 +- demo-app/src/lib/constants.ts | 3 + demo-app/src/lib/pokemon.ts | 4 +- demo-app/src/lib/token.ts | 2 +- .../{pages/_middleware.ts => middleware.ts} | 4 +- demo-app/src/pages/collection.tsx | 44 +- demo-app/src/pages/index.tsx | 38 +- demo-app/yarn.lock | 1145 +++++++++++++---- 15 files changed, 958 insertions(+), 341 deletions(-) create mode 100644 demo-app/.vscode/settings.json rename demo-app/src/{pages/_middleware.ts => middleware.ts} (91%) diff --git a/.gitignore b/.gitignore index 476ca71..0535221 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ yarn-error.log* # decks-output dist + +# next bundle analyzer output +analyze diff --git a/demo-app/.vscode/settings.json b/demo-app/.vscode/settings.json new file mode 100644 index 0000000..d067910 --- /dev/null +++ b/demo-app/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib", + "typescript.enablePromptUseWorkspaceTsdk": true +} \ No newline at end of file diff --git a/demo-app/next.config.js b/demo-app/next.config.js index 6b4a024..9e8f64b 100644 --- a/demo-app/next.config.js +++ b/demo-app/next.config.js @@ -1,3 +1,8 @@ +const withBundleAnalyzer = require("@next/bundle-analyzer")({ + enabled: + process.env.ANALYZE === "true" && process.env.NODE_ENV === "production", +}); + /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, @@ -9,4 +14,4 @@ const nextConfig = { }, }; -module.exports = nextConfig; +module.exports = withBundleAnalyzer(nextConfig); diff --git a/demo-app/package.json b/demo-app/package.json index 4981991..dee7961 100644 --- a/demo-app/package.json +++ b/demo-app/package.json @@ -11,22 +11,23 @@ "dependencies": { "@reach/dialog": "0.16.2", "framer-motion": "6.2.8", - "jose": "4.6.0", + "jose": "4.13.1", "nanoid": "3.3.1", "nes.css": "2.3.0", - "next": "12.1.0", - "react": "17.0.2", - "react-dom": "17.0.2", + "next": "13.2.4", + "react": "18.2.0", + "react-dom": "18.2.0", "styled-components": "5.3.3", "superstruct": "0.15.4", "swr": "1.2.2" }, "devDependencies": { + "@next/bundle-analyzer": "13.2.4", "@types/node": "17.0.21", "@types/react": "17.0.40", "@types/styled-components": "5.1.24", "eslint": "8.11.0", - "eslint-config-next": "12.1.0", + "eslint-config-next": "13.2.4", "eslint-plugin-import": "^2.25.4", "typescript": "4.6.2" } diff --git a/demo-app/src/components/CaptureDialog.tsx b/demo-app/src/components/CaptureDialog.tsx index dc155c9..6af028b 100644 --- a/demo-app/src/components/CaptureDialog.tsx +++ b/demo-app/src/components/CaptureDialog.tsx @@ -46,10 +46,8 @@ export const CaptureDialog = ({ )} - - - {captured?.name} - + + {captured?.name}