Skip to content

Commit ac5ed16

Browse files
mjbvzmjbvz
committed
Move package-json extension to npm extesion
microsoft#44166
1 parent 4244318 commit ac5ed16

15 files changed

Lines changed: 90 additions & 170 deletions

‎build/npm/postinstall.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const extensions = [
3232
'typescript',
3333
'php',
3434
'javascript',
35-
'package-json',
3635
'css',
3736
'html',
3837
'git',

‎extensions/npm/package.json‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "npm",
33
"publisher": "vscode",
44
"displayName": "%displayName%",
5-
"description": "%description%",
5+
"description": "%description%",
66
"version": "0.0.1",
77
"engines": {
88
"vscode": "0.10.x"
@@ -16,14 +16,17 @@
1616
"watch": "gulp watch-extension:npm"
1717
},
1818
"dependencies": {
19+
"jsonc-parser": "^1.0.0",
20+
"request-light": "^0.2.2",
1921
"vscode-nls": "^3.2.1"
2022
},
2123
"devDependencies": {
2224
"@types/node": "7.0.43"
2325
},
2426
"main": "./out/main",
2527
"activationEvents": [
26-
"onCommand:workbench.action.tasks.runTask"
28+
"onCommand:workbench.action.tasks.runTask",
29+
"onLanguage:json"
2730
],
2831
"contributes": {
2932
"configuration": {
@@ -59,6 +62,16 @@
5962
}
6063
}
6164
},
65+
"jsonValidation": [
66+
{
67+
"fileMatch": "package.json",
68+
"url": "https://schemastore.azurewebsites.net/schemas/json/package.json"
69+
},
70+
{
71+
"fileMatch": "bower.json",
72+
"url": "https://schemastore.azurewebsites.net/schemas/json/bower.json"
73+
}
74+
],
6275
"taskDefinitions": [
6376
{
6477
"type": "npm",

extensions/package-json/src/features/bowerJSONContribution.ts renamed to extensions/npm/src/features/bowerJSONContribution.ts

File renamed without changes.

extensions/package-json/src/features/jsonContributions.ts renamed to extensions/npm/src/features/jsonContributions.ts

File renamed without changes.

extensions/package-json/src/features/markedTextUtil.ts renamed to extensions/npm/src/features/markedTextUtil.ts

File renamed without changes.

extensions/package-json/src/features/packageJSONContribution.ts renamed to extensions/npm/src/features/packageJSONContribution.ts

File renamed without changes.

‎extensions/npm/src/main.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66

77
import * as path from 'path';
88
import * as fs from 'fs';
9+
import * as httpRequest from 'request-light';
910
import * as vscode from 'vscode';
1011
import * as nls from 'vscode-nls';
1112
const localize = nls.loadMessageBundle();
1213

14+
import { addJSONProviders } from './features/jsonContributions';
15+
1316
type AutoDetect = 'on' | 'off';
1417
let taskProvider: vscode.Disposable | undefined;
1518

16-
export function activate(_context: vscode.ExtensionContext): void {
19+
export function activate(context: vscode.ExtensionContext): void {
1720
if (!vscode.workspace.workspaceFolders) {
1821
return;
1922
}
@@ -26,6 +29,15 @@ export function activate(_context: vscode.ExtensionContext): void {
2629
return undefined;
2730
}
2831
});
32+
configureHttpRequest();
33+
vscode.workspace.onDidChangeConfiguration(() => configureHttpRequest());
34+
35+
context.subscriptions.push(addJSONProviders(httpRequest.xhr));
36+
}
37+
38+
function configureHttpRequest() {
39+
const httpSettings = vscode.workspace.getConfiguration('http');
40+
httpRequest.configure(httpSettings.get<string>('proxy', ''), httpSettings.get<boolean>('proxyStrictSSL', true));
2941
}
3042

3143
export function deactivate(): void {

‎extensions/npm/yarn.lock‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,68 @@
66
version "7.0.43"
77
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
88

9+
agent-base@4, agent-base@^4.1.0:
10+
version "4.2.0"
11+
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce"
12+
dependencies:
13+
es6-promisify "^5.0.0"
14+
15+
debug@2:
16+
version "2.6.9"
17+
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
18+
dependencies:
19+
ms "2.0.0"
20+
21+
debug@^3.1.0:
22+
version "3.1.0"
23+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
24+
dependencies:
25+
ms "2.0.0"
26+
27+
es6-promise@^4.0.3:
28+
version "4.2.4"
29+
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
30+
31+
es6-promisify@^5.0.0:
32+
version "5.0.0"
33+
resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
34+
dependencies:
35+
es6-promise "^4.0.3"
36+
37+
http-proxy-agent@2.0.0:
38+
version "2.0.0"
39+
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz#46482a2f0523a4d6082551709f469cb3e4a85ff4"
40+
dependencies:
41+
agent-base "4"
42+
debug "2"
43+
44+
https-proxy-agent@2.1.1:
45+
version "2.1.1"
46+
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz#a7ce4382a1ba8266ee848578778122d491260fd9"
47+
dependencies:
48+
agent-base "^4.1.0"
49+
debug "^3.1.0"
50+
51+
jsonc-parser@^1.0.0:
52+
version "1.0.1"
53+
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.1.tgz#7f8f296414e6e7c4a33b9e4914fc8c47e4421675"
54+
55+
ms@2.0.0:
56+
version "2.0.0"
57+
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
58+
59+
request-light@^0.2.2:
60+
version "0.2.2"
61+
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.2.tgz#53e48af32ad1514e45221ea5ece5ce782720f712"
62+
dependencies:
63+
http-proxy-agent "2.0.0"
64+
https-proxy-agent "2.1.1"
65+
vscode-nls "^2.0.2"
66+
67+
vscode-nls@^2.0.2:
68+
version "2.0.2"
69+
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
70+
971
vscode-nls@^3.2.1:
1072
version "3.2.1"
1173
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"

‎extensions/package-json/.vscodeignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎extensions/package-json/package.json‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)