Skip to content

Commit 8879013

Browse files
duncdrumduncdrum
authored
Merge pull request #448 from ccheraa/update-dependencies
Update dependencies
2 parents 0ff5010 + 9a0f60e commit 8879013

9 files changed

Lines changed: 1689 additions & 5172 deletions

File tree

‎browser-app/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"name": "browser-app",
44
"version": "1.1.0",
55
"dependencies": {
6-
"@theia/core": "^1.13.0",
7-
"@theia/filesystem": "^1.13.0",
8-
"@theia/workspace": "^1.13.0",
9-
"@theia/preferences": "^1.13.0",
10-
"@theia/navigator": "^1.13.0",
11-
"@theia/process": "^1.13.0",
12-
"@theia/terminal": "^1.13.0",
13-
"@theia/editor": "^1.13.0",
14-
"@theia/markers": "^1.13.0",
15-
"@theia/monaco": "^1.13.0",
16-
"@theia/messages": "^1.13.0",
6+
"@theia/core": "^1.15.0",
7+
"@theia/filesystem": "^1.15.0",
8+
"@theia/workspace": "^1.15.0",
9+
"@theia/preferences": "^1.15.0",
10+
"@theia/navigator": "^1.15.0",
11+
"@theia/process": "^1.15.0",
12+
"@theia/terminal": "^1.15.0",
13+
"@theia/editor": "^1.15.0",
14+
"@theia/markers": "^1.15.0",
15+
"@theia/monaco": "^1.15.0",
16+
"@theia/messages": "^1.15.0",
1717
"fusion-studio-extension": "1.2.0"
1818
},
1919
"devDependencies": {
20-
"@theia/cli": "^1.13.0"
20+
"@theia/cli": "^1.15.0"
2121
},
2222
"scripts": {
2323
"prepare": "theia build --mode development",

‎electron-app/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
"name": "electron-app",
44
"version": "1.1.0",
55
"dependencies": {
6-
"@theia/core": "^1.13.0",
7-
"@theia/filesystem": "^1.13.0",
8-
"@theia/workspace": "^1.13.0",
9-
"@theia/preferences": "^1.13.0",
10-
"@theia/navigator": "^1.13.0",
11-
"@theia/process": "^1.13.0",
12-
"@theia/terminal": "^1.13.0",
13-
"@theia/editor": "^1.13.0",
14-
"@theia/markers": "^1.13.0",
15-
"@theia/monaco": "^1.13.0",
16-
"@theia/messages": "^1.13.0",
17-
"@theia/electron": "^1.13.0",
6+
"@theia/core": "^1.15.0",
7+
"@theia/filesystem": "^1.15.0",
8+
"@theia/workspace": "^1.15.0",
9+
"@theia/preferences": "^1.15.0",
10+
"@theia/navigator": "^1.15.0",
11+
"@theia/process": "^1.15.0",
12+
"@theia/terminal": "^1.15.0",
13+
"@theia/editor": "^1.15.0",
14+
"@theia/markers": "^1.15.0",
15+
"@theia/monaco": "^1.15.0",
16+
"@theia/messages": "^1.15.0",
17+
"@theia/electron": "^1.15.0",
1818
"fusion-studio-extension": "1.2.0"
1919
},
2020
"devDependencies": {
21-
"@theia/cli": "^1.13.0"
21+
"@theia/cli": "^1.15.0"
2222
},
2323
"scripts": {
2424
"prepare": "theia build --mode development",

‎fusion-studio-extension/package.json‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
"src/browser/style/index.css"
1515
],
1616
"dependencies": {
17-
"@theia/core": "^1.13.0",
17+
"@theia/core": "^1.15.0",
1818
"awesomplete": "1.1.5",
1919
"filesize": "6.3.0",
20+
"mimetype": "^0.0.8",
2021
"moment": "2.29.1",
2122
"ripemd160": "2.0.2",
2223
"typescript": "4.2.4",
@@ -34,8 +35,10 @@
3435
"build": "tsc",
3536
"watch": "tsc -w"
3637
},
37-
"theiaExtensions": [{
38-
"frontend": "lib/browser/fusion-studio-frontend-module",
39-
"backend": "lib/node/fusion-studio-backend-module"
40-
}]
41-
}
38+
"theiaExtensions": [
39+
{
40+
"frontend": "lib/browser/fusion-studio-frontend-module",
41+
"backend": "lib/node/fusion-studio-backend-module"
42+
}
43+
]
44+
}

‎fusion-studio-extension/src/browser/core.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import { FSDragOperation } from "./widget/drag";
1414
import { FSTemplate } from "../classes/template";
1515
import { FSConnectionDialog, FSNewFromTemplateDialog, FSNewFromTemplateDialogResult, FSPropertiesDialog } from "./dialogs";
1616
import { FSFiles, FSFileList } from "../classes/files";
17-
import { isArray } from "util";
18-
import { lookup } from "mime-types";
17+
import { lookup } from "mimetype";
1918
import { createError, FSError, FSErrorObject, ERROR_MESSAGES } from "../classes/error";
2019
import { asyncForEach } from "../common/asyncForEach";
2120
import { FSStatusEntry } from "../classes/status";
@@ -1517,7 +1516,7 @@ export class FSCore {
15171516
};
15181517
const [rootStat] = await this.workspace.roots;
15191518
const file: URI | URI[] = await this.fileDialog.showOpenDialog(props, rootStat) as any;
1520-
const selectedFiles = (isArray(file) ? file : [file]).map(f => f.path.toString());
1519+
const selectedFiles = (Array.isArray(file) ? file : [file]).map(f => f.path.toString());
15211520
const top = this.getTopDir(selectedFiles);
15221521
const files = await this.files.getFiles({ file: selectedFiles });
15231522
const collectionNode = this.node as FSCollectionNode;

‎fusion-studio-extension/src/browser/dialogs/core.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module 'mimetype';

‎fusion-studio-extension/src/classes/indexes.ts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { isArray } from "util";
2-
31
export interface LuceneTextAttrPtn {
42
qname: string;
53
value: string;
@@ -71,19 +69,18 @@ export function readIndex(data: any): FSIndex {
7169
ignore: [],
7270
text: [],
7371
},
74-
ngram: isArray(data.ngram) ? data.ngram : [],
75-
range: isArray(data.range) ? data.range : [],
76-
legacyRange: isArray(data['legacy-range']) ? data['legacy-range'] : [],
72+
ngram: Array.isArray(data.ngram) ? data.ngram : [],
73+
range: Array.isArray(data.range) ? data.range : [],
74+
legacyRange: Array.isArray(data['legacy-range']) ? data['legacy-range'] : [],
7775
};
7876
if (data.lucene) {
79-
console.log(isArray);
80-
if (data.lucene.analyzers && isArray(data.lucene.analyzers)) {
77+
if (data.lucene.analyzers && Array.isArray(data.lucene.analyzers)) {
8178
result.lucene.analyzers = data.lucene.analyzers;
8279
}
83-
if (data.lucene.ignore && isArray(data.lucene.ignore)) {
80+
if (data.lucene.ignore && Array.isArray(data.lucene.ignore)) {
8481
result.lucene.ignore = data.lucene.ignore;
8582
}
86-
if (data.lucene.text && isArray(data.lucene.text)) {
83+
if (data.lucene.text && Array.isArray(data.lucene.text)) {
8784
data.lucene.text.matchSiblingAttr = data.lucene.text['match-sibling-attr'];
8885
data.lucene.text.hasSiblingAttr = data.lucene.text['has-sibling-attr'];
8986
data.lucene.text.matchAttr = data.lucene.text['match-attr'];

‎fusion-studio-extension/src/node/files.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import { FSFiles, FSFilenameList } from "../classes/files";
22
import { injectable } from "inversify";
33
import { readFileSync, statSync, readdirSync } from "fs";
44
import { createError, FSError } from "../classes/error";
5-
import { isArray } from "util";
65

76
function getFiles(files: string | string[], result?: string[]): string[] {
8-
if (!isArray(result)) {
7+
if (!Array.isArray(result)) {
98
result = [];
109
}
11-
if (isArray(files)) {
10+
if (Array.isArray(files)) {
1211
files.forEach(async file => result = getFiles(file, result));
1312
} else {
1413
if (statSync(files).isDirectory()) {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"devDependencies": {
2020
"@4tw/cypress-drag-drop": "https://github.com/ccheraa/cypress-drag-drop",
2121
"chai": "^4.3.4",
22-
"cypress": "7.5.0",
22+
"cypress": "7.6.0",
2323
"lerna": "4.0.0",
2424
"mocha": "^8.4.0",
25-
"node-sass": "6.0.0",
25+
"node-sass": "6.0.1",
2626
"sinon": "^10.0.0",
2727
"ts-node": "^9.1.1"
2828
},

0 commit comments

Comments
 (0)