ソースを参照

Fixes #1205 - chroma.js import issue

main
Eric Amodio 4年前
コミット
3e52b69f31
5個のファイルの変更8行の追加7行の削除
  1. +1
    -0
      CHANGELOG.md
  2. +1
    -1
      src/annotations/annotations.ts
  3. +5
    -5
      src/system/date.ts
  4. +0
    -1
      src/webviews/apps/tsconfig.json
  5. +1
    -0
      tsconfig.json

+ 1
- 0
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

+ 1
- 1
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')

+ 5
- 5
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();

+ 0
- 1
src/webviews/apps/tsconfig.json ファイルの表示

@ -2,7 +2,6 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"lib": ["dom", "dom.iterable", "es2019"],
"outDir": "../../"
},

+ 1
- 0
tsconfig.json ファイルの表示

@ -1,5 +1,6 @@
{
"compilerOptions": {
"esModuleInterop": true,
"experimentalDecorators": true,
"forceConsistentCasingInFileNames": true,
"incremental": true,

読み込み中…
キャンセル
保存