Skip to content

Commit 89a16ba

Browse files
author
Alex079
committed
Update dependencies:
Remove explicit extension dependency on cpptools Update dev dependencies
1 parent 7c3662f commit 89a16ba

File tree

4 files changed

+417
-395
lines changed

4 files changed

+417
-395
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v1.1.2
2+
3+
- Remove explicit dependency on bundled cpptools
4+
15
## v1.1.1
26

37
- Set activation event

package.json

+12-15
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.1",
20+
"version": "1.1.2",
2121
"engines": {
22-
"vscode": "^1.47.2"
22+
"vscode": "^1.47.3"
2323
},
2424
"categories": [
2525
"Other"
@@ -132,32 +132,29 @@
132132
"build": "webpack --config webpack.dev",
133133
"watch": "webpack --config webpack.dev --watch",
134134
"lint": "eslint --ext .ts --fix src src",
135-
"clean": "rm -rf dist",
135+
"clean": "rm -rf dist *.vsix",
136136
"test": "node dist/test/wrapper",
137137
"verify": "yarn lint && yarn clean && yarn build && yarn test",
138138
"vscode:prepublish": "yarn clean && yarn dist"
139139
},
140140
"devDependencies": {
141141
"@types/chai": "^4",
142142
"@types/glob": "^7",
143-
"@types/mocha": "^7",
143+
"@types/mocha": "^8",
144144
"@types/node": "^13",
145145
"@types/vscode": "^1",
146-
"@typescript-eslint/eslint-plugin": "^2",
147-
"@typescript-eslint/parser": "^2",
146+
"@typescript-eslint/eslint-plugin": "^3",
147+
"@typescript-eslint/parser": "^3",
148148
"chai": "^4",
149-
"eslint": "^6",
149+
"eslint": "^7",
150150
"glob": "^7",
151-
"mocha": "^7",
152-
"ts-loader": "^7",
151+
"mocha": "^8",
152+
"ts-loader": "^8",
153153
"typescript": "^3",
154154
"vscode-test": "^1",
155155
"webpack": "^4",
156156
"webpack-cli": "^3",
157-
"webpack-merge": "^4",
158-
"webpack-node-externals": "^1"
159-
},
160-
"extensionDependencies": [
161-
"ms-vscode.cpptools"
162-
]
157+
"webpack-merge": "^5",
158+
"webpack-node-externals": "^2"
159+
}
163160
}

webpack.dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
'use strict';
44

5-
module.exports = require('webpack-merge')(require('./webpack.config'),
5+
module.exports = require('webpack-merge').merge(require('./webpack.config'),
66
/**@type {import('webpack').Configuration}*/
77
{
88
mode: "development",

0 commit comments

Comments
 (0)