From 1911687a53561f78c41ad1409825024cbcf5b216 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 16 Jun 2020 23:40:32 +0300 Subject: [PATCH] Type fixes --- package-lock.json | 25 ++++++++++++++++--- package.json | 4 ++- plop-templates/page.tsx | 2 +- src/pages/ActualPage/ActualPage.tsx | 2 +- src/pages/AdminEventPage/AdminEventPage.tsx | 2 +- src/pages/AdminFeedPage/AdminFeedPage.tsx | 2 +- src/pages/AdminFrontPage/AdminFrontPage.tsx | 2 +- src/pages/AdminLoginPage/AdminLoginPage.tsx | 2 +- src/pages/AdminSignupPage/AdminSignupPage.tsx | 2 +- src/pages/ContactsPage/ContactsPage.tsx | 2 +- src/pages/CorporatePage/CorporatePage.tsx | 2 +- src/pages/EventCreatePage/EventCreatePage.tsx | 2 +- src/pages/EventPage/EventPage.tsx | 2 +- src/pages/FeedCreatePage/FeedCreatePage.tsx | 2 +- src/pages/FreshmenPage/FreshmenPage.tsx | 2 +- src/pages/GuildPage/GuildPage.tsx | 2 +- src/pages/InEnglishPage/InEnglishPage.tsx | 2 +- src/pages/NotFoundPage/NotFoundPage.tsx | 2 +- src/pages/SignUpPage/SignUpPage.tsx | 2 +- .../SignupCreatePage/SignupCreatePage.tsx | 2 +- src/pages/StudiesPage/StudiesPage.tsx | 2 +- src/routes.tsx | 2 +- src/server/index.ts | 2 +- 23 files changed, 46 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32e409f..733782a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -786,6 +786,25 @@ "@types/react": "*" } }, + "@types/react-helmet": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.0.0.tgz", + "integrity": "sha512-NBMPAxgjpaMooXa51cU1BTgrX6T+hQbMiLm77JhBbfOzPQea3RB5rNpPOD5xGWHIVpGXHd59cltEzIq0qglGcQ==", + "dev": true, + "requires": { + "@types/react": "*" + } + }, + "@types/react-jsonschema-form": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@types/react-jsonschema-form/-/react-jsonschema-form-1.7.3.tgz", + "integrity": "sha512-YiUCSnTA84e8g3zQobA+Iheh3+i3pb7TiIIXT4oEHwenhyrHVB5vPSIi/QeURy6PwVP1LfSCGOAHFRDpE/hAtQ==", + "dev": true, + "requires": { + "@types/json-schema": "*", + "@types/react": "*" + } + }, "@types/unist": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", @@ -19217,9 +19236,9 @@ "dev": true }, "typescript": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.2.tgz", - "integrity": "sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==", + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", + "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 22c9ebd..8d505db 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,8 @@ "@types/node": "10.14.7", "@types/react": "16.8.18", "@types/react-dom": "16.8.4", + "@types/react-helmet": "6.0.0", + "@types/react-jsonschema-form": "1.7.3", "@typescript-eslint/eslint-plugin": "2.6.1", "@typescript-eslint/parser": "2.6.1", "awesome-typescript-loader": "5.2.1", @@ -101,7 +103,7 @@ "stylelint-webpack-plugin": "1.0.3", "testcafe": "1.6.1", "testcafe-react-selectors": "2.1.0", - "typescript": "3.7.2", + "typescript": "3.9.5", "uglifyjs-webpack-plugin": "1.3.0", "webpack": "4.41.2", "webpack-cdn-plugin": "3.2.0", diff --git a/plop-templates/page.tsx b/plop-templates/page.tsx index 5411e82..24736dd 100644 --- a/plop-templates/page.tsx +++ b/plop-templates/page.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./{{ properCase name}}.scss"; export interface {{ properCase name }}Props {} diff --git a/src/pages/ActualPage/ActualPage.tsx b/src/pages/ActualPage/ActualPage.tsx index 26a4ca3..63e003f 100644 --- a/src/pages/ActualPage/ActualPage.tsx +++ b/src/pages/ActualPage/ActualPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./ActualPage.scss"; export interface ActualPageProps {} diff --git a/src/pages/AdminEventPage/AdminEventPage.tsx b/src/pages/AdminEventPage/AdminEventPage.tsx index fb7a23f..d697b84 100644 --- a/src/pages/AdminEventPage/AdminEventPage.tsx +++ b/src/pages/AdminEventPage/AdminEventPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import Anchor from "../../components/Anchor"; import { formatRelative } from "date-fns"; diff --git a/src/pages/AdminFeedPage/AdminFeedPage.tsx b/src/pages/AdminFeedPage/AdminFeedPage.tsx index a0b6d09..2b91e24 100644 --- a/src/pages/AdminFeedPage/AdminFeedPage.tsx +++ b/src/pages/AdminFeedPage/AdminFeedPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import Anchor from "../../components/Anchor"; import "./AdminFeedPage.scss"; import { StaticContext } from "../../server/StaticContext"; diff --git a/src/pages/AdminFrontPage/AdminFrontPage.tsx b/src/pages/AdminFrontPage/AdminFrontPage.tsx index 0d3aac1..1739689 100644 --- a/src/pages/AdminFrontPage/AdminFrontPage.tsx +++ b/src/pages/AdminFrontPage/AdminFrontPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import Anchor from "../../components/Anchor"; import "./AdminFrontPage.scss"; diff --git a/src/pages/AdminLoginPage/AdminLoginPage.tsx b/src/pages/AdminLoginPage/AdminLoginPage.tsx index bacd343..1de4efc 100644 --- a/src/pages/AdminLoginPage/AdminLoginPage.tsx +++ b/src/pages/AdminLoginPage/AdminLoginPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import { Redirect } from "react-router-dom"; import * as qs from "query-string"; import { generateToken, setTokenCookie, isAuthenticated } from "../../auth"; diff --git a/src/pages/AdminSignupPage/AdminSignupPage.tsx b/src/pages/AdminSignupPage/AdminSignupPage.tsx index 0494e55..8bd5c04 100644 --- a/src/pages/AdminSignupPage/AdminSignupPage.tsx +++ b/src/pages/AdminSignupPage/AdminSignupPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; import Anchor from "../../components/Anchor"; diff --git a/src/pages/ContactsPage/ContactsPage.tsx b/src/pages/ContactsPage/ContactsPage.tsx index 673504e..349b587 100644 --- a/src/pages/ContactsPage/ContactsPage.tsx +++ b/src/pages/ContactsPage/ContactsPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./ContactsPage.scss"; import { ColorEnum, getColor, getHoverColor } from "../../components/ColorDiv/ColorDiv"; import { StaticContext } from "../../server/StaticContext"; diff --git a/src/pages/CorporatePage/CorporatePage.tsx b/src/pages/CorporatePage/CorporatePage.tsx index af2a243..b4af626 100644 --- a/src/pages/CorporatePage/CorporatePage.tsx +++ b/src/pages/CorporatePage/CorporatePage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./CorporatePage.scss"; export interface CorporatePageProps {} diff --git a/src/pages/EventCreatePage/EventCreatePage.tsx b/src/pages/EventCreatePage/EventCreatePage.tsx index 5a714a2..0604b08 100644 --- a/src/pages/EventCreatePage/EventCreatePage.tsx +++ b/src/pages/EventCreatePage/EventCreatePage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./EventCreatePage.scss"; import { isAuthenticated } from "../../auth"; import Form from "react-jsonschema-form"; diff --git a/src/pages/EventPage/EventPage.tsx b/src/pages/EventPage/EventPage.tsx index 16b6c8b..6cd3797 100644 --- a/src/pages/EventPage/EventPage.tsx +++ b/src/pages/EventPage/EventPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./EventPage.scss"; import { Event, getEvent } from "../../models/Event"; import { RouteComponentProps } from "react-router-dom"; diff --git a/src/pages/FeedCreatePage/FeedCreatePage.tsx b/src/pages/FeedCreatePage/FeedCreatePage.tsx index 3fd29a3..6d6bcb4 100644 --- a/src/pages/FeedCreatePage/FeedCreatePage.tsx +++ b/src/pages/FeedCreatePage/FeedCreatePage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./FeedCreatePage.scss"; import { isAuthenticated } from "../../auth"; import Form from "react-jsonschema-form"; diff --git a/src/pages/FreshmenPage/FreshmenPage.tsx b/src/pages/FreshmenPage/FreshmenPage.tsx index 55cbd38..6c32014 100644 --- a/src/pages/FreshmenPage/FreshmenPage.tsx +++ b/src/pages/FreshmenPage/FreshmenPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./FreshmenPage.scss"; export interface FreshmenPageProps {} diff --git a/src/pages/GuildPage/GuildPage.tsx b/src/pages/GuildPage/GuildPage.tsx index fd54614..c100411 100644 --- a/src/pages/GuildPage/GuildPage.tsx +++ b/src/pages/GuildPage/GuildPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./GuildPage.scss"; import PageSection from "../../components/PageSection"; import MainSection from "../../components/MainSection"; diff --git a/src/pages/InEnglishPage/InEnglishPage.tsx b/src/pages/InEnglishPage/InEnglishPage.tsx index 80a7c1a..c2dff29 100644 --- a/src/pages/InEnglishPage/InEnglishPage.tsx +++ b/src/pages/InEnglishPage/InEnglishPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./InEnglishPage.scss"; export interface InEnglishPageProps {} diff --git a/src/pages/NotFoundPage/NotFoundPage.tsx b/src/pages/NotFoundPage/NotFoundPage.tsx index 0108242..036ffed 100644 --- a/src/pages/NotFoundPage/NotFoundPage.tsx +++ b/src/pages/NotFoundPage/NotFoundPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./NotFoundPage.scss"; export interface NotFoundPageProps { } diff --git a/src/pages/SignUpPage/SignUpPage.tsx b/src/pages/SignUpPage/SignUpPage.tsx index 9b704b2..cc10ad0 100644 --- a/src/pages/SignUpPage/SignUpPage.tsx +++ b/src/pages/SignUpPage/SignUpPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import Form from "react-jsonschema-form"; import "./SignUpPage.scss"; import { getForm, SignupForm } from "../../models/SignupForm"; diff --git a/src/pages/SignupCreatePage/SignupCreatePage.tsx b/src/pages/SignupCreatePage/SignupCreatePage.tsx index 433a776..69036fe 100644 --- a/src/pages/SignupCreatePage/SignupCreatePage.tsx +++ b/src/pages/SignupCreatePage/SignupCreatePage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import { Link } from "react-router-dom"; import "./SignupCreatePage.scss"; import Form from "react-jsonschema-form"; diff --git a/src/pages/StudiesPage/StudiesPage.tsx b/src/pages/StudiesPage/StudiesPage.tsx index 402aa5f..7069942 100644 --- a/src/pages/StudiesPage/StudiesPage.tsx +++ b/src/pages/StudiesPage/StudiesPage.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import "./StudiesPage.scss"; export interface StudiesPageProps {} diff --git a/src/routes.tsx b/src/routes.tsx index 3e36dcf..24e7778 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { Switch, Route, Redirect } from "react-router-dom"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import FrontPage from "./pages/FrontPage"; import GuildPage from "./pages/GuildPage"; import NotFoundPage from "./pages/NotFoundPage"; diff --git a/src/server/index.ts b/src/server/index.ts index 399059e..125534f 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -1,5 +1,5 @@ import * as React from "react"; -import Helmet from "react-helmet"; +import { Helmet } from "react-helmet"; import * as express from "express"; import { renderToString } from "react-dom/server"; import * as morgan from "morgan";