Merge pull request +9127 from c9/fix-updater-npm

Fix npm updater
pull/134/merge
Alex Brausewetter 2015-09-03 14:11:45 -07:00
commit f29ce2fa12
2 zmienionych plików z 17 dodań i 3 usunięć

Wyświetl plik

@ -0,0 +1,6 @@
.bk-window.dialog-updater .bk-content {
bottom: 0;
}
.bk-window.dialog-updater .bk-win-footer {
display: none;
}

Wyświetl plik

@ -3,7 +3,7 @@ define(function(require, exports, module) {
main.consumes = [ main.consumes = [
"Plugin", "Plugin",
"c9", "proc", "Dialog", "c9", "proc", "Dialog", "ui",
]; ];
main.provides = ["plugin.updater.npm"]; main.provides = ["plugin.updater.npm"];
return main; return main;
@ -13,6 +13,7 @@ define(function(require, exports, module) {
var c9 = imports["c9"]; var c9 = imports["c9"];
var proc = imports["proc"]; var proc = imports["proc"];
var Dialog = imports["Dialog"]; var Dialog = imports["Dialog"];
var ui = imports["ui"];
var async = require("async"); var async = require("async");
var path = require("path"); var path = require("path");
@ -25,9 +26,9 @@ define(function(require, exports, module) {
var npmBin = options.npmBin || "/home/ubuntu/.nvm/nvm-exec"; var npmBin = options.npmBin || "/home/ubuntu/.nvm/nvm-exec";
var managedPath = options.managedPath || "/home/ubuntu/.c9/managed"; var managedPath = options.managedPath || "/home/ubuntu/.c9/managed";
var managedRcPath = [managedPath, ".npmrc"].join("/");
var managedNpmPath = [managedPath, "npm"].join("/"); var managedNpmPath = [managedPath, "npm"].join("/");
var managedEtcPath = [managedNpmPath, "etc"].join("/"); var managedEtcPath = [managedNpmPath, "etc"].join("/");
var managedRcPath = [managedEtcPath, "npmrc"].join("/");
var managedCachePath = [managedPath, "npm", "cache"].join("/"); var managedCachePath = [managedPath, "npm", "cache"].join("/");
var managedPluginsPath = [managedPath, "plugins"].join("/"); var managedPluginsPath = [managedPath, "plugins"].join("/");
var managedModulesPath = [managedPath, "node_modules"].join("/"); var managedModulesPath = [managedPath, "node_modules"].join("/");
@ -35,6 +36,8 @@ define(function(require, exports, module) {
var plugin = new Plugin("Ajax.org", main.consumes); var plugin = new Plugin("Ajax.org", main.consumes);
function load() { function load() {
ui.insertCss(require("text!./style.css"), false, plugin);
var pkgs = options.packages; var pkgs = options.packages;
if (!pkgs) { if (!pkgs) {
@ -195,7 +198,6 @@ define(function(require, exports, module) {
env: { env: {
"npm_config_production": "true", "npm_config_production": "true",
"npm_config_depth": 0, "npm_config_depth": 0,
"npm_config_link": "true",
"npm_config_userconfig": "/dev/null", "npm_config_userconfig": "/dev/null",
"npm_config_prefix": managedNpmPath, "npm_config_prefix": managedNpmPath,
"npm_config_cache": managedCachePath, "npm_config_cache": managedCachePath,
@ -322,6 +324,11 @@ define(function(require, exports, module) {
function fsWriteNpmrc(callback) { function fsWriteNpmrc(callback) {
var config = [ var config = [
"//registry.npmjs.org/:_authToken = a7c61f6e-5b10-41db-947f-8bc8f1f9468b", "//registry.npmjs.org/:_authToken = a7c61f6e-5b10-41db-947f-8bc8f1f9468b",
"production = true",
"depth = 0",
"userconfig = /dev/null",
"prefix = " + managedNpmPath,
"cache = " + managedCachePath,
]; ];
// //
@ -352,6 +359,7 @@ define(function(require, exports, module) {
function showUpdateDialog() { function showUpdateDialog() {
var dialog = new Dialog("Ajax.org", [], { var dialog = new Dialog("Ajax.org", [], {
name: "plugin.updater.npm.dialog", name: "plugin.updater.npm.dialog",
class: "dialog-updater",
allowClose: false, allowClose: false,
modal: true, modal: true,
elements: [ elements: [