quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-17 05:58:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump @types/uuid from 3.4.7 to 7.0.0 and fix breaking changes

Browse source
This commit is contained in:
Labhansh Agrawal 2020-03-02 15:55:27 +05:30 committed by Benjamin Staneck
parent 36f57e937d
commit 01ea81823e
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/rpc.ts
View file

@ -1,6 +1,6 @@
import {EventEmitter} from 'events'; import {EventEmitter} from 'events';
import {ipcMain, BrowserWindow} from 'electron'; import {ipcMain, BrowserWindow} from 'electron';
import uuid from 'uuid'; import {v4 as uuidv4} from 'uuid';
export class Server extends EventEmitter { export class Server extends EventEmitter {
destroyed = false; destroyed = false;
@ -15,7 +15,7 @@ export class Server extends EventEmitter {
return; return;
} }
const uid = uuid.v4(); const uid = uuidv4();
this.id = uid; this.id = uid;
ipcMain.on(uid, this.ipcListener); ipcMain.on(uid, this.ipcListener);

6
app/ui/window.ts
View file

@ -1,7 +1,7 @@
import {app, BrowserWindow, shell, Menu, BrowserWindowConstructorOptions} from 'electron'; import {app, BrowserWindow, shell, Menu, BrowserWindowConstructorOptions} from 'electron';
import {isAbsolute} from 'path'; import {isAbsolute} from 'path';
import {parse as parseUrl} from 'url'; import {parse as parseUrl} from 'url';
import uuid from 'uuid'; import {v4 as uuidv4} from 'uuid';
import fileUriToPath from 'file-uri-to-path'; import fileUriToPath from 'file-uri-to-path';
import isDev from 'electron-is-dev'; import isDev from 'electron-is-dev';
import updater from '../updater'; import updater from '../updater';
@ -21,7 +21,7 @@ export function newWindow(
cfg: any, cfg: any,
fn?: (win: BrowserWindow) => void fn?: (win: BrowserWindow) => void
): BrowserWindow { ): BrowserWindow {
const classOpts = Object.assign({uid: uuid.v4()}); const classOpts = Object.assign({uid: uuidv4()});
app.plugins.decorateWindowClass(classOpts); app.plugins.decorateWindowClass(classOpts);
const winOpts = Object.assign( const winOpts = Object.assign(
@ -112,7 +112,7 @@ export function newWindow(
}); });
function createSession(extraOptions: any = {}) { function createSession(extraOptions: any = {}) {
const uid = uuid.v4(); const uid = uuidv4();
// remove the rows and cols, the wrong value of them will break layout when init create // remove the rows and cols, the wrong value of them will break layout when init create
const defaultOptions = Object.assign( const defaultOptions = Object.assign(

8
lib/reducers/term-groups.ts
View file

@ -1,4 +1,4 @@
import uuid from 'uuid'; import {v4 as uuidv4} from 'uuid';
import Immutable, {Immutable as ImmutableType} from 'seamless-immutable'; import Immutable, {Immutable as ImmutableType} from 'seamless-immutable';
import {TERM_GROUP_EXIT, TERM_GROUP_RESIZE} from '../constants/term-groups'; import {TERM_GROUP_EXIT, TERM_GROUP_RESIZE} from '../constants/term-groups';
import {SESSION_ADD, SESSION_SET_ACTIVE, SessionAddAction} from '../constants/sessions'; import {SESSION_ADD, SESSION_SET_ACTIVE, SessionAddAction} from '../constants/sessions';
@ -86,7 +86,7 @@ const splitGroup = (state: ImmutableType<ITermState>, action: SessionAddAction)
// P -> / \ // P -> / \
// G G // G G
const newSession = TermGroup({ const newSession = TermGroup({
uid: uuid.v4(), uid: uuidv4(),
sessionUid: uid, sessionUid: uid,
parentUid: parentGroup.uid parentUid: parentGroup.uid
}); });
@ -94,7 +94,7 @@ const splitGroup = (state: ImmutableType<ITermState>, action: SessionAddAction)
state = state.setIn(['termGroups', newSession.uid], newSession); state = state.setIn(['termGroups', newSession.uid], newSession);
if (parentGroup.sessionUid) { if (parentGroup.sessionUid) {
const existingSession = TermGroup({ const existingSession = TermGroup({
uid: uuid.v4(), uid: uuidv4(),
sessionUid: parentGroup.sessionUid, sessionUid: parentGroup.sessionUid,
parentUid: parentGroup.uid parentUid: parentGroup.uid
}); });
@ -205,7 +205,7 @@ const reducer = (state = initialState, action: HyperActions) => {
return setActiveGroup(state, action); return setActiveGroup(state, action);
} }
const uid = uuid.v4(); const uid = uuidv4();
const termGroup = TermGroup({ const termGroup = TermGroup({
uid, uid,
sessionUid: action.uid sessionUid: action.uid

2
package.json
View file

@ -86,7 +86,7 @@
"@types/seamless-immutable": "7.1.11", "@types/seamless-immutable": "7.1.11",
"@types/styled-jsx": "2.2.8", "@types/styled-jsx": "2.2.8",
"@types/terser-webpack-plugin": "2.2.0", "@types/terser-webpack-plugin": "2.2.0",
"@types/uuid": "3.4.7", "@types/uuid": "7.0.0",
"@types/webpack": "4.41.7", "@types/webpack": "4.41.7",
"@types/winreg": "1.2.30", "@types/winreg": "1.2.30",
"@typescript-eslint/eslint-plugin": "2.21.0", "@typescript-eslint/eslint-plugin": "2.21.0",

8
yarn.lock
View file

@ -775,10 +775,10 @@
dependencies: dependencies:
source-map "^0.6.1" source-map "^0.6.1"
"@types/uuid@3.4.7": "@types/uuid@7.0.0":
version "3.4.7" version "7.0.0"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.7.tgz#51d42247473bc00e38cc8dfaf70d936842a36c03" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.0.tgz#9f6993ccc8210efa90bda7e1afabbb06a9f860cd"
integrity sha512-C2j2FWgQkF1ru12SjZJyMaTPxs/f6n90+5G5qNakBxKXjTBc/YTSelHh4Pz1HUDwxFXD9WvpQhOGCDC+/Y4mIQ== integrity sha512-RiX1I0lK9WFLFqy2xOxke396f0wKIzk5sAll0tL4J4XDYJXURI7JOs96XQb3nP+2gEpQ/LutBb66jgiT5oQshQ==
"@types/webdriverio@^4.8.0": "@types/webdriverio@^4.8.0":
version "4.13.3" version "4.13.3"