Wed Feb 7 05:02:52 CET 2018

This commit is contained in:
c9jenkinsv3 2018-02-07 05:02:52 +01:00
parent e320385dac
commit dc7fba2ec1
25 changed files with 1517 additions and 478 deletions

File diff suppressed because it is too large Load Diff

View File

@ -2915,7 +2915,7 @@ body .error_widget_arrow.ace_ok {
z-index: 100001;
}
.thingy-popup > .close {
background-image: url("/static/plugins/c9.ide.guide/images/close_tab_btn_flat_light@2x.png");
background-image: url("/static/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@2x.png");
background-size: 42px 28px;
position: absolute;
right: 20px;

View File

@ -2915,7 +2915,7 @@ body .error_widget_arrow.ace_ok {
z-index: 100001;
}
.thingy-popup > .close {
background-image: url("/static/plugins/c9.ide.guide/images/close_tab_btn_flat_light@2x.png");
background-image: url("/static/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@2x.png");
background-size: 42px 28px;
position: absolute;
right: 20px;

View File

@ -2844,7 +2844,7 @@ body .error_widget_arrow.ace_ok {
z-index: 100001;
}
.thingy-popup > .close {
background-image: url("/static/plugins/c9.ide.guide/images/close_tab_btn_flat_light@2x.png");
background-image: url("/static/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@2x.png");
background-size: 42px 28px;
position: absolute;
right: 20px;

View File

@ -2844,7 +2844,7 @@ body .error_widget_arrow.ace_ok {
z-index: 100001;
}
.thingy-popup > .close {
background-image: url("/static/plugins/c9.ide.guide/images/close_tab_btn_flat_light@2x.png");
background-image: url("/static/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@2x.png");
background-size: 42px 28px;
position: absolute;
right: 20px;

View File

@ -2915,7 +2915,7 @@ body .error_widget_arrow.ace_ok {
z-index: 100001;
}
.thingy-popup > .close {
background-image: url("/static/plugins/c9.ide.guide/images/close_tab_btn_flat_light@2x.png");
background-image: url("/static/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@2x.png");
background-size: 42px 28px;
position: absolute;
right: 20px;

View File

@ -2915,7 +2915,7 @@ body .error_widget_arrow.ace_ok {
z-index: 100001;
}
.thingy-popup > .close {
background-image: url("/static/plugins/c9.ide.guide/images/close_tab_btn_flat_light@2x.png");
background-image: url("/static/plugins/c9.ide.layout.classic/images/close_tab_btn_flat_light@2x.png");
background-size: 42px 28px;
position: absolute;
right: 20px;

View File

@ -1,5 +1,18 @@
{
"cmd": ["bash", "--login", "-c", "nvm use default > /dev/null; node ${debug?--nocrankshaft --nolazy --nodead_code_elimination --debug-brk=15454} '$file' $args"],
"script": [
"set -e",
"if ! [ \"$debug\" == true ]; then ",
" node $file $args",
"elif node --debug -e '' &> /dev/null; then",
" FLAGS=\"--nocrankshaft --nolazy --debug-brk=$debugport\"",
" if node --nodead_code_elimination -e '' &> /dev/null; then",
" FLAGS=\"$FLAGS --nodead_code_elimination\"",
" fi",
" node $FLAGS $file $args",
"else",
" node --inspect-brk=$debugport $file $args",
"fi"
],
"debugger": "v8",
"debugport": 15454,
"selector": "source.js",

View File

@ -1,12 +1,17 @@
{
"cmd": [
"node",
"${debug?--nocrankshaft}",
"${debug?--nolazy}",
"${debug?`node --version | grep -vqE \"v0\\..\\.\" && echo --nodead_code_elimination`}",
"${debug?--debug-brk=$debugport}",
"$file",
"$args"
"script": [
"set -e",
"if ! [ \"$debug\" == true ]; then ",
" node $file $args",
"elif node --debug -e '' &> /dev/null; then",
" FLAGS=\"--nocrankshaft --nolazy --debug-brk=$debugport\"",
" if node --nodead_code_elimination -e '' &> /dev/null; then",
" FLAGS=\"$FLAGS --nodead_code_elimination\"",
" fi",
" node $FLAGS $file $args",
"else",
" node --inspect-brk=$debugport $file $args",
"fi"
],
"debugger": "v8",
"debugport": 15454,

View File

@ -91,7 +91,6 @@ module.exports = function(options) {
"plugins/c9.ide.plugins/gui",
// {
// packagePath: "plugins/c9.ide.plugins/test",
// staticPrefix: staticPrefix + "/plugins/c9.ide.plugins"
// },
// VFS
@ -164,7 +163,6 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.openfiles/openfiles",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
defaultShow: options.local
},
{
@ -177,21 +175,14 @@ module.exports = function(options) {
"plugins/c9.ide.keys/editor",
{
packagePath: "plugins/c9.ide.ace/ace",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
workerPrefix: options.workerPrefix
},
"plugins/c9.ide.ace/themes",
"plugins/c9.ide.ace.stripws/stripws",
"plugins/c9.ide.ace.repl/editor",
// "plugins/c9.ide.ace.split/split",
{
packagePath: "plugins/c9.ide.ace.gotoline/gotoline",
staticPrefix: staticPrefix + "/plugins/c9.ide.ace.gotoline"
},
{
packagePath: "plugins/c9.ide.ace.statusbar/statusbar",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
"plugins/c9.ide.ace.gotoline/gotoline",
"plugins/c9.ide.ace.statusbar/statusbar",
"plugins/c9.ide.ace.keymaps/keymaps",
"plugins/c9.ide.ace.keymaps/cli",
@ -212,10 +203,7 @@ module.exports = function(options) {
node: options.nodeBin,
local: options.local,
},
{
packagePath: "plugins/c9.ide.find.infiles/findinfiles",
staticPrefix: staticPrefix + "/plugins/c9.ide.find.infiles"
},
"plugins/c9.ide.find.infiles/findinfiles",
{
packagePath: "plugins/c9.ide.find.replace/findreplace",
staticPrefix: staticPrefix + "/plugins/c9.ide.find.replace"
@ -224,7 +212,6 @@ module.exports = function(options) {
// UI
{
packagePath: "plugins/c9.ide.ui/ui",
staticPrefix: staticPrefix + "/plugins/c9.ide.ui"
},
"plugins/c9.ide.ui/anims",
"plugins/c9.ide.ui/tooltip",
@ -233,10 +220,7 @@ module.exports = function(options) {
autoInit: !options.local
},
"plugins/c9.ide.ui/forms",
{
packagePath: "plugins/c9.ide.ui/widgets.list",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
"plugins/c9.ide.ui/widgets.list",
"plugins/c9.ide.ui/widgets.tree",
"plugins/c9.ide.ui/widgets.datagrid",
"plugins/c9.ide.ui/widgets.terminal",
@ -255,11 +239,9 @@ module.exports = function(options) {
"plugins/c9.ide.dialog.common/upsell",
{
packagePath: "plugins/c9.ide.dialog.common/error",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
{
packagePath: "plugins/c9.ide.dialog.common/notification",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
{
packagePath: "plugins/c9.ide.dialog.login/login",
@ -413,7 +395,6 @@ module.exports = function(options) {
{
packagePath: "plugins/c9.ide.run/run",
base: workspaceDir,
staticPrefix: staticPrefix + "/plugins/c9.ide.run",
tmux: options.tmux,
runners: runners,
installPath: options.correctedInstallPath,
@ -421,7 +402,6 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.run/gui",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
defaultConfigs: {}
},
{
@ -435,7 +415,6 @@ module.exports = function(options) {
// "plugins/c9.ide.run.debug/debuggers/sourcemap",
{
packagePath: "plugins/c9.ide.run.debug/debuggers/debugger",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
{
packagePath: "plugins/c9.ide.run.debug/debuggers/v8/v8debugger",
@ -450,7 +429,6 @@ module.exports = function(options) {
"plugins/c9.ide.run.debug/callstack",
{
packagePath: "plugins/c9.ide.immediate/immediate",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
"plugins/c9.ide.immediate/evaluator",
"plugins/c9.ide.immediate/evaluators/browserjs",
@ -471,7 +449,6 @@ module.exports = function(options) {
root: workspaceDir,
tmpdir: options.tmpdir,
shell: options.shell || "",
staticPrefix: staticPrefix + "/plugins/c9.ide.terminal",
installPath: options.correctedInstallPath
},
{
@ -487,18 +464,15 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.terminal.monitor/message_view",
staticPrefix: options.staticPrefix + "/plugins/c9.ide.layout.classic"
},
"plugins/c9.ide.terminal/opentermhere",
{
packagePath: "plugins/c9.ide.run/output",
staticPrefix: options.staticPrefix + "/plugins/c9.ide.layout.classic",
tmux: options.tmux,
basePath: workspaceDir
},
{
packagePath: "plugins/c9.ide.console/console",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
defaultState: options.project.scmurl ? {
type: "pane",
nodes: [{
@ -560,7 +534,6 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.upload/upload",
staticPrefix: staticPrefix + "/plugins/c9.ide.upload"
},
{
packagePath: "plugins/c9.ide.upload/upload_manager",
@ -568,7 +541,6 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.upload/upload_progress",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
{
packagePath: "plugins/c9.ide.navigate/navigate",
@ -579,11 +551,9 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.language.core/outline",
staticPrefix: staticPrefix + "/plugins/c9.ide.language"
},
{
packagePath: "plugins/c9.ide.panels/panels",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
defaultActiveLeft: "tree"
},
"plugins/c9.ide.panels/panel",
@ -591,10 +561,7 @@ module.exports = function(options) {
"plugins/c9.ide.processlist/processlist",
// Installer
{
packagePath: "plugins/c9.ide.installer/gui",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
},
"plugins/c9.ide.installer/gui",
"plugins/c9.automate/automate",
"plugins/c9.ide.installer/commands/centos",
"plugins/c9.ide.installer/commands/darwin",
@ -621,7 +588,6 @@ module.exports = function(options) {
// Previewer
{
packagePath: "plugins/c9.ide.preview/preview",
staticPrefix: staticPrefix + "/plugins/c9.ide.preview",
defaultPreviewer: "preview.browser",
previewUrl: options.previewUrl,
local: options.local
@ -682,7 +648,6 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.welcome/welcome",
staticPrefix: staticPrefix + "/plugins/c9.ide.welcome",
intro: "Welcome to Cloud9. Use this welcome screen "
+ "to tweak the look & feel of the Cloud9 user interface. ",
checkOS: true
@ -697,12 +662,10 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.help/help",
staticPrefix: staticPrefix + "/plugins/c9.ide.help",
hosted: hosted
},
{
packagePath: "plugins/c9.ide.guide/guide",
staticPrefix: staticPrefix + "/plugins/c9.ide.guide"
},
{
packagePath: "plugins/c9.ide.guide/default"
@ -726,15 +689,12 @@ module.exports = function(options) {
"plugins/c9.ide.behaviors/tabs",
// {
// packagePath: "plugins/c9.ide.behaviors/dashboard",
// staticPrefix : staticPrefix + "/plugins/c9.ide.behaviors"
// },
{
packagePath: "plugins/c9.ide.behaviors/page",
staticPrefix: staticPrefix + "/plugins/c9.ide.behaviors"
},
{
packagePath: "plugins/c9.ide.preferences/preferences",
staticPrefix: staticPrefix + "/plugins/c9.ide.preferences"
},
"plugins/c9.ide.preferences/preferencepanel",
{
@ -750,7 +710,6 @@ module.exports = function(options) {
"plugins/c9.ide.preferences/experimental",
{
packagePath: "plugins/c9.ide.login/login",
staticPrefix: staticPrefix + "/plugins/c9.ide.login",
ideBaseUrl: options.ideBaseUrl,
dashboardUrl: options.dashboardUrl,
accountUrl: options.accountUrl,
@ -761,7 +720,6 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.collab/notifications/bubble",
staticPrefix: staticPrefix + "/plugins/c9.ide.collab/notifications"
},
"plugins/c9.ide.behaviors/zentabs",
@ -773,7 +731,6 @@ module.exports = function(options) {
"plugins/c9.ide.test/testrunner",
{
packagePath: "plugins/c9.ide.test/all",
staticPrefix: staticPrefix + "/plugins/c9.ide.test"
},
"plugins/c9.ide.test/results",
"plugins/c9.ide.test/coverage",
@ -784,7 +741,6 @@ module.exports = function(options) {
// git integration v2
// {
// packagePath: "plugins/c9.ide.scm/scm.commit",
// staticPrefix: staticPrefix + "/plugins/c9.ide.scm"
// },
// "plugins/c9.ide.scm/scm",
// "plugins/c9.ide.scm/scm.branches",
@ -861,12 +817,10 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.collab/cursor_layer",
staticPrefix: staticPrefix + "/plugins/c9.ide.collab"
},
"plugins/c9.ide.collab/author_layer",
{
packagePath: "plugins/c9.ide.collab/timeslider/timeslider",
staticPrefix: staticPrefix + "/plugins/c9.ide.collab/timeslider"
},
// Collab panels
{
@ -882,7 +836,6 @@ module.exports = function(options) {
},
{
packagePath: "plugins/c9.ide.collab/members/members",
staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
},
{
packagePath: "plugins/c9.ide.collab/chat/chat",

View File

@ -36,7 +36,7 @@
"homepage": "https://github.com/isaacs/inherits#readme",
"_id": "inherits@2.0.3",
"_shasum": "633c2c83e3da42a502f52466022480f4208261de",
"_from": "inherits@>=2.0.0 <3.0.0",
"_from": "inherits@>=2.0.1 <2.1.0",
"_npmVersion": "3.10.7",
"_nodeVersion": "6.5.0",
"_npmUser": {

View File

@ -248,7 +248,7 @@
},
"homepage": "https://github.com/ternjs/tern#readme",
"_id": "tern@0.16.1",
"_shasum": "4ca130c0ce663fee9add61de32be700cfede4d07",
"_shasum": "2214c041bc8f4cda10887f5056b38a716cd8bf2f",
"_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
"_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e"
}

View File

@ -20,7 +20,7 @@
"readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n",
"readmeFilename": "README.md",
"_id": "tern_from_ts@0.0.1",
"_shasum": "f0553eb889a809d4bdd920acf43f78259245c70c",
"_shasum": "4980859cce428ad97c2dd6463b9d906be6c9da84",
"_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c",
"_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c"
}

View File

@ -386,6 +386,15 @@ function rewriteDefines(sources, opts){
+ source
+ '");';
}
else if (pkg.id.indexOf("vfs!") > -1) {
pkg.source = 'define("' + pkg.id + '",[],' + function(require, exports,module) {
var path = module.id.slice(4);
return {
srcUrl: requirejs.MODULE_LOAD_URL + "/~node/" + path,
path: path,
};
} + ');';
}
else {
var deps = [];
if (keepDeps) {

View File

@ -1,6 +1,6 @@
(function() {
var MODULE_LOAD_URL = "/load/module";
var MODULE_LOAD_URL = "/static/build/modules";
var global = (function() { return this; })();
if (!global && typeof window != "undefined") global = window; // can happen in strict mode
@ -632,6 +632,17 @@ function definePlugin(plugin, p) {
}
/*** plugins ***/
require["vfs!"] = function(module, callback) {
var url = require.MODULE_LOAD_URL + "/~node/" + module;
if (define.fetchedUrls[url] & 3)
return false;
define.fetchedUrls[url] |= 3;
define("vfs!" + module, [], {
srcUrl: url,
path: module
});
callback();
};
require["text!"] = function(module, callback) {
var url = require.toUrl(module);
if (define.fetchedUrls[url] & 2)

View File

@ -75,11 +75,15 @@ module.exports = function(mains, opts) {
function idToPathNode(mod) {
var packagePath = mod.id;
var filepath = mod.parent && mod.parent.file || root;
return Module._resolveFilename(packagePath, {
paths: Module._nodeModulePaths(filepath),
filename: filepath,
id: filepath,
});
try {
return Module._resolveFilename(packagePath, {
paths: Module._nodeModulePaths(filepath),
filename: filepath,
id: filepath,
});
} catch (e) {
return packagePath;
}
}
function readModule(mod, cb) {
@ -448,7 +452,7 @@ function debugSrc(module) {
function quote(str) {
return "'"
+ str.replace(/[\\']/g, "\\$&").replace(/\n/g, "\\n")
+ str.replace(/[\\']/g, "\\$&").replace(/\n/g, "\\n\\\n")
+ "'";
}

2
node_modules/nak/package.json generated vendored
View File

@ -52,7 +52,7 @@
},
"homepage": "https://github.com/gjtorikian/nak#readme",
"_id": "nak@0.3.3",
"_shasum": "27ac2a29ae9b3a471056f7368730d4c51dae49de",
"_shasum": "57863f70104cbf7b7eaef2b83495da9d00075d5c",
"_from": "git+https://github.com/cloud9ide/nak.git#6deef931594",
"_resolved": "git+https://github.com/cloud9ide/nak.git#6deef931594787edd167040f7352e3e7533430e4"
}

View File

@ -36,7 +36,7 @@
"homepage": "https://github.com/isaacs/inherits#readme",
"_id": "inherits@2.0.3",
"_shasum": "633c2c83e3da42a502f52466022480f4208261de",
"_from": "inherits@>=2.0.0 <3.0.0",
"_from": "inherits@>=2.0.1 <2.1.0",
"_npmVersion": "3.10.7",
"_nodeVersion": "6.5.0",
"_npmUser": {

2
node_modules/tern/package.json generated vendored
View File

@ -248,7 +248,7 @@
},
"homepage": "https://github.com/ternjs/tern#readme",
"_id": "tern@0.16.1",
"_shasum": "4ca130c0ce663fee9add61de32be700cfede4d07",
"_shasum": "2214c041bc8f4cda10887f5056b38a716cd8bf2f",
"_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
"_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e"
}

View File

@ -20,7 +20,7 @@
"readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n",
"readmeFilename": "README.md",
"_id": "tern_from_ts@0.0.1",
"_shasum": "f0553eb889a809d4bdd920acf43f78259245c70c",
"_shasum": "4980859cce428ad97c2dd6463b9d906be6c9da84",
"_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c",
"_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c"
}

View File

@ -49,5 +49,5 @@
},
"devDependencies": {},
"licenses": [],
"revision": "7ba90a03a5584e431261fa8006e87d29532878b7"
"revision": "2eab9c795751a21e2da1d00c968b89f040278dec"
}

View File

@ -1,5 +1,18 @@
{
"cmd": ["bash", "--login", "-c", "nvm use default > /dev/null; node ${debug?--nocrankshaft --nolazy --nodead_code_elimination --debug-brk=15454} '$file' $args"],
"script": [
"set -e",
"if ! [ \"$debug\" == true ]; then ",
" node $file $args",
"elif node --debug -e '' &> /dev/null; then",
" FLAGS=\"--nocrankshaft --nolazy --debug-brk=$debugport\"",
" if node --nodead_code_elimination -e '' &> /dev/null; then",
" FLAGS=\"$FLAGS --nodead_code_elimination\"",
" fi",
" node $FLAGS $file $args",
"else",
" node --inspect-brk=$debugport $file $args",
"fi"
],
"debugger": "v8",
"debugport": 15454,
"selector": "source.js",

View File

@ -1,12 +1,17 @@
{
"cmd": [
"node",
"${debug?--nocrankshaft}",
"${debug?--nolazy}",
"${debug?`node --version | grep -vqE \"v0\\..\\.\" && echo --nodead_code_elimination`}",
"${debug?--debug-brk=$debugport}",
"$file",
"$args"
"script": [
"set -e",
"if ! [ \"$debug\" == true ]; then ",
" node $file $args",
"elif node --debug -e '' &> /dev/null; then",
" FLAGS=\"--nocrankshaft --nolazy --debug-brk=$debugport\"",
" if node --nodead_code_elimination -e '' &> /dev/null; then",
" FLAGS=\"$FLAGS --nodead_code_elimination\"",
" fi",
" node $FLAGS $file $args",
"else",
" node --inspect-brk=$debugport $file $args",
"fi"
],
"debugger": "v8",
"debugport": 15454,

View File

@ -203,7 +203,14 @@ function main(options, imports, register) {
if (/^(ace\/|plugins\/c9.ide.ace)/.test(module))
return buildAce(module, pathConfig, callback);
build([], {
var compileForNode = false;
if (/^~node\//.test(module)) {
module = module.substring(6);
compileForNode = true;
}
build(compileForNode ? [module] : [], {
node: compileForNode,
cache: cache,
pathConfig: pathConfig,
enableBrowser: true,
@ -212,11 +219,11 @@ function main(options, imports, register) {
compress: compress,
filter: [],
ignore: [],
additional: [{
additional: compileForNode && [{
id: module,
noDeps: true
}],
withRequire: false,
withRequire: compileForNode,
basepath: pathConfig.root
}, callback);
}

View File

@ -1 +1 @@
1517889708
1517976168