Skip to content

Commit acdcc30

Browse files
telamoniantelamonian
committed
updated LabIcon/lumino stuff to latest; now builds
- had to re-add `"skipLibCheck": true` to tsconfig
1 parent bc5eec9 commit acdcc30

File tree

6 files changed

+46
-133
lines changed

6 files changed

+46
-133
lines changed

‎package.json

-97
Original file line numberDiff line numberDiff line change
@@ -103,103 +103,6 @@
103103
"peerDependencies": {
104104
"codemirror": "^5.0.0"
105105
},
106-
"resolutions": {
107-
"@jupyterlab/application": "~2.0.0",
108-
"@jupyterlab/application-extension": "~2.0.0",
109-
"@jupyterlab/apputils": "~2.0.0",
110-
"@jupyterlab/apputils-extension": "~2.0.0",
111-
"@jupyterlab/attachments": "~2.0.0",
112-
"@jupyterlab/cells": "~2.0.0",
113-
"@jupyterlab/celltags": "~2.0.0",
114-
"@jupyterlab/celltags-extension": "~2.0.0",
115-
"@jupyterlab/codeeditor": "~2.0.0",
116-
"@jupyterlab/codemirror": "~2.0.0",
117-
"@jupyterlab/codemirror-extension": "~2.0.0",
118-
"@jupyterlab/completer": "~2.0.0",
119-
"@jupyterlab/completer-extension": "~2.0.0",
120-
"@jupyterlab/console": "~2.0.0",
121-
"@jupyterlab/console-extension": "~2.0.0",
122-
"@jupyterlab/coreutils": "~4.0.0",
123-
"@jupyterlab/csvviewer": "~2.0.0",
124-
"@jupyterlab/csvviewer-extension": "~2.0.0",
125-
"@jupyterlab/docmanager": "~2.0.0",
126-
"@jupyterlab/docmanager-extension": "~2.0.0",
127-
"@jupyterlab/docregistry": "~2.0.0",
128-
"@jupyterlab/documentsearch": "~2.0.0",
129-
"@jupyterlab/documentsearch-extension": "~2.0.0",
130-
"@jupyterlab/extensionmanager": "~2.0.0",
131-
"@jupyterlab/extensionmanager-extension": "~2.0.0",
132-
"@jupyterlab/filebrowser": "~2.0.0",
133-
"@jupyterlab/filebrowser-extension": "~2.0.0",
134-
"@jupyterlab/fileeditor": "~2.0.0",
135-
"@jupyterlab/fileeditor-extension": "~2.0.0",
136-
"@jupyterlab/help-extension": "~2.0.0",
137-
"@jupyterlab/htmlviewer": "~2.0.0",
138-
"@jupyterlab/htmlviewer-extension": "~2.0.0",
139-
"@jupyterlab/hub-extension": "~2.0.0",
140-
"@jupyterlab/imageviewer": "~2.0.0",
141-
"@jupyterlab/imageviewer-extension": "~2.0.0",
142-
"@jupyterlab/inspector": "~2.0.0",
143-
"@jupyterlab/inspector-extension": "~2.0.0",
144-
"@jupyterlab/javascript-extension": "~2.0.0",
145-
"@jupyterlab/json-extension": "~2.0.0",
146-
"@jupyterlab/launcher": "~2.0.0",
147-
"@jupyterlab/launcher-extension": "~2.0.0",
148-
"@jupyterlab/logconsole": "~2.0.0",
149-
"@jupyterlab/logconsole-extension": "~2.0.0",
150-
"@jupyterlab/mainmenu": "~2.0.0",
151-
"@jupyterlab/mainmenu-extension": "~2.0.0",
152-
"@jupyterlab/markdownviewer": "~2.0.0",
153-
"@jupyterlab/markdownviewer-extension": "~2.0.0",
154-
"@jupyterlab/mathjax2": "~2.0.0",
155-
"@jupyterlab/mathjax2-extension": "~2.0.0",
156-
"@jupyterlab/metapackage": "~2.0.0",
157-
"@jupyterlab/nbconvert-css": "~2.0.0",
158-
"@jupyterlab/nbformat": "~2.0.0",
159-
"@jupyterlab/notebook": "~2.0.0",
160-
"@jupyterlab/notebook-extension": "~2.0.0",
161-
"@jupyterlab/observables": "~3.0.0",
162-
"@jupyterlab/outputarea": "~2.0.0",
163-
"@jupyterlab/pdf-extension": "~2.0.0",
164-
"@jupyterlab/property-inspector": "~2.0.0",
165-
"@jupyterlab/rendermime": "~2.0.0",
166-
"@jupyterlab/rendermime-extension": "~2.0.0",
167-
"@jupyterlab/rendermime-interfaces": "~2.0.0",
168-
"@jupyterlab/running": "~2.0.0",
169-
"@jupyterlab/running-extension": "~2.0.0",
170-
"@jupyterlab/services": "~5.0.0",
171-
"@jupyterlab/settingeditor": "~2.0.0",
172-
"@jupyterlab/settingeditor-extension": "~2.0.0",
173-
"@jupyterlab/settingregistry": "~2.0.0",
174-
"@jupyterlab/shortcuts-extension": "~2.0.0",
175-
"@jupyterlab/statedb": "~2.0.0",
176-
"@jupyterlab/statusbar": "~2.0.0",
177-
"@jupyterlab/statusbar-extension": "~2.0.0",
178-
"@jupyterlab/tabmanager-extension": "~2.0.0",
179-
"@jupyterlab/terminal": "~2.0.0",
180-
"@jupyterlab/terminal-extension": "~2.0.0",
181-
"@jupyterlab/theme-dark-extension": "~2.0.0",
182-
"@jupyterlab/theme-light-extension": "~2.0.0",
183-
"@jupyterlab/tooltip": "~2.0.0",
184-
"@jupyterlab/tooltip-extension": "~2.0.0",
185-
"@jupyterlab/ui-components": "~2.0.0",
186-
"@jupyterlab/ui-components-extension": "~2.0.0",
187-
"@jupyterlab/vdom": "~2.0.0",
188-
"@jupyterlab/vdom-extension": "~2.0.0",
189-
"@jupyterlab/vega5-extension": "~2.0.0",
190-
"@lumino/algorithm": "^1.2.3",
191-
"@lumino/application": "^1.8.4",
192-
"@lumino/commands": "^1.10.1",
193-
"@lumino/coreutils": "^1.4.2",
194-
"@lumino/disposable": "^1.3.5",
195-
"@lumino/domutils": "^1.1.7",
196-
"@lumino/dragdrop": "^1.5.1",
197-
"@lumino/messaging": "^1.3.3",
198-
"@lumino/properties": "^1.1.6",
199-
"@lumino/signaling": "^1.3.5",
200-
"@lumino/virtualdom": "^1.6.1",
201-
"@lumino/widgets": "^1.11.1"
202-
},
203106
"directories": {
204107
"lib": "lib"
205108
},

‎src/components/SinglePastCommitInfo.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
2-
import { JLIcon } from '@jupyterlab/ui-components';
2+
import { fileIcon } from '@jupyterlab/ui-components';
33
import { insertionsMadeIcon, deletionsMadeIcon } from '../style/icons';
44
import * as React from 'react';
55
import { classes } from 'typestyle/';
@@ -132,8 +132,7 @@ export class SinglePastCommitInfo extends React.Component<
132132
<div className={commitStyle}>
133133
<div className={commitOverviewNumbers}>
134134
<span>
135-
<JLIcon.getReact
136-
name="file"
135+
<fileIcon.react
137136
className={iconStyle}
138137
tag="span"
139138
title="# Files Changed"

‎src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
} from '@jupyterlab/filebrowser';
1313
import { IMainMenu } from '@jupyterlab/mainmenu';
1414
import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
15-
import { Menu } from '@phosphor/widgets';
15+
import { Menu } from '@lumino/widgets';
1616
import { addCommands, CommandIDs } from './gitMenuCommands';
1717
import { GitExtension } from './model';
1818
import { IGitExtension } from './tokens';

‎src/style/icons.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { JLIcon } from '@jupyterlab/ui-components';
1+
import { LabIcon } from '@jupyterlab/ui-components';
22

33
// icon svg import statements
44
import gitSvg from '../../style/images/git-icon.svg';
55
import deletionsMadeSvg from '../../style/images/deletions-made-icon.svg';
66
import insertionsMadeSvg from '../../style/images/insertions-made-icon.svg';
77

8-
export const gitIcon = new JLIcon({ name: 'git', svgstr: gitSvg });
9-
export const deletionsMadeIcon = new JLIcon({
8+
export const gitIcon = new LabIcon({ name: 'git', svgstr: gitSvg });
9+
export const deletionsMadeIcon = new LabIcon({
1010
name: 'git-deletionsMade',
1111
svgstr: deletionsMadeSvg
1212
});
13-
export const insertionsMadeIcon = new JLIcon({
13+
export const insertionsMadeIcon = new LabIcon({
1414
name: 'git-insertionsMade',
1515
svgstr: insertionsMadeSvg
1616
});

‎tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"preserveWatchOutput": true,
1717
"resolveJsonModule": true,
1818
"rootDir": "src",
19+
"skipLibCheck": true,
1920
"sourceMap": true,
2021
"sourceRoot": "./@jupyterlab/git/src",
2122
"strict": true,

‎yarn.lock

+38-28
Original file line numberDiff line numberDiff line change
@@ -1888,18 +1888,18 @@
18881888
dependencies:
18891889
"@types/react" "*"
18901890

1891-
"@types/react@*", "@types/react@~16.8.18", "@types/react@~16.8.4":
1892-
version "16.8.25"
1893-
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.25.tgz#0247613ab58b1b11ba10fed662e1947c5f2bb89c"
1894-
integrity sha512-ydAAkLnNTC4oYSxJ3zwK/4QcVmEecACJ4ZdxXITbxz/dhahBSDKY6OQ1uawAW6rE/7kfHccxulYLSAIZVrSq0A==
1891+
"@types/react@*", "@types/react@~16.9.16":
1892+
version "16.9.23"
1893+
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c"
1894+
integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==
18951895
dependencies:
18961896
"@types/prop-types" "*"
18971897
csstype "^2.2.0"
18981898

1899-
"@types/react@~16.9.16":
1900-
version "16.9.23"
1901-
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c"
1902-
integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==
1899+
"@types/react@~16.8.18":
1900+
version "16.8.25"
1901+
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.25.tgz#0247613ab58b1b11ba10fed662e1947c5f2bb89c"
1902+
integrity sha512-ydAAkLnNTC4oYSxJ3zwK/4QcVmEecACJ4ZdxXITbxz/dhahBSDKY6OQ1uawAW6rE/7kfHccxulYLSAIZVrSq0A==
19031903
dependencies:
19041904
"@types/prop-types" "*"
19051905
csstype "^2.2.0"
@@ -2270,12 +2270,12 @@ browser-resolve@^1.11.3:
22702270
resolve "1.1.7"
22712271

22722272
browserslist@^4.8.3, browserslist@^4.8.5:
2273-
version "4.9.0"
2274-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.0.tgz#ff85c390889e0f754d7bd8ad13412575cdcf5dc7"
2275-
integrity sha512-seffIXhwgB84+OCeT/aMjpZnsAsYDiMSC+CEs3UkF8iU64BZGYcu+TZYs/IBpo4nRi0vJywUJWYdbTsOhFTweg==
2273+
version "4.9.1"
2274+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c"
2275+
integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==
22762276
dependencies:
22772277
caniuse-lite "^1.0.30001030"
2278-
electron-to-chromium "^1.3.361"
2278+
electron-to-chromium "^1.3.363"
22792279
node-releases "^1.1.50"
22802280

22812281
[email protected]:
@@ -2352,9 +2352,9 @@ camelcase@^5.0.0, camelcase@^5.3.1:
23522352
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
23532353

23542354
caniuse-lite@^1.0.30001030:
2355-
version "1.0.30001030"
2356-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz#78076c4c6d67d3e41d6eb9399853fb27fe6e44ee"
2357-
integrity sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==
2355+
version "1.0.30001031"
2356+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz#76f1bdd39e19567b855302f65102d9a8aaad5930"
2357+
integrity sha512-DpAP5a1NGRLgYfaNCaXIRyGARi+3tJA2quZXNNA1Du26VyVkqvy2tznNu5ANyN1Y5aX44QDotZSVSUSi2uMGjg==
23582358

23592359
capture-exit@^2.0.0:
23602360
version "2.0.0"
@@ -2491,11 +2491,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
24912491
dependencies:
24922492
delayed-stream "~1.0.0"
24932493

2494-
commander@^2.10.0, commander@^2.12.1, commander@^2.14.1, commander@^2.19.0, commander@^2.9.0:
2494+
commander@^2.12.1, commander@^2.14.1, commander@^2.19.0, commander@^2.9.0:
24952495
version "2.20.3"
24962496
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
24972497
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
24982498

2499+
commander@^4.1.1:
2500+
version "4.1.1"
2501+
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
2502+
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
2503+
24992504
component-emitter@^1.2.1:
25002505
version "1.3.0"
25012506
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -2810,10 +2815,10 @@ ecc-jsbn@~0.1.1:
28102815
jsbn "~0.1.0"
28112816
safer-buffer "^2.1.0"
28122817

2813-
electron-to-chromium@^1.3.361:
2814-
version "1.3.363"
2815-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.363.tgz#08756873e49446a92e0cee6c3cd9eb3c52043826"
2816-
integrity sha512-4w19wPBkeunBjOA53lNFT36IdOD3Tk1OoIDtTX+VToJUUDX42QfuhtsNKXv25wmSnoBOExM3kTbj7/WDNBwHuQ==
2818+
electron-to-chromium@^1.3.363:
2819+
version "1.3.367"
2820+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.367.tgz#48abffcaa6591051b612ae70ddc657763ede2662"
2821+
integrity sha512-GCHQreWs4zhKA48FNXCjvpV4kTnKoLu2PSAfKX394g34NPvTs2pPh1+jzWitNwhmOYI8zIqt36ulRVRZUgqlfA==
28172822

28182823
elegant-spinner@^1.0.1:
28192824
version "1.0.1"
@@ -3392,9 +3397,9 @@ has@^1.0.3:
33923397
function-bind "^1.1.1"
33933398

33943399
hosted-git-info@^2.1.4:
3395-
version "2.8.7"
3396-
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.7.tgz#4d2e0d5248e1cfabc984b0f6a6d75fe36e679511"
3397-
integrity sha512-ChkjQtKJ3GI6SsI4O5jwr8q8EPrWCnxuc4Tbx+vRI5x6mDOpjKKltNo1lRlszw3xwgTOSns1ZRBiMmmwpcvLxg==
3400+
version "2.8.8"
3401+
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
3402+
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
33983403

33993404
html-encoding-sniffer@^1.0.2:
34003405
version "1.0.2"
@@ -5789,6 +5794,11 @@ [email protected]:
57895794
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
57905795
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
57915796

5797+
[email protected]:
5798+
version "7.1.3"
5799+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
5800+
integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
5801+
57925802
semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
57935803
version "6.3.0"
57945804
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -6666,13 +6676,13 @@ yargs@^13.3.0:
66666676
yargs-parser "^13.1.1"
66676677

66686678
yarn-deduplicate@^1.1.1:
6669-
version "1.1.1"
6670-
resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz#19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d"
6671-
integrity sha512-2FDJ1dFmtvqhRmfja89ohYzpaheCYg7BFBSyaUq+kxK0y61C9oHv1XaQovCWGJtP2WU8PksQOgzMVV7oQOobzw==
6679+
version "1.2.0"
6680+
resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.2.0.tgz#65bb914f10f823ba0d14af56f1a8ad49a641e815"
6681+
integrity sha512-ZX47nmrUChuST4bKErCqUyVk9ScsduYfWuDV65hnQRkjVI5jS3uaBBsFGEW/GBjA1JCJFEBIcfXfJEa8vKH9Ig==
66726682
dependencies:
66736683
"@yarnpkg/lockfile" "^1.1.0"
6674-
commander "^2.10.0"
6675-
semver "^5.3.0"
6684+
commander "^4.1.1"
6685+
semver "7.1.3"
66766686

66776687
[email protected]:
66786688
version "2.4.1"

0 commit comments

Comments
 (0)