Skip to content

Commit

Permalink
Upgrades dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Treverix committed Oct 1, 2021
1 parent ee506cc commit 5c59a6d
Show file tree
Hide file tree
Showing 7 changed files with 12,683 additions and 8,151 deletions.
20,784 changes: 12,661 additions & 8,123 deletions package-lock.json

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@treverix/custom-electron-titlebar",
"version": "4.1.7",
"version": "4.2.0",
"description": "Custom Electron Titlebar is a library for electron 10+ that allows you to configure a fully customizable title bar.",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -39,27 +39,26 @@
"lib": "lib"
},
"dependencies": {
"@electron/remote": "^1.0.2"
"@electron/remote": "^2.0.1"
},
"devDependencies": {
"@babel/cli": "^7.12.8",
"@babel/core": "^7.12.9",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
"@babel/preset-env": "^7.12.7",
"@babel/preset-typescript": "^7.12.7",
"@types/jest": "^26.0.15",
"@babel/cli": "^7.15.7",
"@babel/core": "^7.15.5",
"@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-object-rest-spread": "^7.15.6",
"@babel/preset-env": "^7.15.6",
"@babel/preset-typescript": "^7.15.0",
"@types/jest": "^27.0.2",
"@types/rewire": "^2.5.28",
"babel-plugin-const-enum": "^1.0.1",
"babel-plugin-const-enum": "^1.1.0",
"babel-plugin-import-require-as-string": "^1.0.2",
"babel-plugin-module-resolver": "^4.0.0",
"electron": "^11.0.3",
"typescript": "^4.1.2",
"babel-plugin-module-resolver": "^4.1.0",
"electron": "^14.0.2",
"typescript": "^4.4.3",
"babel-plugin-rewire": "^1.2.0",
"jest": "^26.6.3",
"jest-electron": "^0.1.11",
"jest": "^27.2.4",
"ncp": "^2.0.0",
"rewire": "^5.0.0",
"ts-jest": "^26.4.4"
"ts-jest": "^27.0.5"
}
}
5 changes: 3 additions & 2 deletions src/menuitem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import {
EventHelper,
EventLike
} from "vs/base/browser/dom";
import {BrowserWindow, remote, Accelerator, NativeImage, MenuItem} from "electron";
import {BrowserWindow, Accelerator, NativeImage, MenuItem} from "electron";
import {getCurrentWindow} from '@electron/remote';
import {MENU_MNEMONIC_REGEX, cleanMnemonic, MENU_ESCAPED_MNEMONIC_REGEX} from "./mnemonic";
import {KeyCode, KeyCodeUtils} from "vs/base/common/keyCodes";
import {Disposable} from "vs/base/common/lifecycle";
Expand Down Expand Up @@ -57,7 +58,7 @@ export class CETMenuItem extends Disposable implements IMenuItem {
this.options.icon = options.icon !== undefined ? options.icon : false;
this.options.label = options.label !== undefined ? options.label : true;

this.currentWindow = remote.getCurrentWindow();
this.currentWindow = getCurrentWindow();
this.closeSubMenu = closeSubMenu;

// Set mnemonic
Expand Down
4 changes: 2 additions & 2 deletions src/vs/base/browser/canIUse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ export const BrowserFeatures = {

// 'ontouchstart' in window always evaluates to true with typescript's modern typings. This causes `window` to be
// `never` later in `window.navigator`. That's why we need the explicit `window as Window` cast
touch: 'ontouchstart' in window || navigator.maxTouchPoints > 0 || (window as Window).navigator.msMaxTouchPoints > 0,
pointerEvents: window.PointerEvent && ('ontouchstart' in window || (window as Window).navigator.maxTouchPoints > 0 || navigator.maxTouchPoints > 0 || (window as Window).navigator.msMaxTouchPoints > 0)
touch: 'ontouchstart' in window || navigator.maxTouchPoints > 0,
pointerEvents: window.PointerEvent && ('ontouchstart' in window || (window as Window).navigator.maxTouchPoints > 0 || navigator.maxTouchPoints > 0)
};
2 changes: 1 addition & 1 deletion src/vs/base/browser/touch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class Gesture extends Disposable {
private static isTouchDevice(): boolean {
// `'ontouchstart' in window` always evaluates to true with typescript's modern typings. This causes `window` to be
// `never` later in `window.navigator`. That's why we need the explicit `window as Window` cast
return 'ontouchstart' in window || navigator.maxTouchPoints > 0 || (window as Window).navigator.msMaxTouchPoints > 0;
return 'ontouchstart' in window || navigator.maxTouchPoints > 0;
}

public dispose(): void {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/base/common/async.ts
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ export class IdleValue<T> {
//#endregion

export async function retry<T>(task: ITask<Promise<T>>, delay: number, retries: number): Promise<T> {
let lastError: Error | undefined;
let lastError: Error | unknown;

for (let i = 0; i < retries; i++) {
try {
Expand Down
6 changes: 0 additions & 6 deletions src/vs/base/common/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ function roundFloat(number: number, decimalPoints: number): number {
}

export class RGBA {
_rgbaBrand: void;

/**
* Red: integer in [0-255]
*/
Expand Down Expand Up @@ -47,8 +45,6 @@ export class RGBA {

export class HSLA {

_hslaBrand: void;

/**
* Hue: integer in [0, 360]
*/
Expand Down Expand Up @@ -160,8 +156,6 @@ export class HSLA {

export class HSVA {

_hsvaBrand: void;

/**
* Hue: integer in [0, 360]
*/
Expand Down

0 comments on commit 5c59a6d

Please sign in to comment.