From 734626f438fb471f3d872520c200ba65cf594014 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Wed, 3 Jul 2019 00:30:08 +0300
Subject: [PATCH] Remove esmodule interop

---
 src/components/AdminHeader/AdminHeader.tsx       |  8 ++++----
 src/components/Header/Header.tsx                 | 16 ++++++++--------
 .../NavbarDropdownLink/NavbarDropdownLink.tsx    |  6 +++---
 src/components/Navigation/Navigation.tsx         |  6 +++---
 .../SignupQuestionsWidget/Question.tsx           |  4 ++--
 .../SignupQuestionsWidget/QuestionList.tsx       |  4 ++--
 src/routes.tsx                                   |  8 ++++----
 tsconfig.json                                    |  1 -
 8 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/components/AdminHeader/AdminHeader.tsx b/src/components/AdminHeader/AdminHeader.tsx
index d4bcc8a..c19455e 100644
--- a/src/components/AdminHeader/AdminHeader.tsx
+++ b/src/components/AdminHeader/AdminHeader.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, Component } from "react";
+import * as React from "react";
 import { Link } from "react-router-dom";
 // @ts-ignore
 import * as TitleImage from "../../assets/img/SIK_RGB_W_side.png";
@@ -7,17 +7,17 @@ import "./AdminHeader.scss";
 export interface AdminHeaderProps { }
 export interface AdminHeaderState { }
 
-class AdminHeader extends Component<AdminHeaderProps, AdminHeaderState> {
+class AdminHeader extends React.Component<AdminHeaderProps, AdminHeaderState> {
   render() {
     return (
-      <Fragment>
+      <React.Fragment>
         <header className="header admin-header">
           <Link to="/">
             <img src={TitleImage} />
           </Link>
           <div className="heading">Admin panel</div>
         </header>
-      </Fragment>
+      </React.Fragment>
     );
   }
 }
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 0971bd8..8401756 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, Component } from "react";
+import * as React from "react";
 import { Link } from "react-router-dom";
 import "./Header.scss";
 import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink";
@@ -12,7 +12,7 @@ export interface HeaderState {
   mobileMenuOpen: boolean;
 }
 
-class Header extends Component<HeaderProps, HeaderState> {
+class Header extends React.Component<HeaderProps, HeaderState> {
   constructor(props) {
     super(props);
     this.state = {
@@ -22,7 +22,7 @@ class Header extends Component<HeaderProps, HeaderState> {
 
   renderNavigationDesktopItems = () => {
     return (
-      <Fragment>
+      <React.Fragment>
         <NavbarDropdownLink to="/kilta" text="Kilta ›">
           <NavbarChildLink to="/kilta/toiminta">Toiminta</NavbarChildLink>
           <NavbarChildLink to="/kilta/fuksi">Fuksi</NavbarChildLink>
@@ -34,13 +34,13 @@ class Header extends Component<HeaderProps, HeaderState> {
           {/* <NavbarChildLink to="https://en.wikipedia.org/wiki/Gay">Simo Höglund</NavbarChildLink> */}
         </NavbarDropdownLink>
         <NavbarDropdownLink to="/in_english" text="In English"></NavbarDropdownLink>
-      </Fragment>
+      </React.Fragment>
     );
   }
 
   renderNavigationMobileItems = () => {
     return (
-      <Fragment>
+      <React.Fragment>
         <NavbarDropdownLink to="/kilta" text="Kilta ›" exploded>
           <NavbarChildLink to="/kilta/toiminta">Toiminta</NavbarChildLink>
           <NavbarChildLink to="/kilta/fuksi">Fuksi</NavbarChildLink>
@@ -52,7 +52,7 @@ class Header extends Component<HeaderProps, HeaderState> {
           {/* <NavbarChildLink to="https://en.wikipedia.org/wiki/Gay">Simo Höglund</NavbarChildLink> */}
         </NavbarDropdownLink>
         <NavbarDropdownLink to="/in_english" text="In English" exploded />
-      </Fragment>
+      </React.Fragment>
     );
   }
 
@@ -68,7 +68,7 @@ class Header extends Component<HeaderProps, HeaderState> {
     const { mobileMenuOpen } = this.state;
 
     return (
-      <Fragment>
+      <React.Fragment>
         <div className="header">
           <Link to="/">
             <img className="logo" src={TitleImage} />
@@ -81,7 +81,7 @@ class Header extends Component<HeaderProps, HeaderState> {
         <div className="navigation-mobile-menu" hidden={!mobileMenuOpen}>
           {mobileItems}
         </div>
-      </Fragment>
+      </React.Fragment>
     );
   }
 }
diff --git a/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx b/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx
index 6c7e017..f6aebf7 100644
--- a/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx
+++ b/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import * as React from "react";
 import "./NavbarDropdownLink.scss";
 import DropDownBox from "../DropDownBox/DropDownBox";
 import Anchor from "../Anchor";
@@ -53,12 +53,12 @@ class NavbarDropdownLink extends React.Component<NavbarDropdownLinkProps, Navbar
 
     if (exploded) {
       return (
-        <Fragment>
+        <React.Fragment>
           <Anchor className="navbar-dropdown-link"
             to={this.props.to}
           >{text}</Anchor>
           {children}
-        </Fragment>
+        </React.Fragment>
       );
     }
 
diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx
index fbdb9d8..0498e80 100644
--- a/src/components/Navigation/Navigation.tsx
+++ b/src/components/Navigation/Navigation.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import * as React from "react";
 import "./Navigation.scss";
 import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink";
 import NavbarChildLink from "../NavbarChildLink/NavbarChildLink";
@@ -30,7 +30,7 @@ class Navigation extends React.Component<NavigationProps, NavigationState> {
     const { menuOpen } = this.state;
     const { items } = this.props;
     return (
-      <Fragment>
+      <React.Fragment>
         <div className="navigation">
           {items}
           <div className="navigation-some">
@@ -42,7 +42,7 @@ class Navigation extends React.Component<NavigationProps, NavigationState> {
             <Icon name={IconType.HamburgerMenu} onClick={this.handleMobileMenuClick} />
           </div>
         </div>
-      </Fragment>
+      </React.Fragment>
     );
   }
 }
diff --git a/src/components/SignupQuestionsWidget/Question.tsx b/src/components/SignupQuestionsWidget/Question.tsx
index b8b2c08..5aaa5db 100644
--- a/src/components/SignupQuestionsWidget/Question.tsx
+++ b/src/components/SignupQuestionsWidget/Question.tsx
@@ -1,11 +1,11 @@
-import React, { Component } from "react";
+import * as React from "react";
 
 export interface QuestionProps {
   children: any;
   onRemove: () => any;
 }
 
-class Question extends Component<QuestionProps> {
+class Question extends React.Component<QuestionProps> {
   render() {
     const { children, onRemove } = this.props;
 
diff --git a/src/components/SignupQuestionsWidget/QuestionList.tsx b/src/components/SignupQuestionsWidget/QuestionList.tsx
index 2dea3f3..9ae47f3 100644
--- a/src/components/SignupQuestionsWidget/QuestionList.tsx
+++ b/src/components/SignupQuestionsWidget/QuestionList.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import * as React from "react";
 import * as shortid from "shortid";
 import { Draggable } from "react-beautiful-dnd";
 import { Question, InputProps, optionTypes, SignupQuestionError } from "./index";
@@ -14,7 +14,7 @@ export interface QuestionListProps {
 }
 export interface QuestionListState { }
 
-class QuestionList extends Component<QuestionListProps, QuestionListState> {
+class QuestionList extends React.Component<QuestionListProps, QuestionListState> {
   renderTextWidget = ({ questions, value, index }: InputProps) => (
     <input type="text" value={value} onChange={this.handleNameInputChange(questions, index)} />
   )
diff --git a/src/routes.tsx b/src/routes.tsx
index 6494f6b..9cb3d21 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from "react";
+import * as React from "react";
 import { Switch, Route, Redirect } from "react-router-dom";
 import Helmet from "react-helmet";
 import FrontPage from "./pages/FrontPage";
@@ -68,10 +68,10 @@ const adminRoutes = [
   { path: "/admin", page: AdminFrontPage },
 ];
 
-class Routes extends Component {
+class Routes extends React.Component {
   render() {
     return (
-      <Fragment>
+      <React.Fragment>
         <Helmet>
           <title>Aalto-yliopiston Sähköinsinoorikilta ry</title>
           <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
@@ -89,7 +89,7 @@ class Routes extends Component {
           {adminRoutes.map(r => <Route key={r.path} exact path={r.path} render={renderAdminPage(r.page)} />)}
           <Route component={NotFoundPage} />
         </Switch>
-      </Fragment>
+      </React.Fragment>
     );
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index b59b044..d6dfe84 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "esModuleInterop": true,
     "outDir": "./dist/",
     "sourceMap": true,
     "noImplicitAny": false,