jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1015 from ajaxorg/build

Browse source 
fix build
This commit is contained in:
Mostafa Eweda 2012-10-21 12:11:57 -07:00
commit 9a08960ed0
41 changed files with 251 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

283
Makefile.dryice.js
View file

@ -4,7 +4,7 @@
*
* Copyright (c) 2010, Ajax.org B.V.
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@ -15,7 +15,7 @@
* * Neither the name of Ajax.org B.V. nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@ -44,7 +44,7 @@ function main(args) {
return "-" + x;
return x;
});
if (args[2] && (args[2][0] != "-" || args[2].indexOf("h") != -1))
type = args[2];
@ -66,8 +66,7 @@ function main(args) {
} else if (type == "bm") {
bookmarklet();
} else if (type == "full") {
ace();
demo();
demo(ace());
bookmarklet();
}
}
@ -120,7 +119,7 @@ function ace() {
console.log('# ace ---------');
// uncompressed
buildAce({
var project = buildAce({
compress: false,
noconflict: false
});
@ -153,9 +152,16 @@ function ace() {
source: ACE_HOME + "/ChangeLog.txt",
dest: BUILD_DIR + "/ChangeLog.txt"
});
return project;
}
function demo() {
function demo(project) {
project = project || buildAce({
compress: false,
noconflict: false,
coreOnly: true
});
console.log('# kitchen sink ---------');
var version, ref;
@ -166,23 +172,26 @@ function demo() {
ref = "";
version = "";
}
var changeComments = function(data) {
return (data
.replace(/<!\-\-DEVEL[\d\D]*?DEVEL\-\->/g, "")
.replace(/PACKAGE\-\->|<!\-\-PACKAGE/g, "")
.replace(/\/\*DEVEL[\d\D]*?DEVEL\*\//g, "")
.replace(/PACKAGE\*\/|\/\*PACKAGE/g, "")
.replace("%version%", version)
.replace("%commit%", ref)
);
}
function changeComments(data) {
return (data
.replace(/<!\-\-DEVEL[\d\D]*?DEVEL\-\->/g, "")
.replace(/PACKAGE\-\->|<!\-\-PACKAGE/g, "")
.replace(/\/\*DEVEL[\d\D]*?DEVEL\*\//g, "")
.replace(/PACKAGE\*\/|\/\*PACKAGE/g, "")
.replace("%version%", version)
.replace("%commit%", ref)
);
};
function fixDocPaths(data) {
return data.replace(/"(demo|build)\//g, "\"");
}
copy({
source: ACE_HOME + "/kitchen-sink.html",
dest: BUILD_DIR + "/kitchen-sink.html",
filter: [changeComments, function(data) {
return data.replace(/"(demo|build)\//g, "\"");
}]
filter: [changeComments, fixDocPaths]
});
copy({
@ -199,22 +208,17 @@ function demo() {
});
var demo = copy.createDataObject();
project.assumeAllFilesLoaded();
copy({
source: ACE_HOME + "/demo/kitchen-sink/demo.js",
dest: demo,
filter: [changeComments, function(data) {
return data.replace(/"(demo|build)\//g, "\"");
}, function(data) {
return data.replace("define(", "define('kitchen-sink/demo',");
}]
});
copy({
source: ACE_HOME + "/lib/ace/split.js",
dest: demo,
filter: [changeComments, function(data) {
return data.replace("define(", "define('ace/split',");
}]
source: [{
project: cloneProject(project),
require: [ "kitchen-sink/demo" ]
}],
filter: getWriteFilters({filters:[fixDocPaths]}, "demo"),
dest: demo
});
copy({
source: demo,
dest: BUILD_DIR + "/kitchen-sink/demo.js",
@ -223,7 +227,57 @@ function demo() {
copyFileSync(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/kitchen-sink/logo.png");
}
function buildAce(options) {
function jsFileList(path, filter) {
path = ACE_HOME + "/" + path;
if (!filter)
filter = /_test/;
return fs.readdirSync(path).map(function(x) {
if (x.slice(-3) == ".js" && !filter.test(x))
return x.slice(0, -3);
}).filter(function(x){ return !!x });
}
function addSuffix(options) {
if (options.suffix == null) {
options.suffix = "";
if (options.compress)
options.suffix += "-min";
if (options.noconflict)
options.suffix += "-noconflict";
}
}
function getWriteFilters(options, projectType) {
var filters = [
copy.filter.moduleDefines,
removeUseStrict,
removeLicenceComments,
inlineTextModules
];
if (options.filters)
filters = filters.concat(options.filters);
if (projectType == "worker")
return filters;
if (options.noconflict)
filters.push(namespace(options.ns));
if (options.compress)
filters.push(copy.filter.uglifyjs);
if (options.exportModule && projectType == "main") {
if (options.noconflict)
filters.push(exportAce(options.ns, options.exportModule, options.ns));
else
filters.push(exportAce(options.ns, options.exportModule));
}
return filters;
}
var buildAce = function(options) {
var aceProject = {
roots: [ACE_HOME + '/lib', ACE_HOME + '/demo'],
textPluginPattern: /^ace\/requirejs\/text!/
@ -238,51 +292,22 @@ function buildAce(options) {
noconflict: false,
suffix: null,
name: "ace",
modes: fs.readdirSync(ACE_HOME + "/lib/ace/mode").map(function(x) {
if (x.slice(-3) == ".js" && !/_highlight_rules|_test|_worker|xml_util|_outdent|behaviour/.test(x))
return x.slice(0, -3);
}).filter(function(x) { return !!x; }),
themes: fs.readdirSync(ACE_HOME + "/lib/ace/theme").map(function(x){
return x.slice(-3) == ".js" && x.slice(0, -3);
}).filter(function(x){ return !!x; }),
modes: jsFileList("lib/ace/mode", /_highlight_rules|_test|_worker|xml_util|_outdent|behaviour/),
themes: jsFileList("lib/ace/theme"),
extensions: jsFileList("lib/ace/ext"),
workers: ["javascript", "coffee", "css", "json", "xquery"],
keybindings: ["vim", "emacs"]
};
for(var key in defaults)
if (!options.hasOwnProperty(key))
options[key] = defaults[key];
if (options.suffix == null) {
options.suffix = "";
if (options.compress)
options.suffix += "-min";
if (options.noconflict)
options.suffix += "-noconflict";
}
addSuffix(options);
if (!options.requires)
options.requires = [options.exportModule];
var filters = [
copy.filter.moduleDefines,
filterTextPlugin,
removeUseStrict,
removeLicenceCmments
];
if (options.noconflict) {
filters.push(namespace(options.ns));
if (options.exportModule)
var exportFilter = exportAce(options.ns, options.exportModule, options.ns);
} else if (options.exportModule) {
var exportFilter = exportAce(options.ns, options.exportModule);
}
if (options.compress)
filters.push(copy.filter.uglifyjs);
var targetDir = options.targetDir + options.suffix;
var name = options.name;
@ -300,10 +325,13 @@ function buildAce(options) {
filter: [ copy.filter.moduleDefines ],
dest: ace
});
if (options.coreOnly)
return project;
copy({
source: ace,
filter: exportFilter ? filters.concat(exportFilter) : filters,
filter: getWriteFilters(options, "main"),
dest: targetDir + '/' + name + ".js"
});
@ -317,7 +345,7 @@ function buildAce(options) {
project: cloneProject(project),
require: [ 'ace/mode/' + mode ]
}],
filter: filters,
filter: getWriteFilters(options, "mode"),
dest: targetDir + "/mode-" + mode + ".js"
});
});
@ -327,26 +355,29 @@ function buildAce(options) {
project.assumeAllFilesLoaded();
options.themes.forEach(function(theme) {
console.log("theme " + theme);
/*copy({
copy({
source: [{
project: cloneProject(project),
require: ["ace/theme/" + theme]
}],
filter: filters,
dest: targetDir + "/theme-" + theme + ".js"
});*/
// use this instead, to not create separate modules for js and css
var themePath = ACE_HOME + "/lib/ace/theme/" + theme
var js = fs.readFileSync(themePath + ".js", "utf8");
js = js.replace("define(", "define('ace/theme/" + theme + "', ['require', 'exports', 'module', 'ace/lib/dom'], ");
if (fs.existsSync(themePath + ".css", "utf8")) {
var css = fs.readFileSync(themePath + ".css", "utf8")
js = js.replace(/require\(.ace\/requirejs\/text!.*?\)/, quoteString(css))
}
filters.forEach(function(f) {js = f(js); });
fs.writeFileSync(targetDir + "/theme-" + theme + ".js", js);
filter: getWriteFilters(options, "theme"),
dest: targetDir + "/theme-" + theme.replace("_theme", "") + ".js"
});
});
console.log('# ace extensions ---------');
project.assumeAllFilesLoaded();
options.extensions.forEach(function(ext) {
console.log("extensions " + ext);
copy({
source: [{
project: cloneProject(project),
require: [ 'ace/ext/' + ext ]
}],
filter: getWriteFilters(options, "ext"),
dest: targetDir + "/ext-" + ext + ".js"
});
});
console.log('# ace key bindings ---------');
@ -359,19 +390,12 @@ function buildAce(options) {
project: cloneProject(project),
require: [ 'ace/keyboard/' + keybinding ]
}],
filter: filters,
filter: getWriteFilters(options, "keybinding"),
dest: targetDir + "/keybinding-" + keybinding + ".js"
});
});
console.log('# ace worker ---------');
filters = [
copy.filter.moduleDefines,
filterTextPlugin,
removeUseStrict,
removeLicenceCmments
];
options.workers.forEach(function(mode) {
console.log("worker for " + mode + " mode");
@ -390,7 +414,7 @@ function buildAce(options) {
'ace/mode/' + mode + '_worker'
]
}],
filter: filters,
filter: getWriteFilters(options, "worker"),
dest: worker
});
copy({
@ -404,14 +428,70 @@ function buildAce(options) {
});
console.log('# combining files into one ---------');
if (options.shrinkwrap) {
console.log('# combining files into one ---------');
copy({
source: { root:targetDir, exclude:/^worker\-/ },
dest: BUILD_DIR + '/ace-min.js'
});
}
return project;
};
// silence annoying messages from dryice
var buildAce = function(fn) {
return function() {
var log = console.log
console.log = function() {
if (typeof arguments[0] == "string" && /Ignoring requirement/.test(arguments[0]))
return;
log.apply(console, arguments);
}
var ret = fn.apply(null, arguments);
console.log = log;
return ret;
}
}(buildAce);
var textModules = {}
var detectTextModules = function(input, source) {
if (!source)
throw new Error('Missing filename for text module');
if (typeof input !== 'string')
input = input.toString();
var module = source.isLocation ? source.path : source;
input = input.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
input = input.replace(/\n\s+/g, "\n");
input = '"' + input.replace(/\n/g, '\\\n') + '"';
textModules[module] = input;
return "";
};
detectTextModules.onRead = true;
copy.filter.addDefines = detectTextModules;
function inlineTextModules(text) {
var lastDep = "";
return text.replace(/, *['"]ace\/requirejs\/text!(.*?)['"]|= *require\(['"](?:ace|[.\/]+)\/requirejs\/text!(.*?)['"]\)/g, function(_, dep, call) {
if (dep) {
if (!lastDep) {
lastDep = dep;
return "";
}
} else if (call) {
call = textModules[lastDep];
delete textModules[lastDep];
lastDep = "";
if (call)
return "= " + call;
}
console.log(dep, lastDep, call);
throw "inlining of multiple text modules is not supported";
});
}
// TODO: replace with project.clone once it is fixed in dryice
@ -432,6 +512,7 @@ function cloneProject(project) {
return clone;
}
function copyFileSync(srcFile, destFile) {
var BUF_LENGTH = 64*1024,
buf = new Buffer(BUF_LENGTH),
@ -458,16 +539,12 @@ function quoteString(str) {
return '"' + str.replace(/\\/, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\\n") + '"';
}
function filterTextPlugin(text) {
return text.replace(/(['"])ace\/requirejs\/text\!/g, "$1text!");
}
function removeUseStrict(text) {
return text.replace(/['"]use strict['"];/g, "");
}
function removeLicenceCmments(text) {
return text.replace(/(;)\s*\/\*[\d\D]*?\*\//g, "$1");
function removeLicenceComments(text) {
return text.replace(/(?:(;)|\n)\s*\/\*[\d\D]*?\*\/|\n\s*\/\/.*/g, "$1");
}
function namespace(ns) {

49
install.js
View file

@ -33,27 +33,36 @@
* ***** END LICENSE BLOCK ***** */
var buildAce = require("./Makefile.dryice").buildAce;
var fs = require("fs");
var ACE_HOME = __dirname;
try {
var aceProject = {
roots: [
ACE_HOME + '/lib',
ACE_HOME + '/demo'
],
textPluginPattern: /^ace\/requirejs\/text!/
};
buildAce(aceProject, {
compress: false,
noconflict: false,
suffix: "",
compat: true,
name: "ace"
});
} catch (e) {
console.log("--- Ace Build error ---");
console.log(e);
process.exit(0);
function getVersion(path) {
if (fs.existsSync(path + "/.git-ref"))
return fs.readFileSync(path + "/.git-ref", "utf8");
if (fs.existsSync(path + "/.git/ORIG_HEAD"))
return fs.readFileSync(path + "/.git/ORIG_HEAD", "utf8");
}
if (process.argv.indexOf("-c") > 0) try {
var version = getVersion(ACE_HOME);
var oldVersion = getVersion(ACE_HOME + "/build");
if (version && oldVersion == version) {
console.log("ace build is up to date");
process.exit(0);
}
fs.writeFileSync(ACE_HOME + "/build/.git-ref", version, "utf8");
} catch (e) {}
try {
buildAce({
compress: false,
noconflict: false,
suffix: "",
name: "ace"
});
} catch (e) {
console.log("--- Ace Build error ---");
console.log(e);
process.exit(0);
}

2
lib/ace/ace.js
View file

@ -53,8 +53,8 @@ var MultiSelect = require("./multi_select").MultiSelect;
// The following require()s are for inclusion in the built ace file
require("./worker/worker_client");
require("./keyboard/hash_handler");
require("./keyboard/state_handler");
require("./placeholder");
require("./mode/folding/fold_mode");
exports.config = require("./config");
/**
* Ace.edit(el) -> Editor

2
lib/ace/ext/textarea.js
View file

@ -36,7 +36,7 @@ var UA = require("../lib/useragent");
var net = require("../lib/net");
var ace = require("../ace");
require("ace/theme/textmate");
require("../theme/textmate");
module.exports = exports = ace;

4
lib/ace/keyboard/vim/maps/motions.js
View file

@ -127,7 +127,7 @@ var StringStream = function(editor, cursor) {
};
};
var Search = require("ace/search").Search;
var Search = require("../../../search").Search;
var search = new Search();
function find(editor, needle, dir) {
@ -136,7 +136,7 @@ function find(editor, needle, dir) {
return search.find(editor.session);
}
var Range = require("ace/range").Range;
var Range = require("../../../range").Range;
module.exports = {
"w": new Motion(function(editor) {

4
lib/ace/mode/jade.js
View file

@ -40,8 +40,8 @@ var oop = require("../lib/oop");
var TextMode = require("./text").Mode;
var Tokenizer = require("../tokenizer").Tokenizer;
var JadeHighlightRules = require("./jade_highlight_rules").JadeHighlightRules;
// var JavascriptMode = require("ace/mode/javascript").Mode;
// var CssMode = require("ace/mode/css").Mode;
// var JavascriptMode = require("../mode/javascript").Mode;
// var CssMode = require("../mode/css").Mode;
var Mode = function() {
var highlighter = new JadeHighlightRules();

2
lib/ace/placeholder.js
View file

@ -30,7 +30,7 @@
define(function(require, exports, module) {
"use strict";
var Range = require('./range').Range;
var Range = require("./range").Range;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var oop = require("./lib/oop");

4
lib/ace/placeholder_test.js
View file

@ -41,8 +41,8 @@ var Editor = require("./editor").Editor;
var MockRenderer = require("./test/mockrenderer").MockRenderer;
var assert = require("./test/assertions");
var JavaScriptMode = require("./mode/javascript").Mode;
var PlaceHolder = require('./placeholder').PlaceHolder;
var UndoManager = require('./undomanager').UndoManager;
var PlaceHolder = require("./placeholder").PlaceHolder;
var UndoManager = require("./undomanager").UndoManager;
module.exports = {

2
lib/ace/requirejs/text.js
View file

@ -44,7 +44,7 @@ define(function (require, exports, module) {
if (globalRequire && globalRequire.nodeRequire)
onLoad(globalRequire.nodeRequire('fs').readFileSync(req.toUrl(name), 'utf8'));
else
require("ace/lib/net").get(req.toUrl(name), onLoad);
require("../lib/net").get(req.toUrl(name), onLoad);
};
});

2
lib/ace/theme/ambiance.js
View file

@ -25,7 +25,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-ambiance";
exports.cssText = require("ace/requirejs/text!./ambiance.css");
exports.cssText = require("../requirejs/text!./ambiance.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/chrome.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-chrome";
exports.cssText = require('ace/requirejs/text!./chrome.css');
exports.cssText = require("../requirejs/text!./chrome.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/clouds.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-clouds";
exports.cssText = require('ace/requirejs/text!./clouds.css');
exports.cssText = require("../requirejs/text!./clouds.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/clouds_midnight.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-clouds-midnight";
exports.cssText = require('ace/requirejs/text!./clouds_midnight.css');
exports.cssText = require("../requirejs/text!./clouds_midnight.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/cobalt.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-cobalt";
exports.cssText = require('ace/requirejs/text!./cobalt.css');
exports.cssText = require("../requirejs/text!./cobalt.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/crimson_editor.js
View file

@ -30,7 +30,7 @@
define(function(require, exports, module) {
exports.isDark = false;
exports.cssText = require('ace/requirejs/text!./crimson_editor.css');
exports.cssText = require("../requirejs/text!./crimson_editor.css");
exports.cssClass = "ace-crimson-editor";

2
lib/ace/theme/dawn.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-dawn";
exports.cssText = require('ace/requirejs/text!./dawn.css');
exports.cssText = require("../requirejs/text!./dawn.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/dreamweaver.js
View file

@ -31,7 +31,7 @@
define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-dreamweaver";
exports.cssText = require('ace/requirejs/text!./dreamweaver.css');
exports.cssText = require("../requirejs/text!./dreamweaver.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/eclipse.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
"use strict";
exports.isDark = false;
exports.cssText = require('ace/requirejs/text!./eclipse.css');
exports.cssText = require("../requirejs/text!./eclipse.css");
exports.cssClass = "ace-eclipse";

2
lib/ace/theme/github.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-github";
exports.cssText = require('ace/requirejs/text!./github.css');
exports.cssText = require("../requirejs/text!./github.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/idle_fingers.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-idle-fingers";
exports.cssText = require('ace/requirejs/text!./idle_fingers.css');
exports.cssText = require("../requirejs/text!./idle_fingers.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/kr_theme.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-kr-theme";
exports.cssText = require('ace/requirejs/text!./kr_theme.css');
exports.cssText = require("../requirejs/text!./kr_theme.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/merbivore.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-merbivore";
exports.cssText = require('ace/requirejs/text!./merbivore.css');
exports.cssText = require("../requirejs/text!./merbivore.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/merbivore_soft.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-merbivore-soft";
exports.cssText = require('ace/requirejs/text!./merbivore_soft.css');
exports.cssText = require("../requirejs/text!./merbivore_soft.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/mono_industrial.css
View file

@ -135,4 +135,4 @@
.ace-mono-industrial .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y
}
}

2
lib/ace/theme/mono_industrial.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-mono-industrial";
exports.cssText = require('ace/requirejs/text!./mono_industrial.css');
exports.cssText = require("../requirejs/text!./mono_industrial.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/monokai.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-monokai";
exports.cssText = require('ace/requirejs/text!./monokai.css');
exports.cssText = require("../requirejs/text!./monokai.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/pastel_on_dark.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-pastel-on-dark";
exports.cssText = require('ace/requirejs/text!./pastel_on_dark.css');
exports.cssText = require("../requirejs/text!./pastel_on_dark.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/solarized_dark.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-solarized-dark";
exports.cssText = require('ace/requirejs/text!./solarized_dark.css');
exports.cssText = require("../requirejs/text!./solarized_dark.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/solarized_light.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-solarized-light";
exports.cssText = require('ace/requirejs/text!./solarized_light.css');
exports.cssText = require("../requirejs/text!./solarized_light.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/textmate.js
View file

@ -33,7 +33,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-tm";
exports.cssText = require('ace/requirejs/text!./textmate.css');
exports.cssText = require("../requirejs/text!./textmate.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/tomorrow.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-tomorrow";
exports.cssText = require('ace/requirejs/text!./tomorrow.css');
exports.cssText = require("../requirejs/text!./tomorrow.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/tomorrow_night.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-tomorrow-night";
exports.cssText = require('ace/requirejs/text!./tomorrow_night.css');
exports.cssText = require("../requirejs/text!./tomorrow_night.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/tomorrow_night_blue.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-tomorrow-night-blue";
exports.cssText = require('ace/requirejs/text!./tomorrow_night_blue.css');
exports.cssText = require("../requirejs/text!./tomorrow_night_blue.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/tomorrow_night_bright.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-tomorrow-night-bright";
exports.cssText = require('ace/requirejs/text!./tomorrow_night_bright.css');
exports.cssText = require("../requirejs/text!./tomorrow_night_bright.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/tomorrow_night_eighties.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-tomorrow-night-eighties";
exports.cssText = require('ace/requirejs/text!./tomorrow_night_eighties.css');
exports.cssText = require("../requirejs/text!./tomorrow_night_eighties.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/twilight.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-twilight";
exports.cssText = require('ace/requirejs/text!./twilight.css');
exports.cssText = require("../requirejs/text!./twilight.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/vibrant_ink.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = true;
exports.cssClass = "ace-vibrant-ink";
exports.cssText = require('ace/requirejs/text!./vibrant_ink.css');
exports.cssText = require("../requirejs/text!./vibrant_ink.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/theme/xcode.js
View file

@ -32,7 +32,7 @@ define(function(require, exports, module) {
exports.isDark = false;
exports.cssClass = "ace-xcode";
exports.cssText = require('ace/requirejs/text!./xcode.css');
exports.cssText = require("../requirejs/text!./xcode.css");
var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);

2
lib/ace/virtual_renderer.js
View file

@ -44,7 +44,7 @@ var CursorLayer = require("./layer/cursor").Cursor;
var ScrollBar = require("./scrollbar").ScrollBar;
var RenderLoop = require("./renderloop").RenderLoop;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var editorCss = require("ace/requirejs/text!./css/editor.css");
var editorCss = require("./requirejs/text!./css/editor.css");
dom.importCssString(editorCss, "ace_editor");

2
package.json
View file

@ -29,7 +29,7 @@
},
"scripts": {
"test": "node lib/ace/test/all.js",
"postinstall": "node ./install.js"
"postinstall": "node ./install.js -c"
},
"config": {
"github.com/sourcemint/bundler-js/0/-meta/config/0": {

2
tool/tmtheme.js
View file

@ -278,7 +278,7 @@ function convertTheme(name) {
var js = fillTemplate(jsTemplate, {
name: name,
css: "require('ace/requirejs/text!./" + name + ".css')", // quoteString(css), //
css: 'require("../requirejs/text!./' + name + '.css")', // quoteString(css), //
cssClass: "ace-" + hyphenate(name),
isDark: styles.isDark
});