refactor: return to named exports

Author: coder2000

.eslintrc.json

@@ -19,6 +19,7 @@
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:prettier/recommended",
+    "prettier",
     "prettier/@typescript-eslint",
     "prettier/react",
     "airbnb-typescript",
@@ -36,9 +37,6 @@
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/indent": "off",
     "prettier/prettier": ["error", {}, { "usePrettierrc": true }],
-    "react/jsx-wrap-multilines": [
-      "error",
-      { "declaration": false, "assignment": false }
-    ]
+    "react/jsx-wrap-multilines": ["error", { "declaration": false, "assignment": false }]
   }
 }

packages/client/src/components/App.tsx

@@ -3,7 +3,7 @@ import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
 import ApolloClient from 'apollo-boost';
 import { ApolloProvider } from '@apollo/react-hooks';
 import { CssBaseline } from '@material-ui/core';
-import Home from './Home';
+import { Home } from './Home';
 
 export default function App() {
   const client = new ApolloClient({

packages/client/src/components/Home.tsx

@@ -12,7 +12,7 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-export default function Home() {
+export function Home() {
   const classes = useStyles();
 
   return (

packages/client/src/components/episodes/EpisodeItem.tsx

@@ -7,7 +7,7 @@ interface EpisodeItemProps {
   episode: Episode;
 }
 
-export default function EpisodeItem(props: EpisodeItemProps) {
+export function EpisodeItem(props: EpisodeItemProps) {
   const { episode } = props;
 
   return (

packages/client/src/components/episodes/EpisodeList.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Grid, GridProps } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import { EpisodeConnection } from '../../interfaces';
-import EpisodeItem from './EpisodeItem';
+import { EpisodeItem } from './EpisodeItem';
 
 interface EpisodeListProps {
   episodes: EpisodeConnection;
@@ -45,7 +45,7 @@ function GridBackground(props: StyleProps & Omit<GridProps, keyof StyleProps>) {
   );
 }
 
-export default function EpisodeList(props: EpisodeListProps) {
+export function EpisodeList(props: EpisodeListProps) {
   const { episodes } = props;
 
   return (

packages/client/src/components/episodes/index.ts

@@ -1,3 +1 @@
-import EpisodeList from './EpisodeList';
-
-export default EpisodeList;
+export { EpisodeList } from './EpisodeList';

packages/client/src/components/podcast/AddPodcastFab.tsx

@@ -45,7 +45,7 @@ interface CreateOneQueueInput {
   queue: Queue;
 }
 
-export default function AddPodcastFab() {
+export function AddPodcastFab() {
   const classes = useStyles();
   const [open, setOpen] = useState(false);
   const { register, handleSubmit } = useForm<FormData>();

packages/client/src/components/podcast/PodcastCard.tsx

@@ -25,7 +25,7 @@ import clsx from 'clsx';
 import { gql } from 'apollo-boost';
 import { useMutation } from '@apollo/react-hooks';
 import { Podcast } from '../../interfaces';
-import EpisodeList from '../episodes';
+import { EpisodeList } from '../episodes';
 
 interface PodcastProps {
   podcast: Podcast;
@@ -60,7 +60,7 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-export default function PodcastCard(props: PodcastProps) {
+export function PodcastCard(props: PodcastProps) {
   const { podcast } = props;
   const [anchorElement, setAnchorElement] = useState<null | HTMLElement>(null);
   const [visible, setVisible] = useState(true);

packages/client/src/components/podcast/PodcastList.tsx

@@ -51,7 +51,7 @@ const GET_PODCASTS = gql`
   }
 `;
 
-export default function PodcastList() {
+export function PodcastList() {
   const { loading, data } = useQuery<Podcasts>(GET_PODCASTS);
 
   return (

packages/client/src/components/podcast/index.ts

@@ -1,3 +1,3 @@
-export { default as AddPodcastFab } from './AddPodcastFab';
-export { default as PodcastCard } from './PodcastCard';
-export { default as PodcastList } from './PodcastList';
+export { AddPodcastFab } from './AddPodcastFab';
+export { PodcastCard } from './PodcastCard';
+export { PodcastList } from './PodcastList';

packages/server/ormconfig.ts

@@ -1,18 +1,27 @@
+import path from 'path';
 import { ConnectionOptions } from 'typeorm';
 import { config } from 'dotenv';
 
 config();
 
+let port: number;
+
+if (process.env.DATABASE_PORT) {
+  port = parseInt(process.env.DATABASE_PORT, 10);
+} else {
+  port = 5432;
+}
+
 const databaseConfig: ConnectionOptions = {
   type: 'postgres',
   host: process.env.DATABASE_HOST || 'localhost',
-  port: parseInt(process.env.DATABASE_PORT) || 5432,
+  port,
   database: process.env.DATABASE_SCHEMA || 'speakrr',
   username: process.env.DATABASE_USERNAME || 'speakrr',
   password: process.env.DATABASE_PASSWORD || 'speakrr',
 
-  entities: [__dirname + '/**/*.entity.{ts,js}'],
-  migrations: [__dirname + '/src/db/migrations/*.{ts,js}'],
+  entities: [path.join(__dirname, '**', '*.entity.{ts,js}')],
+  migrations: [path.join(__dirname, 'src', 'db', 'migrations', '*.{ts,js}')],
 
   synchronize: false,
 

packages/server/src/modules/app/TypeOrmPinoLogger.ts

@@ -1,14 +1,15 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { Logger, QueryRunner } from 'typeorm';
 import { PinoLogger } from 'nestjs-pino';
 
 export class TypeOrmPinoLogger implements Logger {
   constructor(private readonly logger: PinoLogger) {}
 
-  logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner) {
+  logQuery(query: string, parameters?: any[], _queryRunner?: QueryRunner) {
     const sql =
       query +
       (parameters && parameters.length
-        ? ` -- PARAMETERS: ${this.stringifyParams(parameters)}`
+        ? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}`
         : '');
     this.logger.debug(sql);
   }
@@ -17,12 +18,12 @@ export class TypeOrmPinoLogger implements Logger {
     error: string,
     query: string,
     parameters?: any[],
-    queryRunner?: QueryRunner
+    queryRunner?: QueryRunner,
   ) {
     const sql =
       query +
       (parameters && parameters.length
-        ? ` -- PARAMETERS: ${this.stringifyParams(parameters)}`
+        ? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}`
         : '');
     this.logger.error(sql);
   }
@@ -31,12 +32,12 @@ export class TypeOrmPinoLogger implements Logger {
     time: number,
     query: string,
     parameters?: any[],
-    queryRunner?: QueryRunner
+    queryRunner?: QueryRunner,
   ) {
     const sql =
       query +
       (parameters && parameters.length
-        ? ` -- PARAMETERS: ${this.stringifyParams(parameters)}`
+        ? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}`
         : '');
     this.logger.info(sql);
   }
@@ -58,10 +59,12 @@ export class TypeOrmPinoLogger implements Logger {
       case 'warn':
         this.logger.warn(message);
         break;
+      default:
+        break;
     }
   }
 
-  protected stringifyParams(parameters: any[]) {
+  protected static stringifyParams(parameters: any[]) {
     try {
       return JSON.stringify(parameters);
     } catch (error) {