Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Commit 54a726a

Browse files
authored
Merge pull request #1380 from microsoft/dev
Bump to v0.4.7
2 parents 096fecb + 1d3a644 commit 54a726a

16 files changed

+39
-27
lines changed

.eslintrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ plugins:
1919
- '@typescript-eslint'
2020
rules: {
2121
"no-empty": ["error", { "allowEmptyCatch": true }],
22-
"no-unused-vars": ["error", { "args": "none" }]
22+
"@typescript-eslint/no-unused-vars": ["error", { "args": "none" }]
2323
}
2424

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: preinstall
4747
run: |
4848
npm install -g node-gyp
49-
npm install -g vsce
49+
npm install -g vsce@"^1.0.0"
5050
npm install -g gulp
5151
- name: install
5252
run: npm install
@@ -85,7 +85,7 @@ jobs:
8585
- name: preinstall
8686
run: |
8787
npm install -g node-gyp
88-
npm install -g vsce
88+
npm install -g vsce@"^1.0.0"
8989
npm install -g gulp
9090
- name: install
9191
run: npm install

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## Version 0.4.7
5+
6+
- Release date: ???
7+
8+
### Changed
9+
10+
- Add support for ST-Link v3.0 [#1366](https://github.com/microsoft/vscode-arduino/pull/1366)
11+
- Fix empty board and examples list [#1367](https://github.com/microsoft/vscode-arduino/pull/1367)
12+
- Fix ESLint parsing for enums [#1368](https://github.com/microsoft/vscode-arduino/pull/1368)
13+
- Fix build cwd [#1375](https://github.com/microsoft/vscode-arduino/pull/1375)
14+
- Fix stack overflow in board configuration view [#1379](https://github.com/microsoft/vscode-arduino/pull/1379)
15+
416
## Version 0.4.6
517

618
- Release date: September 29, 2021

misc/debuggerUsbMapping.json

+11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@
2020
"short_name": "stlink-2.1",
2121
"config_file": "stlink-v2-1.cfg"
2222
},
23+
{
24+
"vid": "0483",
25+
"pid": [
26+
"374e",
27+
"374f",
28+
"3753"
29+
],
30+
"name": "ST Link V3.0",
31+
"short_name": "stlink-v3.0",
32+
"config_file": "stlink-v3-0.cfg"
33+
},
2334
{
2435
"pid": [
2536
"0101",

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-arduino",
33
"displayName": "Arduino",
44
"description": "Arduino for Visual Studio Code",
5-
"version": "0.4.6",
5+
"version": "0.4.7-rc2",
66
"publisher": "vsciot-vscode",
77
"aiKey": "83dd2c27-6594-41d3-85a9-bdb22070eb42",
88
"preview": true,

src/arduino/arduino.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import { SerialMonitor } from "../serialmonitor/serialMonitor";
2727
import { UsbDetector } from "../serialmonitor/usbDetector";
2828
import { ProgrammerManager } from "./programmerManager";
2929

30-
// Not sure why eslint fails to detect usage of this enum, so disable checking.
31-
/* eslint-disable no-unused-vars */
3230
/**
3331
* Supported build modes. For further explanation see the documentation
3432
* of ArduinoApp.build().
@@ -42,7 +40,6 @@ export enum BuildMode {
4240
UploadProgrammer = "Uploading (programmer)",
4341
CliUploadProgrammer = "Uploading (programmer) using Arduino CLI",
4442
}
45-
/* eslint-enable no-unused-vars */
4643

4744
/**
4845
* Represent an Arduino application based on the official Arduino IDE.
@@ -767,7 +764,7 @@ export class ArduinoApp {
767764
return await util.spawn(
768765
this._settings.commandPath,
769766
args,
770-
undefined,
767+
{ cwd: ArduinoWorkspace.rootPath },
771768
{ /*channel: arduinoChannel.channel,*/ stdout: stdoutcb, stderr: stderrcb },
772769
).then(async () => {
773770
const ret = await cleanup("ok");

src/arduino/intellisense.ts

-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ function makeCompilerParserEngines(dc: DeviceContext) {
146146
}
147147

148148
// Not sure why eslint fails to detect usage of these enums, so disable checking.
149-
/* eslint-disable no-unused-vars */
150149
/**
151150
* Possible states of AnalysisManager's state machine.
152151
*/
@@ -189,7 +188,6 @@ enum AnalysisEvent {
189188
*/
190189
AnalysisBuildDone,
191190
}
192-
/* eslint-enable no-unused-vars */
193191

194192
/**
195193
* This class manages analysis builds for the automatic IntelliSense

src/arduino/package.ts

-3
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ export interface IBoardConfigItem {
152152
options: IBoardConfigOption[];
153153
}
154154

155-
// Not sure why eslint fails to detect usage of this enum, so disable checking.
156-
/* eslint-disable no-unused-vars */
157155
/**
158156
* Return values of calls to IBoard.loadConfig() and IBoard.updateConfig().
159157
*/
@@ -182,7 +180,6 @@ export enum BoardConfigResult {
182180
*/
183181
InvalidFormat,
184182
}
185-
/* eslint-enable no-unused-vars */
186183

187184
/**
188185
* Interface for classes that represent an Arduino supported board.

src/common/constants.ts

-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@ export const CPP_CONFIG_FILE = path.join(".vscode", "c_cpp_properties.json");
1010
/** The name of the intellisense configuration managed by vscode-arduino. */
1111
export const C_CPP_PROPERTIES_CONFIG_NAME = "Arduino";
1212

13-
// Not sure why eslint fails to detect usage of this enum, so disable checking.
14-
/* eslint-disable no-unused-vars */
1513
export enum LogLevel {
1614
Info = "info",
1715
Verbose = "verbose",
1816
}
19-
/* eslint-enable no-unused-vars */
2017

2118
export const ARDUINO_MODE: vscode.DocumentSelector = [
2219
{ language: "cpp", scheme: "file" },

src/logger/logger.ts

-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ import * as winston from "winston";
66
import TelemetryTransport from "./telemetry-transport";
77
import UserNotificationTransport from "./user-notification-transport";
88

9-
// Not sure why eslint fails to detect usage of this enum, so disable checking.
10-
/* eslint-disable no-unused-vars */
119
export enum LogLevel {
1210
Info = "info",
1311
Warn = "warn",
1412
Error = "error",
1513
}
16-
/* eslint-enable no-unused-vars */
1714

1815
function FilterErrorPath(line: string): string {
1916
if (line) {

src/views/app/components/BoardConfig.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class BoardConfig extends React.Component<IBoardConfigProps, React.Props<any>> {
3535
this.state = {};
3636
}
3737

38-
public UNSAFE_componentWillMount() {
38+
public componentWillMount() {
3939
this.props.loadInstalledBoards();
4040
this.props.loadConfigItems();
4141
}

src/views/app/components/BoardManager.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class BoardManager extends React.Component<IBoardManagerProps, IBoardManagerStat
6666
this.typeUpdate = this.typeUpdate.bind(this);
6767
}
6868

69-
public UNSAFE_componentWillMount() {
69+
public componentWillMount() {
7070
this.props.loadBoardPackages(false);
7171
}
7272

src/views/app/components/BoardSelector.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@ export default class BoardSelector extends React.Component<IBoardSelectorProps,
2323
this.updateSelectedBoard = this.updateSelectedBoard.bind(this);
2424
}
2525

26-
public render() {
27-
if (!this.state.selectedBoard && this.props.installedBoards.length) {
26+
public componentWillReceiveProps(nextProps) {
27+
if (!this.state.selectedBoard && nextProps.installedBoards.length) {
2828
this.setState({
29-
selectedBoard: this.props.installedBoards.find((bd) => bd.isSelected),
29+
selectedBoard: nextProps.installedBoards.find((bd) => bd.isSelected),
3030
});
3131
}
32+
}
33+
34+
public render() {
3235
const options = this.props.installedBoards.map((b) => {
3336
return {
3437
value: b.key,

src/views/app/components/ExampleTreeView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ExampleTreeView extends React.Component<IExampleViewProps, IExampleViewSta
3939
this.onExpand = this.onExpand.bind(this);
4040
}
4141

42-
public UNSAFE_componentWillMount() {
42+
public componentWillMount() {
4343
this.props.loadExamples();
4444
}
4545

src/views/app/components/LibraryManager.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class LibraryManager extends React.Component<ILibraryManagerProps, ILibraryManag
8080
this.handleCheck = this.handleCheck.bind(this);
8181
}
8282

83-
public UNSAFE_componentWillMount() {
83+
public componentWillMount() {
8484
this.props.loadLibraries(false);
8585
}
8686

0 commit comments

Comments
 (0)