From 4f2b7934e21b85bba4e2c3e2f3e4f9f4f0b8076c Mon Sep 17 00:00:00 2001 From: Abel Luck Date: Mon, 13 Mar 2023 16:46:59 +0000 Subject: [PATCH] metamigo-frontend: start frontend cleanup --- apps/metamigo-frontend/.eslintrc | 3 - apps/metamigo-frontend/.eslintrc.js | 10 + .../metamigo-frontend/lib/nextauth-adapter.ts | 2 +- apps/metamigo-frontend/package.json | 17 +- apps/metamigo-frontend/tsconfig.json | 1 + package-lock.json | 241 ++++++++++++++++++ 6 files changed, 263 insertions(+), 11 deletions(-) delete mode 100644 apps/metamigo-frontend/.eslintrc create mode 100644 apps/metamigo-frontend/.eslintrc.js diff --git a/apps/metamigo-frontend/.eslintrc b/apps/metamigo-frontend/.eslintrc deleted file mode 100644 index 15b1ed9..0000000 --- a/apps/metamigo-frontend/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "next" -} diff --git a/apps/metamigo-frontend/.eslintrc.js b/apps/metamigo-frontend/.eslintrc.js new file mode 100644 index 0000000..3eeda53 --- /dev/null +++ b/apps/metamigo-frontend/.eslintrc.js @@ -0,0 +1,10 @@ +require("eslint-config-link/patch/modern-module-resolution"); +module.exports = { + extends: [ + "eslint-config-link/profile/node", + "eslint-config-link/profile/typescript", + "eslint-config-link/profile/jest", + "next" + ], + parserOptions: { tsconfigRootDir: __dirname }, +}; \ No newline at end of file diff --git a/apps/metamigo-frontend/lib/nextauth-adapter.ts b/apps/metamigo-frontend/lib/nextauth-adapter.ts index 0e428e8..a449dbf 100644 --- a/apps/metamigo-frontend/lib/nextauth-adapter.ts +++ b/apps/metamigo-frontend/lib/nextauth-adapter.ts @@ -5,7 +5,7 @@ import type { AppOptions } from "next-auth"; import * as Wreck from "@hapi/wreck"; import * as Boom from "@hapi/boom"; -import type { IAppConfig } from "config"; +import type { IAppConfig } from "@digiresilience/metamigo-config"; export interface Profile { name: string; diff --git a/apps/metamigo-frontend/package.json b/apps/metamigo-frontend/package.json index 0c7c389..a5d9d65 100644 --- a/apps/metamigo-frontend/package.json +++ b/apps/metamigo-frontend/package.json @@ -3,6 +3,7 @@ "version": "0.2.0", "private": true, "dependencies": { + "@digiresilience/metamigo-config": "*", "@apollo/client": "^3.7.4", "@hapi/boom": "^10.0.0", "@hapi/wreck": "^18.0.0", @@ -30,21 +31,23 @@ "swr": "^2.0.0" }, "scripts": { - "dev": "next dev -p 2999", + "serve": "next dev -p 2999", "build": "next build", "start": "next start", - "fix:lint": "eslint --ext .js,.jsx,.ts,.tsx,.graphql --fix", - "fix:prettier": "prettier --ignore-path .eslintignore \"**/*.{js,jsx,ts,tsx,graphql,md}\" --write", "test": "echo no tests", - "lint": "next lint", - "lint:lint": "eslint --ext .js,.jsx,.ts,.tsx,.graphql", - "lint:prettier": "prettier --ignore-path .eslintignore \"**/*.{js,jsx,ts,tsx,graphql,md}\" --list-different" + "lint": "eslint --ext .js,.jsx,.ts,.tsx,.graphql && next lint && prettier --ignore-path .eslintignore \"**/*.{js,jsx,ts,tsx,graphql,md}\" --write", + "fix:lint": "eslint --ext .js,.jsx,.ts,.tsx,.graphql --fix", + "fmt": "prettier --ignore-path .eslintignore \"**/*.{js,jsx,ts,tsx,graphql,md}\" --list-different" }, "devDependencies": { "@next/eslint-plugin-next": "^13.1.2", "@types/hapi__wreck": "17.0.1", "@types/react": "^17", "@types/react-mic": "12.4.3", - "typescript": "^4.9.5" + "typescript": "^4.9.5", + "tsconfig-link": "*", + "eslint-config-link": "*", + "jest-config-link": "*", + "babel-preset-link": "*" } } diff --git a/apps/metamigo-frontend/tsconfig.json b/apps/metamigo-frontend/tsconfig.json index 253069d..6806613 100644 --- a/apps/metamigo-frontend/tsconfig.json +++ b/apps/metamigo-frontend/tsconfig.json @@ -1,4 +1,5 @@ { + "extends": "tsconfig-link", "compilerOptions": { "target": "es5", "lib": ["dom", "dom.iterable", "esnext"], diff --git a/package-lock.json b/package-lock.json index f3ede94..fa7d63f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -614,6 +614,7 @@ "version": "0.2.0", "dependencies": { "@apollo/client": "^3.7.4", + "@digiresilience/metamigo-config": "*", "@hapi/boom": "^10.0.0", "@hapi/wreck": "^18.0.0", "@mui/icons-material": "^5", @@ -644,6 +645,10 @@ "@types/hapi__wreck": "17.0.1", "@types/react": "^17", "@types/react-mic": "12.4.3", + "babel-preset-link": "*", + "eslint-config-link": "*", + "jest-config-link": "*", + "tsconfig-link": "*", "typescript": "^4.9.5" } }, @@ -4848,6 +4853,126 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@next/swc-android-arm-eabi": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.4.tgz", + "integrity": "sha512-cM42Cw6V4Bz/2+j/xIzO8nK/Q3Ly+VSlZJTa1vHzsocJRYz8KT6MrreXaci2++SIZCF1rVRCDgAg5PpqRibdIA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-android-arm64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.3.4.tgz", + "integrity": "sha512-5jf0dTBjL+rabWjGj3eghpLUxCukRhBcEJgwLedewEA/LJk2HyqCvGIwj5rH+iwmq1llCWbOky2dO3pVljrapg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-darwin-arm64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.4.tgz", + "integrity": "sha512-DqsSTd3FRjQUR6ao0E1e2OlOcrF5br+uegcEGPVonKYJpcr0MJrtYmPxd4v5T6UCJZ+XzydF7eQo5wdGvSZAyA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-darwin-x64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.4.tgz", + "integrity": "sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-freebsd-x64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.4.tgz", + "integrity": "sha512-KM9JXRXi/U2PUM928z7l4tnfQ9u8bTco/jb939pdFUHqc28V43Ohd31MmZD1QzEK4aFlMRaIBQOWQZh4D/E5lQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm-gnueabihf": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.4.tgz", + "integrity": "sha512-3zqD3pO+z5CZyxtKDTnOJ2XgFFRUBciOox6EWkoZvJfc9zcidNAQxuwonUeNts6Xbm8Wtm5YGIRC0x+12YH7kw==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.4.tgz", + "integrity": "sha512-kiX0vgJGMZVv+oo1QuObaYulXNvdH/IINmvdZnVzMO/jic/B8EEIGlZ8Bgvw8LCjH3zNVPO3mGrdMvnEEPEhKA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-musl": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.4.tgz", + "integrity": "sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@next/swc-linux-x64-gnu": { "version": "12.3.4", "cpu": [ @@ -4876,6 +5001,51 @@ "node": ">= 10" } }, + "node_modules/@next/swc-win32-arm64-msvc": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.4.tgz", + "integrity": "sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-ia32-msvc": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.4.tgz", + "integrity": "sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-x64-msvc": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.4.tgz", + "integrity": "sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "license": "MIT", @@ -27042,6 +27212,54 @@ } } }, + "@next/swc-android-arm-eabi": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.4.tgz", + "integrity": "sha512-cM42Cw6V4Bz/2+j/xIzO8nK/Q3Ly+VSlZJTa1vHzsocJRYz8KT6MrreXaci2++SIZCF1rVRCDgAg5PpqRibdIA==", + "optional": true + }, + "@next/swc-android-arm64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.3.4.tgz", + "integrity": "sha512-5jf0dTBjL+rabWjGj3eghpLUxCukRhBcEJgwLedewEA/LJk2HyqCvGIwj5rH+iwmq1llCWbOky2dO3pVljrapg==", + "optional": true + }, + "@next/swc-darwin-arm64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.4.tgz", + "integrity": "sha512-DqsSTd3FRjQUR6ao0E1e2OlOcrF5br+uegcEGPVonKYJpcr0MJrtYmPxd4v5T6UCJZ+XzydF7eQo5wdGvSZAyA==", + "optional": true + }, + "@next/swc-darwin-x64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.4.tgz", + "integrity": "sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==", + "optional": true + }, + "@next/swc-freebsd-x64": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.4.tgz", + "integrity": "sha512-KM9JXRXi/U2PUM928z7l4tnfQ9u8bTco/jb939pdFUHqc28V43Ohd31MmZD1QzEK4aFlMRaIBQOWQZh4D/E5lQ==", + "optional": true + }, + "@next/swc-linux-arm-gnueabihf": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.4.tgz", + "integrity": "sha512-3zqD3pO+z5CZyxtKDTnOJ2XgFFRUBciOox6EWkoZvJfc9zcidNAQxuwonUeNts6Xbm8Wtm5YGIRC0x+12YH7kw==", + "optional": true + }, + "@next/swc-linux-arm64-gnu": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.4.tgz", + "integrity": "sha512-kiX0vgJGMZVv+oo1QuObaYulXNvdH/IINmvdZnVzMO/jic/B8EEIGlZ8Bgvw8LCjH3zNVPO3mGrdMvnEEPEhKA==", + "optional": true + }, + "@next/swc-linux-arm64-musl": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.4.tgz", + "integrity": "sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==", + "optional": true + }, "@next/swc-linux-x64-gnu": { "version": "12.3.4", "optional": true @@ -27050,6 +27268,24 @@ "version": "12.3.4", "optional": true }, + "@next/swc-win32-arm64-msvc": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.4.tgz", + "integrity": "sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==", + "optional": true + }, + "@next/swc-win32-ia32-msvc": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.4.tgz", + "integrity": "sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==", + "optional": true + }, + "@next/swc-win32-x64-msvc": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.4.tgz", + "integrity": "sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==", + "optional": true + }, "@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "requires": { @@ -35277,6 +35513,7 @@ "version": "file:apps/metamigo-frontend", "requires": { "@apollo/client": "^3.7.4", + "@digiresilience/metamigo-config": "*", "@hapi/boom": "^10.0.0", "@hapi/wreck": "^18.0.0", "@mui/icons-material": "^5", @@ -35287,7 +35524,10 @@ "@types/hapi__wreck": "17.0.1", "@types/react": "^17", "@types/react-mic": "12.4.3", + "babel-preset-link": "*", + "eslint-config-link": "*", "http-proxy-middleware": "^2.0.6", + "jest-config-link": "*", "jsonwebtoken": "^9.0.0", "jwks-rsa": "^3.0.1", "material-ui-audio-player": "^1.7.1", @@ -35305,6 +35545,7 @@ "react-qr-code": "^2.0.11", "react-timer-hook": "^3.0.5", "swr": "^2.0.0", + "tsconfig-link": "*", "typescript": "^4.9.5" }, "dependencies": {