Skip to content

Commit

Permalink
chore: Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelbromley
michaelbromley committed Oct 6, 2020
1 parent 5868bf6 commit cf3e38e
Show file tree
Hide file tree
Showing 14 changed files with 2,867 additions and 4,948 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"concurrently": "^5.0.0",
"conventional-changelog-core": "^4.0.3",
"find": "^0.3.0",
"graphql": "^14.5.8",
"graphql": "14.6.0",
"graphql-tools": "^4.0.0",
"husky": "^3.0.0",
"jest": "^25.2.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/admin-ui-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"access": "public"
},
"devDependencies": {
"@types/express": "^4.0.39",
"@types/fs-extra": "^8.0.1",
"@types/express": "^4.17.8",
"@types/fs-extra": "^9.0.1",
"@vendure/common": "^0.15.0",
"@vendure/core": "^0.15.2",
"express": "^4.16.4",
"rimraf": "^3.0.0",
"express": "^4.17.1",
"rimraf": "^3.0.2",
"typescript": "3.8.3"
},
"dependencies": {
"fs-extra": "^9.0.0"
"fs-extra": "^9.0.1"
}
}
2 changes: 1 addition & 1 deletion packages/admin-ui-plugin/src/plugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import fs from 'fs-extra';
import { Server } from 'http';
import path from 'path';

import { defaultAvailableLanguages, defaultLanguage, DEFAULT_APP_PATH, loggerCtx } from './constants';
import { DEFAULT_APP_PATH, defaultAvailableLanguages, defaultLanguage, loggerCtx } from './constants';

/**
* @description
Expand Down
20 changes: 10 additions & 10 deletions packages/asset-server-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
"access": "public"
},
"devDependencies": {
"@types/express": "^4.0.39",
"@types/fs-extra": "^8.0.1",
"@types/node-fetch": "^2.5.4",
"@types/sharp": "^0.24.0",
"@types/express": "^4.17.8",
"@types/fs-extra": "^9.0.1",
"@types/node-fetch": "^2.5.7",
"@types/sharp": "^0.26.0",
"@vendure/common": "^0.15.0",
"@vendure/core": "^0.15.2",
"aws-sdk": "^2.670.0",
"express": "^4.16.4",
"node-fetch": "^2.6.0",
"rimraf": "^3.0.0",
"aws-sdk": "^2.766.0",
"express": "^4.17.1",
"node-fetch": "^2.6.1",
"rimraf": "^3.0.2",
"typescript": "3.8.3"
},
"dependencies": {
"file-type": "^14.3.0",
"fs-extra": "^9.0.0",
"file-type": "^15.0.1",
"fs-extra": "^9.0.1",
"sharp": "0.25.2"
}
}
10 changes: 5 additions & 5 deletions packages/asset-server-plugin/src/plugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ import { AssetServerOptions, ImageTransformPreset } from './types';
*/
@VendurePlugin({
imports: [PluginCommonModule, TerminusModule],
configuration: (config) => AssetServerPlugin.configure(config),
configuration: config => AssetServerPlugin.configure(config),
})
export class AssetServerPlugin implements OnVendureBootstrap, OnVendureClose {
private server: Server;
Expand Down Expand Up @@ -177,7 +177,7 @@ export class AssetServerPlugin implements OnVendureBootstrap, OnVendureClose {
onVendureBootstrap(): void | Promise<void> {
if (AssetServerPlugin.options.presets) {
for (const preset of AssetServerPlugin.options.presets) {
const existingIndex = this.presets.findIndex((p) => p.name === preset.name);
const existingIndex = this.presets.findIndex(p => p.name === preset.name);
if (-1 < existingIndex) {
this.presets.splice(existingIndex, 1, preset);
} else {
Expand All @@ -194,7 +194,7 @@ export class AssetServerPlugin implements OnVendureBootstrap, OnVendureClose {

/** @internal */
onVendureClose(): Promise<void> {
return new Promise((resolve) => {
return new Promise(resolve => {
this.server.close(() => resolve());
});
}
Expand Down Expand Up @@ -260,7 +260,7 @@ export class AssetServerPlugin implements OnVendureBootstrap, OnVendureClose {
res.status(404).send('Resource not found');
return;
}
const image = await transformImage(file, req.query, this.presets || []);
const image = await transformImage(file, req.query as any, this.presets || []);
try {
const imageBuffer = await image.toBuffer();
if (!req.query.cache || req.query.cache === 'true') {
Expand Down Expand Up @@ -292,7 +292,7 @@ export class AssetServerPlugin implements OnVendureBootstrap, OnVendureClose {
const height = h || '';
imageParamHash = this.md5(`_transform_w${width}_h${height}_m${mode}${focalPoint}`);
} else if (preset) {
if (this.presets && !!this.presets.find((p) => p.name === preset)) {
if (this.presets && !!this.presets.find(p => p.name === preset)) {
imageParamHash = this.md5(`_transform_pre_${preset}${focalPoint}`);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"lib/**/*"
],
"devDependencies": {
"rimraf": "^3.0.0",
"rimraf": "^3.0.2",
"typescript": "3.8.3"
}
}
62 changes: 31 additions & 31 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,57 +46,57 @@
"@nestjs/terminus": "7.0.1",
"@nestjs/testing": "7.4.4",
"@nestjs/typeorm": "7.1.3",
"@types/fs-extra": "^8.0.1",
"@types/fs-extra": "^9.0.1",
"@vendure/common": "^0.15.0",
"apollo-server-express": "2.11.0",
"bcrypt": "^4.0.1",
"apollo-server-express": "2.18.1",
"bcrypt": "^5.0.0",
"body-parser": "^1.19.0",
"chalk": "^3.0.0",
"commander": "^5.0.0",
"cookie-session": "^2.0.0-beta.3",
"csv-parse": "^4.6.5",
"express": "^4.16.4",
"fs-extra": "^9.0.0",
"chalk": "^4.1.0",
"commander": "^6.1.0",
"cookie-session": "^2.0.0-rc.1",
"csv-parse": "^4.12.0",
"express": "^4.17.1",
"fs-extra": "^9.0.1",
"graphql": "14.6.0",
"graphql-iso-date": "^3.6.1",
"graphql-tag": "^2.10.0",
"graphql-tag": "^2.11.0",
"graphql-tools": "^4.0.6",
"graphql-type-json": "^0.3.0",
"http-proxy-middleware": "^1.0.3",
"i18next": "^19.3.3",
"i18next-express-middleware": "^1.9.1",
"i18next-icu": "^1.3.0",
"graphql-type-json": "^0.3.2",
"http-proxy-middleware": "^1.0.5",
"i18next": "^19.8.1",
"i18next-express-middleware": "^2.0.0",
"i18next-icu": "^1.4.2",
"i18next-node-fs-backend": "^2.1.3",
"image-size": "^0.8.3",
"mime-types": "^2.1.21",
"ms": "^2.1.1",
"nanoid": "^2.1.6",
"image-size": "^0.9.1",
"mime-types": "^2.1.27",
"ms": "^2.1.2",
"nanoid": "^2.1.11",
"progress": "^2.0.3",
"reflect-metadata": "^0.1.12",
"rxjs": "^6.3.3",
"reflect-metadata": "^0.1.13",
"rxjs": "^6.6.3",
"typeorm": "0.2.24"
},
"devDependencies": {
"@types/bcrypt": "^3.0.0",
"@types/cookie-session": "^2.0.36",
"@types/csv-parse": "^1.1.11",
"@types/express": "^4.0.39",
"@types/cookie-session": "^2.0.41",
"@types/csv-parse": "^1.2.2",
"@types/express": "^4.17.8",
"@types/faker": "^4.1.7",
"@types/graphql-iso-date": "^3.3.1",
"@types/graphql-iso-date": "^3.4.0",
"@types/graphql-type-json": "^0.3.2",
"@types/gulp": "^4.0.5",
"@types/gulp": "^4.0.7",
"@types/mime-types": "^2.1.0",
"@types/ms": "^0.7.30",
"@types/ms": "^0.7.31",
"@types/nanoid": "^2.1.0",
"@types/node": "^10.12.18",
"@types/progress": "^2.0.3",
"@types/prompts": "^2.0.2",
"gulp": "^4.0.0",
"@types/prompts": "^2.0.9",
"gulp": "^4.0.2",
"mysql": "^2.16.0",
"pg": "^7.8.0",
"rimraf": "^3.0.0",
"rimraf": "^3.0.2",
"sql.js": "1.1.0",
"sqlite3": "^4.0.6",
"sqlite3": "^5.0.0",
"typescript": "3.8.3"
}
}
4 changes: 2 additions & 2 deletions packages/core/src/api/common/request-context.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class RequestContextService {
});
}

private getChannelToken(req: Request): string {
private getChannelToken(req: Request<any, any, any, { [key: string]: any }>): string {
const tokenKey = this.configService.apiOptions.channelTokenKey;
let channelToken = '';

Expand All @@ -63,7 +63,7 @@ export class RequestContextService {

private getLanguageCode(req: Request, channel: Channel): LanguageCode | undefined {
return (
(req.query && req.query.languageCode) ??
(req.query && (req.query.languageCode as LanguageCode)) ??
channel.defaultLanguageCode ??
this.configService.defaultLanguageCode
);
Expand Down
30 changes: 15 additions & 15 deletions packages/create/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@
"access": "public"
},
"devDependencies": {
"@types/cross-spawn": "^6.0.0",
"@types/detect-port": "^1.1.0",
"@types/fs-extra": "^8.0.1",
"@types/cross-spawn": "^6.0.2",
"@types/detect-port": "^1.3.0",
"@types/fs-extra": "^9.0.1",
"@types/handlebars": "^4.1.0",
"@types/listr": "^0.14.0",
"@types/semver": "^6.0.0",
"@types/listr": "^0.14.2",
"@types/semver": "^6.2.2",
"@vendure/core": "^0.15.2",
"rimraf": "^3.0.0",
"ts-node": "^8.4.1",
"rimraf": "^3.0.2",
"ts-node": "^9.0.0",
"typescript": "3.8.3"
},
"dependencies": {
"@vendure/common": "^0.15.0",
"chalk": "^3.0.0",
"commander": "^5.0.0",
"cross-spawn": "^7.0.1",
"chalk": "^4.1.0",
"commander": "^6.1.0",
"cross-spawn": "^7.0.3",
"detect-port": "^1.3.0",
"fs-extra": "^9.0.0",
"handlebars": "^4.1.1",
"fs-extra": "^9.0.1",
"handlebars": "^4.7.6",
"listr": "^0.14.3",
"prompts": "^2.0.1",
"rxjs": "^6.4.0",
"semver": "^7.1.3",
"prompts": "^2.3.2",
"rxjs": "^6.6.3",
"semver": "^7.3.2",
"tcp-port-used": "^1.0.1"
}
}
6 changes: 3 additions & 3 deletions packages/elasticsearch-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"access": "public"
},
"dependencies": {
"@elastic/elasticsearch": "^7.1.0",
"deepmerge": "^4.0.0"
"@elastic/elasticsearch": "^7.9.1",
"deepmerge": "^4.2.2"
},
"devDependencies": {
"@vendure/common": "^0.15.0",
"@vendure/core": "^0.15.2",
"rimraf": "^3.0.0",
"rimraf": "^3.0.2",
"typescript": "3.8.3"
}
}
2 changes: 1 addition & 1 deletion packages/elasticsearch-plugin/src/indexer.controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ export class ElasticsearchIndexerController implements OnModuleInit, OnModuleDes
try {
const fullIndexName = this.options.indexPrefix + indexName;
const { body }: { body: BulkResponseBody } = await this.client.bulk({
refresh: 'true',
refresh: true,
index: fullIndexName,
type: indexType,
body: operations,
Expand Down
2 changes: 1 addition & 1 deletion packages/elasticsearch-plugin/src/plugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ export class ElasticsearchPlugin implements OnVendureBootstrap {
const node = clientOptions?.node;
const nodes = clientOptions?.nodes;
if (nodes) {
return [...nodes].join(', ');
return [...(Array.isArray(nodes) ? nodes : [nodes])].join(', ');
}
if (node) {
if (Array.isArray(node)) {
Expand Down
18 changes: 9 additions & 9 deletions packages/email-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
},
"dependencies": {
"dateformat": "^3.0.3",
"express": "^4.16.4",
"fs-extra": "^9.0.0",
"express": "^4.17.1",
"fs-extra": "^9.0.1",
"handlebars": "^4.7.6",
"mjml": "^4.6.2",
"nodemailer": "^6.4.6"
"mjml": "^4.7.1",
"nodemailer": "^6.4.13"
},
"devDependencies": {
"@types/dateformat": "^3.0.0",
"@types/express": "^4.16.1",
"@types/fs-extra": "^8.0.1",
"@types/dateformat": "^3.0.1",
"@types/express": "^4.17.8",
"@types/fs-extra": "^9.0.1",
"@types/handlebars": "^4.1.0",
"@types/mjml": "^4.0.2",
"@types/mjml": "^4.0.4",
"@types/nodemailer": "^6.4.0",
"@vendure/common": "^0.15.0",
"@vendure/core": "^0.15.2",
"rimraf": "^3.0.0",
"rimraf": "^3.0.2",
"typescript": "3.8.3"
}
}
Loading

0 comments on commit cf3e38e

Please sign in to comment.