diff --git a/CHANGELOG.md b/CHANGELOG.md index 1749832..152d3fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed +- Fixes [#1205](https://github.com/eamodio/vscode-gitlens/issues/1205) - Setting heatmap's `coldColor` and `hotColor` breaks file blame & related functionality - Fixes invalid branch status showing up for remote branches ## [11.0.5] - 2020-11-23 diff --git a/src/annotations/annotations.ts b/src/annotations/annotations.ts index 3913a78..a067076 100644 --- a/src/annotations/annotations.ts +++ b/src/annotations/annotations.ts @@ -71,7 +71,7 @@ export async function getHeatmapColors() { ) { colors = defaultHeatmapColors; } else { - const chroma = await import(/* webpackChunkName: "heatmap-chroma" */ 'chroma-js'); + const chroma = (await import(/* webpackChunkName: "heatmap-chroma" */ 'chroma-js')).default; colors = chroma .scale([Container.config.heatmap.hotColor, Container.config.heatmap.coldColor]) .mode('lrgb') diff --git a/src/system/date.ts b/src/system/date.ts index 5956b8a..2632948 100644 --- a/src/system/date.ts +++ b/src/system/date.ts @@ -4,9 +4,9 @@ import * as advancedFormat from 'dayjs/plugin/advancedFormat'; import * as relativeTime from 'dayjs/plugin/relativeTime'; import * as updateLocale from 'dayjs/plugin/updateLocale'; -dayjs.extend(advancedFormat); -dayjs.extend(relativeTime); -dayjs.extend(relativeTime, { +dayjs.extend(advancedFormat.default); +dayjs.extend(relativeTime.default); +dayjs.extend(relativeTime.default, { thresholds: [ { l: 's', r: 44, d: 'second' }, { l: 'm', r: 89 }, @@ -23,7 +23,7 @@ dayjs.extend(relativeTime, { { l: 'yy', d: 'year' }, ], }); -dayjs.extend(updateLocale); +dayjs.extend(updateLocale.default); dayjs.updateLocale('en', { relativeTime: { @@ -114,7 +114,7 @@ export interface DateFormatter { } export function getFormatter(date: Date): DateFormatter { - const formatter = dayjs(date); + const formatter = dayjs.default(date); return { fromNow: function (locale?: string) { return (locale ? formatter.locale(locale) : formatter).fromNow(); diff --git a/src/webviews/apps/tsconfig.json b/src/webviews/apps/tsconfig.json index 2588a73..3631893 100644 --- a/src/webviews/apps/tsconfig.json +++ b/src/webviews/apps/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../../tsconfig.json", "compilerOptions": { "allowSyntheticDefaultImports": true, - "esModuleInterop": true, "lib": ["dom", "dom.iterable", "es2019"], "outDir": "../../" }, diff --git a/tsconfig.json b/tsconfig.json index b0dcb5e..11f785a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "esModuleInterop": true, "experimentalDecorators": true, "forceConsistentCasingInFileNames": true, "incremental": true,