Update deps
This commit is contained in:
Richard Willis
Родитель
aadd8200ec
Коммит
8c5ea30195
|
|
@ -38,10 +38,10 @@ jobs:
|
|||
with:
|
||||
java-version: "11"
|
||||
architecture: x64
|
||||
- name: Use Node 12.16.2
|
||||
- name: Use Node 14.15.4
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 12.16.2
|
||||
node-version: 14.15.4
|
||||
- name: Build
|
||||
uses: eskatos/gradle-command-action@v1
|
||||
with:
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@ jobs:
|
|||
with:
|
||||
java-version: "11"
|
||||
architecture: x64
|
||||
- name: Use Node 12.16.2
|
||||
- name: Use Node 14.15.4
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 12.16.2
|
||||
node-version: 14.15.4
|
||||
- name: Cache gradle home
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
|
|
@ -76,7 +76,7 @@ jobs:
|
|||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [12.16.2]
|
||||
node-version: [14.15.4]
|
||||
java-version: ["8", "11", "15"]
|
||||
os: [ubuntu-latest, windows-latest]
|
||||
# os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
|
|
@ -183,10 +183,10 @@ jobs:
|
|||
if: github.event_name == 'push' && contains(github.ref, '/release/')
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Use Node 12.16.2
|
||||
- name: Use Node 14.15.4
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 12.16.2
|
||||
node-version: 14.15.4
|
||||
- name: Build & prepare extension
|
||||
uses: eskatos/gradle-command-action@v1
|
||||
with:
|
||||
|
|
@ -219,10 +219,10 @@ jobs:
|
|||
if: github.event_name == 'release' && github.event.action == 'published'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Use Node 12.16.2
|
||||
- name: Use Node 14.15.4
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 12.16.2
|
||||
node-version: 14.15.4
|
||||
- name: Cache gradle
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
|
|
|
|||
2
.nvmrc
2
.nvmrc
|
|
@ -1 +1 @@
|
|||
lts/erbium
|
||||
14.15.4
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"parser": "@typescript-eslint/parser",
|
||||
"extends": [
|
||||
"plugin:@typescript-eslint/recommended",
|
||||
"prettier/@typescript-eslint",
|
||||
"prettier",
|
||||
"plugin:prettier/recommended",
|
||||
"plugin:sonarjs/recommended"
|
||||
],
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -21,8 +21,8 @@
|
|||
"license": "SEE LICENSE IN LICENSE.md",
|
||||
"engines": {
|
||||
"vscode": "^1.45.0",
|
||||
"node": "^12.10.0",
|
||||
"npm": "^6.10.3"
|
||||
"node": "^14.15.4",
|
||||
"npm": "^6.14.10"
|
||||
},
|
||||
"categories": [
|
||||
"Other"
|
||||
|
|
@ -751,42 +751,42 @@
|
|||
"prepare": "npm run snyk-protect"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grpc/grpc-js": "^1.1.8",
|
||||
"@rollup/plugin-commonjs": "^15.1.0",
|
||||
"@grpc/grpc-js": "^1.2.10",
|
||||
"@rollup/plugin-commonjs": "^17.1.0",
|
||||
"@rollup/plugin-json": "^4.1.0",
|
||||
"@rollup/plugin-node-resolve": "^9.0.0",
|
||||
"@rollup/plugin-typescript": "^6.0.0",
|
||||
"@types/fs-extra": "^9.0.1",
|
||||
"@rollup/plugin-node-resolve": "^11.2.0",
|
||||
"@rollup/plugin-typescript": "^8.2.0",
|
||||
"@types/fs-extra": "^9.0.8",
|
||||
"@types/glob": "^7.1.3",
|
||||
"@types/google-protobuf": "^3.7.4",
|
||||
"@types/mocha": "^8.0.3",
|
||||
"@types/node": "^12.12.39",
|
||||
"@types/sinon": "^9.0.7",
|
||||
"@types/vscode": "1.45.0",
|
||||
"@typescript-eslint/eslint-plugin": "^4.3.0",
|
||||
"@typescript-eslint/parser": "^4.3.0",
|
||||
"eslint": "^7.10.0",
|
||||
"eslint-config-prettier": "^6.12.0",
|
||||
"eslint-plugin-prettier": "^3.1.4",
|
||||
"eslint-plugin-sonarjs": "^0.5.0",
|
||||
"fs-extra": "^9.0.1",
|
||||
"@types/mocha": "^8.2.1",
|
||||
"@types/node": "^14.14.31",
|
||||
"@types/sinon": "^9.0.10",
|
||||
"@types/vscode": "1.54.0",
|
||||
"@typescript-eslint/eslint-plugin": "^4.16.1",
|
||||
"@typescript-eslint/parser": "^4.16.1",
|
||||
"eslint": "^7.21.0",
|
||||
"eslint-config-prettier": "^8.1.0",
|
||||
"eslint-plugin-prettier": "^3.3.1",
|
||||
"eslint-plugin-sonarjs": "^0.6.0",
|
||||
"fs-extra": "^9.1.0",
|
||||
"get-port": "^5.1.1",
|
||||
"google-protobuf": "^3.13.0",
|
||||
"google-protobuf": "^3.15.5",
|
||||
"grpc-tools": "^1.10.0",
|
||||
"minimatch": "^3.0.4",
|
||||
"mocha": "^8.2.0",
|
||||
"prettier": "^2.1.2",
|
||||
"rollup": "^2.28.2",
|
||||
"mocha": "^8.3.1",
|
||||
"prettier": "^2.2.1",
|
||||
"rollup": "^2.40.0",
|
||||
"rollup-plugin-ignore": "^1.0.9",
|
||||
"rollup-plugin-terser": "^7.0.2",
|
||||
"sinon": "^9.1.0",
|
||||
"snyk": "^1.406.0",
|
||||
"sinon": "^9.2.4",
|
||||
"snyk": "^1.473.0",
|
||||
"string-argv": "^0.3.1",
|
||||
"tree-kill": "^1.2.2",
|
||||
"ts-protoc-gen": "^0.13.0",
|
||||
"typescript": "^4.0.3",
|
||||
"vsce": "^1.81.0",
|
||||
"vscode-test": "^1.4.1"
|
||||
"ts-protoc-gen": "^0.14.0",
|
||||
"typescript": "^4.2.3",
|
||||
"vsce": "^1.85.1",
|
||||
"vscode-test": "^1.5.1"
|
||||
},
|
||||
"snyk": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
export abstract class Command {
|
||||
public abstract async run(...args: unknown[]): Promise<unknown>;
|
||||
public abstract run(...args: unknown[]): Promise<unknown>;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ describe(`${suiteName} - ${fixtureName}`, () => {
|
|||
const disposable = vscode.tasks.onDidEndTaskProcess((e) => {
|
||||
if (e.execution.task === task) {
|
||||
disposable.dispose();
|
||||
resolve();
|
||||
resolve(undefined);
|
||||
}
|
||||
});
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
export class Deferred<T> {
|
||||
public promise: Promise<T>;
|
||||
|
||||
private _resolve?: (value?: T) => void;
|
||||
private _resolve?: (value: T) => void;
|
||||
private _reject?: (reason?: Error) => void;
|
||||
|
||||
constructor() {
|
||||
this.promise = new Promise(
|
||||
(resolve: (value?: T) => void, reject: (reason?: Error) => void) => {
|
||||
this.promise = new Promise<T>(
|
||||
(resolve: (value: T) => void, reject: (reason?: Error) => void) => {
|
||||
this._resolve = resolve;
|
||||
this._reject = reject;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
resolve(value?: T): void {
|
||||
resolve(value: T): void {
|
||||
this._resolve!(value);
|
||||
}
|
||||
|
||||
reject(reason?: Error): void {
|
||||
reject(reason: Error): void {
|
||||
this._reject!(reason);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,9 +58,8 @@ export function isGradleRootProject(rootProject: RootProject): boolean {
|
|||
);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
export function isWorkspaceFolder(
|
||||
value: unknown
|
||||
): value is vscode.WorkspaceFolder {
|
||||
return value && typeof value !== 'number';
|
||||
return !!value && typeof value !== 'number';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ export function treeItemSortCompareFunc(
|
|||
a: vscode.TreeItem,
|
||||
b: vscode.TreeItem
|
||||
): number {
|
||||
return a.label!.localeCompare(b.label!);
|
||||
return a.label!.toString().localeCompare(b.label!.toString());
|
||||
}
|
||||
|
||||
export function gradleTaskTreeItemSortCompareFunc(
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"parser": "@typescript-eslint/parser",
|
||||
"extends": [
|
||||
"plugin:@typescript-eslint/recommended",
|
||||
"prettier/@typescript-eslint",
|
||||
"prettier",
|
||||
"plugin:prettier/recommended"
|
||||
],
|
||||
"parserOptions": { "ecmaVersion": 2018, "sourceType": "module" }
|
||||
|
|
|
|||
|
|
@ -18,26 +18,26 @@
|
|||
"main": "./index.js",
|
||||
"types": "./index.ts",
|
||||
"engines": {
|
||||
"node": "^12.10.0",
|
||||
"npm": "^6.10.3"
|
||||
"node": "^14.15.4",
|
||||
"npm": "^6.14.10"
|
||||
},
|
||||
"scripts": {
|
||||
"compile": "tsc -p ."
|
||||
},
|
||||
"dependencies": {
|
||||
"@grpc/grpc-js": "^1.1.7",
|
||||
"@types/google-protobuf": "^3.7.3",
|
||||
"@types/vscode": "1.45.0",
|
||||
"@grpc/grpc-js": "^1.2.10",
|
||||
"@types/google-protobuf": "^3.7.4",
|
||||
"@types/vscode": "1.54.0",
|
||||
"google-protobuf": "^4.0.0-rc.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "^4.3.0",
|
||||
"@typescript-eslint/parser": "^4.3.0",
|
||||
"eslint": "^7.10.0",
|
||||
"eslint-config-prettier": "^6.12.0",
|
||||
"eslint-plugin-prettier": "^3.1.4",
|
||||
"prettier": "^2.1.2",
|
||||
"snyk": "^1.406.0",
|
||||
"typescript": "^4.0.3"
|
||||
"@typescript-eslint/eslint-plugin": "^4.16.1",
|
||||
"@typescript-eslint/parser": "^4.16.1",
|
||||
"eslint": "^7.21.0",
|
||||
"eslint-config-prettier": "^8.1.0",
|
||||
"eslint-plugin-prettier": "^3.3.1",
|
||||
"prettier": "^2.2.1",
|
||||
"snyk": "^1.473.0",
|
||||
"typescript": "^4.2.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче