mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request +9273 from c9/smf 

Fix smf worker in built mode
pull/149/head
Fabian Jakobs 2015-09-11 14:18:37 +02:00
rodzic dfab097984 6d8ac4b5dd
commit f48a91e75b
1 zmienionych plików z 10 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
plugins/c9.static/build.js
Wyświetl plik

@ -237,7 +237,11 @@ function main(options, imports, register) {
if (module == "plugins/c9.ide.language/worker") {
// jsonalyzer is missing in built version of local
var jsonalyzer = require("../c9.ide.language.jsonalyzer/default_plugins");
var salesforce = require("lib/salesforce.language/__worker__");
var extraPackages = ["plugins/@smartface/smartface.language/loadInclude"];
try {
extraPackages = extraPackages.concat(require("lib/salesforce.language/__worker__"));
} catch(e) {}
// TODO find a saner method for managing files loaded in language worker
modules = [
"plugins/c9.ide.language/worker",
"plugins/c9.ide.language.generic/local_completer",
@ -262,8 +266,11 @@ function main(options, imports, register) {
"plugins/c9.ide.language.javascript.tern/worker/tern_worker",
"plugins/c9.ide.language.javascript.tern/worker/architect_resolver_worker",
"plugins/c9.ide.language.javascript.eslint/worker/eslint_worker",
].concat(jsonalyzer.handlersWorker).concat(salesforce).concat(jsonalyzer.helpersWorker);
}
]
.concat(jsonalyzer.handlersWorker)
.concat(jsonalyzer.helpersWorker)
.concat(extraPackages);
}
build(modules, {
cache: cache,