Skip to content

Commit 967aac4

Browse files
authored
Merge pull request #5 from Alex079/update_dependencies
update dependencies
2 parents 9ce876e + b10a0e2 commit 967aac4

File tree

5 files changed

+851
-2448
lines changed

5 files changed

+851
-2448
lines changed

.eslintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"root": true,
33
"parser": "@typescript-eslint/parser",
44
"parserOptions": {
5-
"ecmaVersion": 6,
5+
"ecmaVersion": 2019,
66
"sourceType": "module"
77
},
88
"plugins": [

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dist
33
node_modules
44
.vscode-test/
55
*.vsix
6+
*.log

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"url": "https://github.com/Alex079/vscode-avr-helper"
1818
},
1919
"publisher": "Alex079",
20-
"version": "1.1.3",
20+
"version": "1.1.4",
2121
"engines": {
22-
"vscode": "^1.48.2"
22+
"vscode": "^1.52.1"
2323
},
2424
"categories": [
2525
"Other"
@@ -129,8 +129,8 @@
129129
},
130130
"scripts": {
131131
"dist": "webpack",
132-
"build": "webpack --config webpack.dev",
133-
"watch": "webpack --config webpack.dev --watch",
132+
"build": "webpack --config webpack.dev.js",
133+
"watch": "webpack --config webpack.dev.js --watch",
134134
"lint": "eslint --ext .ts --fix src src",
135135
"clean": "rm -rf dist *.vsix",
136136
"test": "node dist/test/wrapper",
@@ -141,7 +141,7 @@
141141
"@types/chai": "^4",
142142
"@types/glob": "^7",
143143
"@types/mocha": "^8",
144-
"@types/node": "^13",
144+
"@types/node": "^14",
145145
"@types/vscode": "^1",
146146
"@typescript-eslint/eslint-plugin": "^4",
147147
"@typescript-eslint/parser": "^4",
@@ -150,10 +150,10 @@
150150
"glob": "^7",
151151
"mocha": "^8",
152152
"ts-loader": "^8",
153-
"typescript": "^3",
153+
"typescript": "^4",
154154
"vscode-test": "^1",
155-
"webpack": "^4",
156-
"webpack-cli": "^3",
155+
"webpack": "^5",
156+
"webpack-cli": "^4",
157157
"webpack-merge": "^5",
158158
"webpack-node-externals": "^2"
159159
}

src/main/presentation/Inputs.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export async function pickFolder(): Promise<WorkspaceFolder> {
2929

3030
export async function pickFile(placeholder: string, value: string | undefined,
3131
required: boolean, includeFiles: boolean, includeFolders: boolean,
32-
step: number | undefined = undefined, totalSteps: number | undefined = undefined): Promise<string> {
32+
step: number | undefined = undefined, totalSteps: number | undefined = undefined): Promise<string | undefined> {
3333
const input = window.createInputBox();
3434
if (value) {
3535
input.value = value;
@@ -40,7 +40,7 @@ export async function pickFile(placeholder: string, value: string | undefined,
4040
input.totalSteps = totalSteps;
4141
input.buttons = [{ iconPath: getPlusIcon() }];
4242
const disposables: Disposable[] = [];
43-
return new Promise<string>((resolve, reject) => {
43+
return new Promise<string | undefined>((resolve, reject) => {
4444
disposables.push(
4545
input.onDidHide(() => reject('Interrupted')),
4646
input.onDidAccept(() => {
@@ -150,7 +150,7 @@ export async function pickFiles(placeholder: string, value: string[] | undefined
150150
}
151151

152152
export async function pickNumber(placeholder: string, value: number | undefined, required: boolean,
153-
step: number | undefined = undefined, totalSteps: number | undefined = undefined): Promise<number> {
153+
step: number | undefined = undefined, totalSteps: number | undefined = undefined): Promise<number | undefined> {
154154
const input = window.createInputBox();
155155
if (value) {
156156
input.value = value.toString();
@@ -160,7 +160,7 @@ export async function pickNumber(placeholder: string, value: number | undefined,
160160
input.totalSteps = totalSteps;
161161
input.placeholder = placeholder;
162162
const disposables: Disposable[] = [];
163-
return new Promise<number>((resolve, reject) => {
163+
return new Promise<number | undefined>((resolve, reject) => {
164164
disposables.push(
165165
input.onDidHide(() => reject('Interrupted')),
166166
input.onDidAccept(() => {
@@ -186,7 +186,7 @@ export async function pickNumber(placeholder: string, value: number | undefined,
186186
}
187187

188188
export async function pickString(placeholder: string, value: string | undefined, required: boolean,
189-
step: number | undefined = undefined, totalSteps: number | undefined = undefined): Promise<string> {
189+
step: number | undefined = undefined, totalSteps: number | undefined = undefined): Promise<string | undefined> {
190190
const input = window.createInputBox();
191191
if (value) {
192192
input.value = value.toString();
@@ -196,7 +196,7 @@ export async function pickString(placeholder: string, value: string | undefined,
196196
input.totalSteps = totalSteps;
197197
input.placeholder = placeholder;
198198
const disposables: Disposable[] = [];
199-
return new Promise<string>((resolve, reject) => {
199+
return new Promise<string | undefined>((resolve, reject) => {
200200
disposables.push(
201201
input.onDidHide(() => reject('Interrupted')),
202202
input.onDidAccept(() => {

0 commit comments

Comments
 (0)