Skip to content

Commit dae8683

Browse files
committed
Merge remote-tracking branch 'origin/release'
2 parents 583cd81 + 97b5aef commit dae8683

10 files changed

+109
-927
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
0.6.0
2+
=====
3+
4+
## What's New
5+
- [Replace the v8 remtoe debugging protocol with Chrome Debugging Protocol](https://github.com/NativeScript/nativescript-vscode-extension/pull/107)
6+
17
0.5.1
28
=====
39

package.json

+17-31
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nativescript",
33
"version": "0.6.0",
4-
"minNativescriptCliVersion": "2.2.1",
4+
"minNativescriptCliVersion": "2.5.0",
55
"icon": "images/icon.png",
66
"displayName": "NativeScript",
77
"description": "NativeScript support for Visual Studio Code",
@@ -39,12 +39,12 @@
3939
"@types/mocha": "^2.2.32",
4040
"@types/node": "^6.0.46",
4141
"@types/source-map": "^0.1.29",
42+
"chrome-remote-debug-protocol": "git://github.com/roblourens/chrome-remote-debug-protocol.git",
4243
"mocha": "^2.4.5",
4344
"typescript": "^2.0.6",
44-
"vsce": "^1.0.0",
45+
"vsce": "^1.18.0",
4546
"vscode": "^1.0.3",
46-
"vscode-debugadapter-testsupport": "^1.7.0",
47-
"chrome-remote-debug-protocol": "git://github.com/roblourens/chrome-remote-debug-protocol.git"
47+
"vscode-debugadapter-testsupport": "^1.7.0"
4848
},
4949
"scripts": {
5050
"clean": "git clean -fdx",
@@ -115,38 +115,23 @@
115115
"program": "./out/debug-adapter/webKitDebug.js",
116116
"runtime": "node",
117117
"initialConfigurations": [
118-
{
119-
"name": "Sync on iOS",
120-
"type": "nativescript",
121-
"request": "launch",
122-
"platform": "ios",
123-
"appRoot": "${workspaceRoot}",
124-
"sourceMaps": true
125-
},
126118
{
127119
"name": "Launch on iOS",
128120
"type": "nativescript",
129121
"request": "launch",
130122
"platform": "ios",
131123
"appRoot": "${workspaceRoot}",
132124
"sourceMaps": true,
133-
"rebuild": true
125+
"watch": true
134126
},
135127
{
136128
"name": "Attach on iOS",
137129
"type": "nativescript",
138130
"request": "attach",
139131
"platform": "ios",
140132
"appRoot": "${workspaceRoot}",
141-
"sourceMaps": true
142-
},
143-
{
144-
"name": "Sync on Android",
145-
"type": "nativescript",
146-
"request": "launch",
147-
"platform": "android",
148-
"appRoot": "${workspaceRoot}",
149-
"sourceMaps": true
133+
"sourceMaps": true,
134+
"watch": false
150135
},
151136
{
152137
"name": "Launch on Android",
@@ -155,15 +140,16 @@
155140
"platform": "android",
156141
"appRoot": "${workspaceRoot}",
157142
"sourceMaps": true,
158-
"rebuild": true
143+
"watch": true
159144
},
160145
{
161146
"name": "Attach on Android",
162147
"type": "nativescript",
163148
"request": "attach",
164149
"platform": "android",
165150
"appRoot": "${workspaceRoot}",
166-
"sourceMaps": true
151+
"sourceMaps": true,
152+
"watch": false
167153
}
168154
],
169155
"configurationAttributes": {
@@ -213,15 +199,10 @@
213199
"description": "If true the launch request will launch the program without enabling debugging",
214200
"default": false
215201
},
216-
"rebuild": {
202+
"watch": {
217203
"type": "boolean",
218-
"description": "Whether the app should be rebuild before start.",
204+
"description": "Whether the watch and reconnect on file change.",
219205
"default": true
220-
},
221-
"syncAllFiles": {
222-
"type": "boolean",
223-
"description": "Whether to sync files from node_modules folder.",
224-
"default": false
225206
}
226207
}
227208
},
@@ -260,6 +241,11 @@
260241
"type": "string",
261242
"description": "NativeScript platform",
262243
"default": null
244+
},
245+
"watch": {
246+
"type": "boolean",
247+
"description": "Whether the watch and reconnect on file change.",
248+
"default": true
263249
}
264250
}
265251
}

src/custom-typings/debugProtocolExtensions.d.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ declare module 'vscode-debugprotocol' {
1919

2020
interface ILaunchRequestArgs extends DebugProtocol.LaunchRequestArguments, IRequestArgs {
2121
stopOnEntry?: boolean;
22-
rebuild?: boolean;
23-
syncAllFiles?: boolean;
22+
watch?: boolean;
2423
}
2524

2625
interface IAttachRequestArgs extends DebugProtocol.AttachRequestArguments, IRequestArgs {

0 commit comments

Comments
 (0)