chore: fix typescript errors from newer parsing.

blinkk · Nov 1, 2021 · eafe215 · eafe215
1 parent 61a4c90
commit eafe215
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/src/ts/editor/ui/app.ts b/src/ts/editor/ui/app.ts
@@ -20,7 +20,7 @@ import {LazyUiParts} from './parts';
 import {OnboardingStatus} from '../api';
 import {EVENT_RENDER as SELECTIVE_EVENT_RENDER} from '@blinkk/selective-edit/dist/selective/events';
 import TimeAgo from 'javascript-time-ago';
-import en from 'javascript-time-ago/locale/en';
+import en from 'javascript-time-ago/locale/en.json';
 import {templateLoading} from '../template';
 
 // Set the default locale for the time ago globally.

diff --git a/src/ts/projectType/amagaki/amagakiState.ts b/src/ts/projectType/amagaki/amagakiState.ts
@@ -25,7 +25,7 @@ export class AmagakiState extends BaseProjectTypeState {
     callbackError?: (error: ApiError) => void
   ): Record<string, PartialData> | undefined | null {
     const promiseKey = AmagakiStatePromiseKeys.GetPartials;
-    if (this.promises[promiseKey]) {
+    if (promiseKey in this.promises) {
       return this.partials;
     }
     this.promises[promiseKey] = this.api.projectTypes.amagaki

diff --git a/src/ts/projectType/grow/growState.ts b/src/ts/projectType/grow/growState.ts
@@ -27,7 +27,7 @@ export class GrowState extends BaseProjectTypeState {
     callbackError?: (error: ApiError) => void
   ): Record<string, PartialData> | undefined | null {
     const promiseKey = GrowStatePromiseKeys.GetPartials;
-    if (this.promises[promiseKey]) {
+    if (promiseKey in this.promises) {
       return this.partials;
     }
     this.promises[promiseKey] = this.api.projectTypes.grow
@@ -54,7 +54,7 @@ export class GrowState extends BaseProjectTypeState {
     callbackError?: (error: ApiError) => void
   ): Record<string, any> | undefined | null {
     const promiseKey = GrowStatePromiseKeys.GetStrings;
-    if (this.promises[promiseKey]) {
+    if (promiseKey in this.promises) {
       return this.strings;
     }
     this.promises[promiseKey] = this.api.projectTypes.grow

diff --git a/src/ts/server/app.ts b/src/ts/server/app.ts
@@ -5,12 +5,14 @@ import StackdriverErrorReporter from 'stackdriver-errors-js';
 const stackdriverKey = document.body.dataset.stackdriverKey;
 if (stackdriverKey) {
   const projectId = document.body.dataset.projectId;
-  const errorHandler = new StackdriverErrorReporter();
-  errorHandler.start({
-    projectId: projectId,
-    key: stackdriverKey,
-    service: 'editor.dev',
-  });
+  if (projectId) {
+    const errorHandler = new StackdriverErrorReporter();
+    errorHandler.start({
+      projectId: projectId,
+      key: stackdriverKey,
+      service: 'editor.dev',
+    });
+  }
 }
 
 const container = document.querySelector('.container') as HTMLElement;

diff --git a/src/ts/server/stackdriver-errors-js.d.ts b/src/ts/server/stackdriver-errors-js.d.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,6 +5,7 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
+    "resolveJsonModule": true,
     "rootDir": "src/ts/",
     "target": "es2020",
   },