Browse Source

chore(server): Update to TypeScript 3.2.4

Michael Bromley 7 years ago
parent
commit
1acc8706fa

+ 1 - 1
package.json

@@ -24,6 +24,6 @@
     "prettier": "^1.15.2",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
-    "typescript": "^3.1.3"
+    "typescript": "^3.2.4"
   }
 }

+ 1 - 1
server/package.json

@@ -60,7 +60,7 @@
     "rxjs": "^6.3.3",
     "sharp": "^0.21.1",
     "typeorm": "0.2.11",
-    "typescript": "^3.1.6"
+    "typescript": "^3.2.4"
   },
   "devDependencies": {
     "@types/bcrypt": "^3.0.0",

+ 2 - 4
server/src/config/email/email-options.ts

@@ -1,10 +1,8 @@
 import { LanguageCode } from '../../../../shared/generated-types';
 import { Type } from '../../../../shared/shared-types';
-
-import { ReadOnlyRequired } from '../../common/types/common-types';
 import { EmailContext, GeneratedEmailContext } from '../../email/email-context';
 import { VendureEvent } from '../../event-bus/vendure-event';
-import { VendureConfig } from '../vendure-config';
+import { ConfigService } from '../config.service';
 
 export type TemplateConfig<C = any, R = any> = {
     /**
@@ -52,7 +50,7 @@ export function configEmailType<T extends string, E extends VendureEvent = Vendu
 }
 
 export interface EmailGenerator<T extends string = any, E extends VendureEvent = any> {
-    onInit?(config: ReadOnlyRequired<VendureConfig>): void | Promise<void>;
+    onInit?(config: ConfigService): void | Promise<void>;
     generate(
         subject: string,
         body: string,

+ 2 - 5
server/src/email/handlebars-mjml-generator.ts

@@ -1,15 +1,12 @@
 import dateFormat from 'dateformat';
 import fs from 'fs-extra';
 import Handlebars from 'handlebars';
-// tslint:disable-next-line
-//const mjml2html = require('mjml');
 import mjml2html from 'mjml';
 import path from 'path';
 
 import { InternalServerError } from '../common/error/errors';
-import { ReadOnlyRequired } from '../common/types/common-types';
+import { ConfigService } from '../config/config.service';
 import { EmailGenerator } from '../config/email/email-options';
-import { VendureConfig } from '../config/vendure-config';
 
 import { EmailContext, GeneratedEmailContext } from './email-context';
 
@@ -18,7 +15,7 @@ import { EmailContext, GeneratedEmailContext } from './email-context';
  * compiled down to responsive email HTML.
  */
 export class HandlebarsMjmlGenerator implements EmailGenerator {
-    onInit(config: ReadOnlyRequired<VendureConfig>) {
+    onInit(config: ConfigService) {
         if (!config.emailOptions.emailTemplatePath) {
             throw new InternalServerError(
                 `When using the HandlebarsMjmlGenerator, the emailTemplatePath config option must be set`,

+ 4 - 4
server/yarn.lock

@@ -6938,10 +6938,10 @@ typescript@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
 
-typescript@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+typescript@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
 
 uglify-js@3.4.x, uglify-js@^3.1.4:
   version "3.4.9"

+ 4 - 3
yarn.lock

@@ -2114,9 +2114,10 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-typescript@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5"
+typescript@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
 
 uglify-js@^3.1.4:
   version "3.4.9"