Skip to content

Commit 39707c9

Browse files
committed
update deps
1 parent 9bdc47d commit 39707c9

File tree

6 files changed

+57
-58
lines changed

6 files changed

+57
-58
lines changed

app/appshell/app-menu.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export function addMenu(title: string, id: string, position: string, relativeId:
165165
const err = _addToPosition(newObj, menuTemplate, position || "last", relativeId);
166166
_refreshMenu(callback.bind(null, err));
167167
});
168-
};
168+
}
169169

170170
export function addMenuItem(
171171
parentId: string,
@@ -216,7 +216,7 @@ export function addMenuItem(
216216
const err = _addToPosition(newObj, parentObj.submenu as MenuItemOptions[], position || "last", relativeId);
217217
_refreshMenu(callback.bind(null, err));
218218
});
219-
};
219+
}
220220

221221
export function getMenuItemState(
222222
commandId: string,
@@ -230,7 +230,7 @@ export function getMenuItemState(
230230
}
231231
callback(null, obj.enabled === true, obj.checked === true);
232232
});
233-
};
233+
}
234234

235235
export function getMenuPosition(
236236
commandId: string,
@@ -241,7 +241,7 @@ export function getMenuPosition(
241241
const res = _findMenuItemPosition(commandId);
242242
return res ? callback(null, res[0], res[1]) : callback(null);
243243
});
244-
};
244+
}
245245

246246
export function getMenuTitle(commandId: string, callback: (err?: string | null, title?: string) => void) {
247247
assert(commandId && typeof commandId === "string", "commandId must be a string");
@@ -252,23 +252,23 @@ export function getMenuTitle(commandId: string, callback: (err?: string | null,
252252
}
253253
callback(null, obj.label);
254254
});
255-
};
255+
}
256256

257257
export function removeMenu(commandId: string, callback: (err?: string | null, deleted?: boolean) => void) {
258258
assert(commandId && typeof commandId === "string", "commandId must be a string");
259259
process.nextTick(function () {
260260
const deleted = _deleteMenuItemById(commandId);
261261
_refreshMenu(callback.bind(null, deleted ? null : ERR_NOT_FOUND));
262262
});
263-
};
263+
}
264264

265265
export function removeMenuItem(commandId: string, callback: (err?: string | null, deleted?: boolean) => void) {
266266
assert(commandId && typeof commandId === "string", "commandId must be a string");
267267
process.nextTick(function () {
268268
const deleted = _deleteMenuItemById(commandId);
269269
_refreshMenu(callback.bind(null, deleted ? null : ERR_NOT_FOUND));
270270
});
271-
};
271+
}
272272

273273
export function setMenuItemShortcut(
274274
commandId: string,
@@ -291,7 +291,7 @@ export function setMenuItemShortcut(
291291
}
292292
_refreshMenu(callback.bind(null, null));
293293
});
294-
};
294+
}
295295

296296
export function setMenuItemState(
297297
commandId: string,
@@ -316,7 +316,7 @@ export function setMenuItemState(
316316
}
317317
_refreshMenu(callback.bind(null, null));
318318
});
319-
};
319+
}
320320

321321
export function setMenuTitle(
322322
commandId: string,
@@ -333,4 +333,4 @@ export function setMenuTitle(
333333
obj.label = title;
334334
_refreshMenu(callback.bind(null, null));
335335
});
336-
};
336+
}

app/appshell/app.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,70 +28,70 @@ export function closeLiveBrowser(callback: (err?: Error) => void) {
2828
// TODO: implement
2929
callback(new Error("app.closeLiveBrowser not implemented"));
3030
});
31-
};
31+
}
3232

3333
export function dragWindow() {
3434
// TODO: implement
3535
throw new Error("app.dragWindow not implemented");
36-
};
36+
}
3737

3838
export function getApplicationSupportDirectory() {
3939
return utils.convertWindowsPathToUnixPath(app.getPath("userData"));
40-
};
40+
}
4141

4242
export function getExtensionsFolder() {
4343
return utils.convertWindowsPathToUnixPath(
4444
path.resolve(getApplicationSupportDirectory(), "extensions")
4545
);
46-
};
46+
}
4747

4848
// TODO: it seems that both arguments aren't needed anymore
4949
export function showExtensionsFolder(appURL: any, callback: (err?: Error) => void) {
5050
process.nextTick(function () {
5151
shell.showItemInFolder(utils.convertBracketsPathToWindowsPath(getExtensionsFolder()));
5252
if (callback) { callback(); }
5353
});
54-
};
54+
}
5555

5656
export function getDroppedFiles(callback: (err?: Error) => void) {
5757
process.nextTick(function () {
5858
// TODO: implement
5959
callback(new Error("app.getDroppedFiles not implemented"));
6060
});
61-
};
61+
}
6262

6363
// return the number of milliseconds that have elapsed since the application was launched
6464
export function getElapsedMilliseconds() {
6565
const diff = process.hrtime(startupTime);
6666
// diff = [ seconds, nanoseconds ]
6767
return diff[0] * 1000 + diff[1] / 1000000;
68-
};
68+
}
6969

7070
export function getPendingFilesToOpen(callback: (err?: Error, filePaths?: string[]) => void) {
7171
process.nextTick(function () {
7272
// TODO: implement
7373
callback(new Error("app.getPendingFilesToOpen not implemented"), []);
7474
});
75-
};
75+
}
7676

7777
export function getRemoteDebuggingPort(): number {
7878
return REMOTE_DEBUGGING_PORT;
79-
};
79+
}
8080

8181
export function getUserHomeDirectory(): string {
8282
return utils.convertWindowsPathToUnixPath(app.getPath("home"));
83-
};
83+
}
8484

8585
export function getUserDocumentsDirectory(): string {
8686
return utils.convertWindowsPathToUnixPath(app.getPath("documents"));
87-
};
87+
}
8888

8989
export function installCommandLine(callback: (err?: Error) => void): void {
9090
process.nextTick(function () {
9191
// TODO: implement
9292
callback(new Error("app.installCommandLine not implemented"));
9393
});
94-
};
94+
}
9595

9696
export function openLiveBrowser(
9797
url: string,
@@ -102,7 +102,7 @@ export function openLiveBrowser(
102102
// TODO: implement
103103
callback(new Error("app.openLiveBrowser not implemented" + url));
104104
});
105-
};
105+
}
106106

107107
export function openURLInDefaultBrowser(
108108
url: string,
@@ -115,17 +115,17 @@ export function openURLInDefaultBrowser(
115115
callback();
116116
}
117117
});
118-
};
118+
}
119119

120120
export function quit() {
121121
// close current window, shell will quit when all windows are closed
122122
remote.getCurrentWindow().close();
123-
};
123+
}
124124

125125
export function showDeveloperTools() {
126126
const win = remote.getCurrentWindow();
127127
win.webContents.openDevTools({ mode: "detach" });
128-
};
128+
}
129129

130130
// TODO: get rid of callback? This call is not throwing any error.
131131
export function showOSFolder(
@@ -136,4 +136,4 @@ export function showOSFolder(
136136
shell.showItemInFolder(utils.convertBracketsPathToWindowsPath(path));
137137
if (callback) { callback(); }
138138
});
139-
};
139+
}

app/appshell/fs-additions.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ const trash = require("trash");
1515

1616
export function isBinaryFile(filename: string, callback: (err?: Error, res?: boolean) => void) {
1717
isbinaryfile(filename, callback);
18-
};
18+
}
1919

2020
export function isBinaryFileSync(filename: string): boolean {
2121
return isbinaryfile(filename);
22-
};
22+
}
2323

2424
export function isEncodingSupported(encoding: string): boolean {
2525
return ["ascii", "utf-8", "utf8"].indexOf(encoding.toLowerCase()) !== -1;
26-
};
26+
}
2727

2828
export function isNetworkDrive(path: string, callback: (err: Error | null, res: boolean) => void) {
2929
// TODO: implement
3030
process.nextTick(function () {
3131
callback(null, false);
3232
});
33-
};
33+
}
3434

3535
export function moveToTrash(path: string, callback: (err: Error | null, result?: any) => void) {
3636
fs.stat(path, function (err) {
@@ -42,7 +42,7 @@ export function moveToTrash(path: string, callback: (err: Error | null, result?:
4242
.then((r: any) => callback(null, r))
4343
.catch((e: Error) => callback(e));
4444
});
45-
};
45+
}
4646

4747
export function readTextFile(filename: string, encoding: string, callback: (err: Error | null, res?: string) => void) {
4848
if (typeof encoding === "function") {
@@ -82,7 +82,7 @@ export function readTextFile(filename: string, encoding: string, callback: (err:
8282
callback(null, content);
8383
});
8484
});
85-
};
85+
}
8686

8787
export function remove(path: string, callback: (err?: Error) => void) {
8888
fs.stat(path, function (err, stats) {
@@ -91,7 +91,7 @@ export function remove(path: string, callback: (err?: Error) => void) {
9191
}
9292
fs.remove(path, callback);
9393
});
94-
};
94+
}
9595

9696
export function rename(oldPath: string, newPath: string, callback: (err?: Error) => void) {
9797
fs.stat(newPath, function (err, stats) {
@@ -105,7 +105,7 @@ export function rename(oldPath: string, newPath: string, callback: (err?: Error)
105105
err.code = "EEXIST";
106106
callback(err);
107107
});
108-
};
108+
}
109109

110110
export function showOpenDialog(
111111
allowMultipleSelection: boolean,
@@ -140,7 +140,7 @@ export function showOpenDialog(
140140
}, function (fileNames: string[]) {
141141
callback(null, fileNames ? fileNames.map(utils.convertWindowsPathToUnixPath) : []);
142142
});
143-
};
143+
}
144144

145145
export function showSaveDialog(
146146
title: string,
@@ -157,4 +157,4 @@ export function showSaveDialog(
157157
}, function (path) {
158158
callback(null, utils.convertWindowsPathToUnixPath(path));
159159
});
160-
};
160+
}

app/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export function restart(query: {} | string = {}) {
106106
// this should mirror stuff done in "ready" handler except for auto-updater
107107
const win = openMainBracketsWindow(query);
108108
setLoggerWindow(win);
109-
};
109+
}
110110

111111
export function getMainBracketsWindow(): Electron.BrowserWindow {
112112
return wins[0];

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@
6363
},
6464
"dependencies": {
6565
"anymatch": "1.3.0",
66-
"async": "2.1.4",
66+
"async": "2.3.0",
6767
"chokidar": "1.6.1",
6868
"decompress-zip": "0.3.0",
69-
"electron-localshortcut": "1.1.0",
70-
"fs-extra": "2.0.0",
69+
"electron-localshortcut": "1.1.1",
70+
"fs-extra": "2.1.2",
7171
"isbinaryfile": "3.0.2",
7272
"lodash": "4.17.4",
7373
"npm": "3.10.9",
7474
"opn": "4.0.2",
75-
"request": "2.79.0",
75+
"request": "2.81.0",
7676
"requirejs": "2.3.3",
7777
"semver": "5.3.0",
7878
"strip-bom": "3.0.0",
@@ -81,20 +81,20 @@
8181
"xml2js": "0.4.17"
8282
},
8383
"devDependencies": {
84-
"@types/electron": "1.4.33",
85-
"@types/fs-extra": "0.0.37",
84+
"@types/electron": "1.4.37",
85+
"@types/fs-extra": "2.1.0",
8686
"@types/jquery": "2.0.41",
87-
"@types/lodash": "4.14.55",
88-
"@types/node": "7.0.8",
89-
"@types/ws": "0.0.39",
87+
"@types/lodash": "4.14.63",
88+
"@types/node": "7.0.13",
89+
"@types/ws": "0.0.40",
9090
"concurrently": "3.4.0",
9191
"cross-spawn": "5.1.0",
92-
"electron": "1.6.2",
93-
"electron-builder": "15.3.0",
94-
"electron-builder-squirrel-windows": "15.3.0",
95-
"electron-packager": "8.5.2",
92+
"electron": "1.6.6",
93+
"electron-builder": "17.1.1",
94+
"electron-builder-squirrel-windows": "17.0.1",
95+
"electron-packager": "8.6.0",
9696
"electron-rebuild": "1.5.7",
97-
"eslint": "3.17.1",
97+
"eslint": "3.19.0",
9898
"glob": "7.1.1",
9999
"grunt": "0.4.5",
100100
"grunt-cleanempty": "1.0.3",
@@ -116,16 +116,16 @@
116116
"grunt-usemin": "0.1.11",
117117
"gulp": "3.9.1",
118118
"gulp-watch": "4.3.11",
119-
"husky": "0.13.2",
119+
"husky": "0.13.3",
120120
"jasmine-node": "1.11.0",
121121
"load-grunt-tasks": "3.5.2",
122122
"q": "1.4.1",
123123
"rewire": "1.1.2",
124-
"rimraf": "2.6.0",
125-
"tslint": "4.5.1",
124+
"rimraf": "2.6.1",
125+
"tslint": "5.1.0",
126126
"typescript": "2.2.0",
127-
"typescript-eslint-parser": "2.0.0",
128-
"webpack": "2.2.1",
127+
"typescript-eslint-parser": "2.1.0",
128+
"webpack": "2.4.1",
129129
"xmldoc": "0.1.2"
130130
}
131131
}

tslint.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"member-ordering": false,
77
"no-namespace": false,
88
"no-unused-expression": false,
9-
"no-unused-new": false,
109
"no-var-requires": false,
1110
"object-literal-sort-keys": false,
1211
"only-arrow-functions": false,

0 commit comments

Comments
 (0)