Skip to content
This repository was archived by the owner on Mar 28, 2024. It is now read-only.

Commit 8c9e8f0

Browse files
committed
chore(deps): update dependency versions
1 parent 9c189de commit 8c9e8f0

File tree

23 files changed

+1140
-564
lines changed

23 files changed

+1140
-564
lines changed

.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"plugin:@typescript-eslint/eslint-recommended",
2020
"plugin:@typescript-eslint/recommended",
2121
"plugin:prettier/recommended",
22-
"prettier",
2322
"prettier/@typescript-eslint",
2423
"prettier/react",
2524
"airbnb-typescript",
26-
"plugin:sonarjs/recommended"
25+
"plugin:sonarjs/recommended",
26+
"prettier"
2727
],
2828
"root": true,
2929
"env": {

.idea/.gitignore

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/Project.xml

Lines changed: 46 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dictionaries/coder2000.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/speakerr.iml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"singleQuote": true,
3-
"trailingComma": "all"
3+
"trailingComma": "all",
4+
"printWidth": 120
45
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"**/typeorm"
1515
],
1616
"devDependencies": {
17-
"@typescript-eslint/eslint-plugin": "^2.33.0",
18-
"@typescript-eslint/parser": "^2.33.0",
17+
"@typescript-eslint/eslint-plugin": "^2.24.0",
18+
"@typescript-eslint/parser": "^2.0.0",
1919
"concurrently": "^5.2.0",
2020
"eslint": "^6.8.0",
2121
"eslint-config-airbnb-typescript": "^7.2.1",
@@ -27,9 +27,9 @@
2727
"eslint-plugin-react": "^7.20.0",
2828
"eslint-plugin-react-hooks": "^2.5.1",
2929
"eslint-plugin-sonarjs": "^0.5.0",
30-
"lerna": "^3.21.0",
30+
"lerna": "^3.22.0",
3131
"prettier": "^2.0.5",
32-
"typescript": "^3.9.2",
32+
"typescript": "^3.9.3",
3333
"wait-on": "^5.0.0"
3434
}
3535
}

packages/client/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"@babel/preset-env": "^7.9.6",
1616
"@babel/preset-react": "^7.9.4",
1717
"@babel/preset-typescript": "^7.9.0",
18-
"@types/html-webpack-plugin": "^3.2.2",
19-
"@types/node": "^14.0.1",
18+
"@types/html-webpack-plugin": "^3.2.3",
19+
"@types/node": "^14.0.5",
2020
"@types/react": "^16.9.35",
2121
"@types/react-dom": "^16.9.8",
2222
"@types/react-html-parser": "^2.0.1",
2323
"@types/react-router": "^5.1.7",
2424
"@types/react-router-dom": "^5.1.5",
2525
"@types/webpack": "^4.41.13",
26-
"@types/webpack-dev-server": "^3.10.1",
26+
"@types/webpack-dev-server": "^3.11.0",
2727
"babel-loader": "^8.1.0",
2828
"babel-plugin-import": "^1.13.0",
2929
"cross-env": "^7.0.2",
@@ -33,14 +33,14 @@
3333
"style-loader": "^1.2.1",
3434
"ts-node": "^8.10.1",
3535
"tsconfig-paths": "^3.9.0",
36-
"typescript": "^3.9.2",
36+
"typescript": "^3.9.3",
3737
"webpack": "^4.43.0",
3838
"webpack-cli": "^3.3.11",
3939
"webpack-dev-server": "^3.11.0"
4040
},
4141
"dependencies": {
4242
"@apollo/react-hooks": "^3.1.5",
43-
"@material-ui/core": "^4.9.14",
43+
"@material-ui/core": "^4.10.0",
4444
"@material-ui/icons": "^4.9.1",
4545
"apollo-boost": "^0.4.9",
4646
"apollo-client": "^2.6.10",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ export function PodcastCard(props: PodcastProps) {
7979
setAnchorElement(null);
8080
};
8181

82-
const handleDeleteClick = () => {
83-
deletePodcast({
82+
const handleDeleteClick = async () => {
83+
await deletePodcast({
8484
variables: { input: { id: podcast.id } },
8585
});
8686

packages/server/.graphqlconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "Speakrr GraphQL Schema",
3+
"schemaPath": "./schema.gql",
4+
"extensions": {
5+
"endpoints": {
6+
"Default GraphQL Endpoint": {
7+
"url": "http://localhost:8080/graphql",
8+
"headers": {
9+
"user-agent": "JS GraphQL"
10+
},
11+
"introspect": false
12+
}
13+
}
14+
}
15+
}

packages/server/package.json

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,49 +28,51 @@
2828
"migration:run": "ts-node -r tsconfig-paths/register node_modules/.bin/typeorm migration:run"
2929
},
3030
"dependencies": {
31-
"@nestjs-query/core": "^0.11.2",
32-
"@nestjs-query/query-graphql": "^0.11.2",
33-
"@nestjs-query/query-typeorm": "^0.11.2",
34-
"@nestjs/common": "^7.0.11",
35-
"@nestjs/config": "^0.4.2",
36-
"@nestjs/core": "^7.0.11",
37-
"@nestjs/graphql": "^7.3.9",
38-
"@nestjs/platform-express": "^7.0.11",
31+
"@nestjs-query/core": "^0.11.6",
32+
"@nestjs-query/query-graphql": "^0.11.6",
33+
"@nestjs-query/query-typeorm": "^0.11.6",
34+
"@nestjs/common": "7.0.13",
35+
"@nestjs/config": "^0.5.0",
36+
"@nestjs/core": "7.0.13",
37+
"@nestjs/graphql": "7.3.9",
38+
"@nestjs/platform-express": "^7.1.0",
3939
"@nestjs/schedule": "^0.4.0",
4040
"@nestjs/serve-static": "^2.1.1",
41-
"@nestjs/typeorm": "^7.0.0",
41+
"@nestjs/typeorm": "7.0.0",
4242
"apollo-server-express": "^2.13.1",
4343
"class-transformer": "^0.2.3",
4444
"class-validator": "^0.12.2",
4545
"dataloader": "^2.0.0",
4646
"dotenv": "^8.2.0",
4747
"graphql": "^14.0.0",
4848
"graphql-relay": "^0.6.0",
49-
"graphql-tools": "^5.0.0",
49+
"graphql-tools": "^6.0.1",
5050
"nestjs-pino": "^1.2.0",
51-
"pg": "^8.2.0",
51+
"pg": "^8.2.1",
5252
"reflect-metadata": "^0.1.13",
5353
"rimraf": "^3.0.2",
5454
"rss-parser": "^3.8.0",
5555
"rxjs": "^6.5.5",
56-
"tslib": "^1.11.2",
57-
"typeorm": "^0.2.24"
56+
"tslib": "^2.0.0",
57+
"typeorm": "^0.2.25"
5858
},
5959
"devDependencies": {
60-
"@nestjs/cli": "^7.1.5",
60+
"@nestjs/cli": "^7.2.0",
6161
"@nestjs/schematics": "^7.0.0",
62-
"@nestjs/testing": "^7.0.11",
62+
"@nestjs/testing": "^7.1.0",
63+
"@types/cron": "^1.7.2",
6364
"@types/express": "^4.17.6",
64-
"@types/jest": "25.2.2",
65-
"@types/node": "^14.0.1",
65+
"@types/jest": "25.2.3",
66+
"@types/node": "^14.0.5",
6667
"@types/supertest": "^2.0.9",
68+
"@types/xml2js": "^0.4.5",
6769
"jest": "^26.0.1",
6870
"pino-pretty": "^4.0.0",
6971
"supertest": "^4.0.2",
70-
"ts-jest": "25.5.1",
72+
"ts-jest": "26.0.0",
7173
"ts-node": "^8.10.1",
7274
"tsconfig-paths": "^3.9.0",
73-
"typescript": "^3.9.2"
75+
"typescript": "^3.9.3"
7476
},
7577
"jest": {
7678
"moduleFileExtensions": [

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

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,21 @@ export class TypeOrmPinoLogger implements Logger {
88
logQuery(query: string, parameters?: any[], _queryRunner?: QueryRunner) {
99
const sql =
1010
query +
11-
(parameters && parameters.length
12-
? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}`
13-
: '');
11+
(parameters && parameters.length ? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}` : '');
1412
this.logger.debug(sql);
1513
}
1614

17-
logQueryError(
18-
error: string,
19-
query: string,
20-
parameters?: any[],
21-
queryRunner?: QueryRunner,
22-
) {
15+
logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner) {
2316
const sql =
2417
query +
25-
(parameters && parameters.length
26-
? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}`
27-
: '');
18+
(parameters && parameters.length ? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}` : '');
2819
this.logger.error(sql);
2920
}
3021

31-
logQuerySlow(
32-
time: number,
33-
query: string,
34-
parameters?: any[],
35-
queryRunner?: QueryRunner,
36-
) {
22+
logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner) {
3723
const sql =
3824
query +
39-
(parameters && parameters.length
40-
? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}`
41-
: '');
25+
(parameters && parameters.length ? ` -- PARAMETERS: ${TypeOrmPinoLogger.stringifyParams(parameters)}` : '');
4226
this.logger.info(sql);
4327
}
4428

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { TypeOrmPinoLogger } from './TypeOrmPinoLogger';
4747
exclude: ['/graphql*'],
4848
}),
4949
GraphQLModule.forRoot({
50-
autoSchemaFile: 'schema.gql',
50+
autoSchemaFile: 'schema.graphql',
5151
debug: false,
5252
playground: false,
5353
}),

packages/server/src/modules/author/author.service.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,11 @@ import { AuthorEntity } from '@entities/author.entity';
88

99
@QueryService(AuthorEntity)
1010
export class AuthorService extends TypeOrmQueryService<AuthorEntity> {
11-
constructor(
12-
@InjectRepository(AuthorEntity) authorRepository: Repository<AuthorEntity>,
13-
) {
11+
constructor(@InjectRepository(AuthorEntity) authorRepository: Repository<AuthorEntity>) {
1412
super(authorRepository);
1513
}
1614

17-
async findOrCreate(
18-
name: string | undefined,
19-
): Promise<AuthorEntity | undefined> {
20-
if (!name) {
21-
return undefined;
22-
}
23-
15+
async findOrCreate(name: string | undefined): Promise<AuthorEntity> {
2416
const authors: AuthorEntity[] = await this.query({
2517
filter: { name: { eq: name } },
2618
});

packages/server/src/modules/episode/episode.service.ts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,20 @@ export class EpisodeService extends TypeOrmQueryService<EpisodeEntity> {
1717
async create(item: Item): Promise<EpisodeEntity> {
1818
const episode = new EpisodeEntity();
1919

20-
episode.title = item.title;
21-
episode.publication = new Date(item.pubDate);
22-
episode.url = item.enclosure?.url;
23-
episode.filesize = item.enclosure?.length;
24-
episode.guid = item.guid;
25-
episode.type = item.enclosure?.type;
26-
episode.description = item.content;
20+
if (item.title != null) {
21+
episode.title = item.title;
22+
}
23+
24+
episode.publication = item.pubDate != null ? new Date(item.pubDate) : new Date(Date.now());
25+
episode.url = item.enclosure && item.enclosure.url ? item.enclosure.url : '';
26+
episode.filesize = item.enclosure && item.enclosure.length ? item.enclosure.length : 0;
27+
if (item.guid != null) {
28+
episode.guid = item.guid;
29+
}
30+
episode.type = item.enclosure && item.enclosure.type ? item.enclosure.type : '';
31+
if (item.content != null) {
32+
episode.description = item.content;
33+
}
2734
episode.image = item.itunes.image;
2835
episode.explicit = item.itunes.explicit === 'clean';
2936
episode.duration = item.itunes.duration;

0 commit comments

Comments
 (0)