Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit d939b00

Browse files
committed
add proxy support
1 parent 3f1ed5d commit d939b00

File tree

251 files changed

+35
-32686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+35
-32686
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"anymatch": "1.3.0",
1717
"chokidar": "1.6.0",
1818
"lodash": "4.15.0",
19-
"npm": "3.10.8"
19+
"npm": "3.10.9",
20+
"request": "2.79.0"
2021
},
2122
"devDependencies": {
2223
"glob": "7.0.6",

src/config.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"anymatch": "1.3.0",
4040
"chokidar": "1.6.0",
4141
"lodash": "4.15.0",
42-
"npm": "3.10.8"
42+
"npm": "3.10.9",
43+
"request": "2.79.0"
4344
},
4445
"devDependencies": {
4546
"glob": "7.0.6",
@@ -79,4 +80,4 @@
7980
"url": "https://github.com/adobe/brackets/blob/master/LICENSE"
8081
}
8182
]
82-
}
83+
}

src/extensibility/Package.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,12 @@ define(function (require, exports, module) {
105105
function validate(path, options) {
106106
return _extensionManagerCall(function (extensionManager) {
107107
var d = new $.Deferred();
108-
108+
109+
// make sure proxy is attached to options before calling validate
110+
// so npm can use it in the domain
111+
options = options || {};
112+
options.proxy = PreferencesManager.get("proxy");
113+
109114
extensionManager.validate(path, options)
110115
.done(function (result) {
111116
d.resolve({
@@ -157,7 +162,8 @@ define(function (require, exports, module) {
157162
disabledDirectory: disabledDirectory,
158163
systemExtensionDirectory: systemDirectory,
159164
apiVersion: brackets.metadata.apiVersion,
160-
nameHint: nameHint
165+
nameHint: nameHint,
166+
proxy: PreferencesManager.get("proxy")
161167
})
162168
.done(function (result) {
163169
result.keepFile = false;

src/extensibility/node/ExtensionManagerDomain.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ function _cmdInstall(packagePath, destinationDirectory, options, callback, pCall
309309
}
310310
}
311311

312-
validate(packagePath, {}, validateCallback);
312+
validate(packagePath, options, validateCallback);
313313
}
314314

315315
/**
@@ -503,7 +503,7 @@ function init(domainManager) {
503503
description: "absolute filesystem path where this extension should be installed"
504504
}, {
505505
name: "options",
506-
type: "{disabledDirectory: !string, apiVersion: !string, nameHint: ?string, systemExtensionDirectory: !string}",
506+
type: "{disabledDirectory: !string, apiVersion: !string, nameHint: ?string, systemExtensionDirectory: !string, proxy: ?string}",
507507
description: "installation options: disabledDirectory should be set so that extensions can be installed disabled."
508508
}],
509509
[{

src/extensibility/node/node_modules/request/.npmignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/extensibility/node/node_modules/request/LICENSE

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

0 commit comments

Comments
 (0)