From 681117d3ace2c5f710597bad26252cf0bff95c70 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Fri, 25 Aug 2023 09:41:41 +0200 Subject: [PATCH] Fix build errors --- .gitlab-ci.yml | 11 ---- apps/leafcutter/app/(main)/trends/page.tsx | 2 +- apps/leafcutter/tsconfig.json | 13 +---- apps/link/metamigo-package.json | 59 ---------------------- 4 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 apps/link/metamigo-package.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4b8a8c..98b3eaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,17 +95,6 @@ metamigo-docker-release: variables: DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/metamigo -metamigo-frontend-docker-build: - extends: .docker-build - variables: - DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/metamigo-frontend - DOCKERFILE_PATH: ./apps/metamigo-frontend/Dockerfile - -metamigo-frontend-docker-release: - extends: .docker-release - variables: - DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/metamigo-frontend - elasticsearch-docker-build: extends: .docker-build variables: diff --git a/apps/leafcutter/app/(main)/trends/page.tsx b/apps/leafcutter/app/(main)/trends/page.tsx index 9230267..221c6e3 100644 --- a/apps/leafcutter/app/(main)/trends/page.tsx +++ b/apps/leafcutter/app/(main)/trends/page.tsx @@ -1,5 +1,5 @@ import { getTrends } from "app/_lib/opensearch"; -import { Trends } from "../../../../../packages/leafcutter-common/components/Trends"; +import { Trends } from "leafcutter-common"; export default async function Page() { const visualizations = await getTrends(25); diff --git a/apps/leafcutter/tsconfig.json b/apps/leafcutter/tsconfig.json index 25ba45d..bb36cfa 100644 --- a/apps/leafcutter/tsconfig.json +++ b/apps/leafcutter/tsconfig.json @@ -24,17 +24,6 @@ } ] }, - "include": [ - "next-env.d.ts", - "**/*.ts", - "**/*.tsx", - ".next/types/**/*.ts", - "../../packages/leafcutter-common/components/Create.tsx", - "../../packages/leafcutter-common/components/About.tsx", - "../../packages/leafcutter-common/components/FAQ.tsx", - "../../packages/leafcutter-common/components/Trends.tsx", - "../../packages/leafcutter-common/components/Preview.tsx", - "app/(main)/setup/_components/Setup.tsx" -, "app/api/proxy/[[...path]]" ], + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], "exclude": ["node_modules", "babel__core"] } diff --git a/apps/link/metamigo-package.json b/apps/link/metamigo-package.json deleted file mode 100644 index 36bb76f..0000000 --- a/apps/link/metamigo-package.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "@digiresilience/metamigo-frontend", - "version": "0.2.0", - "private": true, - "dependencies": { - "@apollo/client": "^3.7.17", - "@digiresilience/metamigo-config": "*", - "@hapi/boom": "^10.0.1", - "@hapi/wreck": "^18.0.1", - "@mui/icons-material": "^5", - "@mui/material": "^5", - "@mui/styles": "^5", - "@twilio/voice-sdk": "^2.7.1", - "http-proxy-middleware": "^2.0.6", - "jsonwebtoken": "^9.0.1", - "jwks-rsa": "^3.0.1", - "next": "13.4.13", - "next-auth": "4.22.4", - "ra-data-graphql": "^4.12.2", - "ra-i18n-polyglot": "^4.12.2", - "ra-input-rich-text": "^4.12.3", - "ra-language-english": "^4.12.2", - "ra-postgraphile": "^6.1.1", - "react": "18.2.0", - "react-admin": "^4.12.3", - "react-digit-input": "^2.1.0", - "react-dom": "18.2.0", - "react-qr-code": "^2.0.11", - "react-redux": "^8.1.2", - "react-timer-hook": "^3.0.7", - "swr": "^2.2.0", - "twilio-client": "^1.15.0" - }, - "scripts": { - "dev": "next dev -p 2999", - "build": "next build", - "start": "next start", - "test": "echo no tests", - "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}\" --write" - }, - "devDependencies": { - "@next/eslint-plugin-next": "^13.4.13", - "@types/hapi__wreck": "17.0.1", - "@types/react": "18.2.18", - "@types/react-mic": "12.4.3", - "babel-preset-link": "*", - "eslint-config-link": "*", - "jest-config-link": "*", - "tsconfig-link": "*", - "typescript": "5.1.6" - }, - "overrides": { - "@mui/styles": { - "react": "18.2.0" - } - } -}