update jshint again
This commit is contained in:
nightwing
parent
e5714c9dba
commit
14d540ddc7
3 changed files with 2346 additions and 2098 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
/** vim: et:ts=4:sw=4:sts=4
|
/** vim: et:ts=4:sw=4:sts=4
|
||||||
* @license RequireJS 2.1.7 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
* @license RequireJS 2.1.8+ Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||||
* Available via the MIT or new BSD license.
|
* Available via the MIT or new BSD license.
|
||||||
* see: http://github.com/jrburke/requirejs for details
|
* see: http://github.com/jrburke/requirejs for details
|
||||||
*/
|
*/
|
||||||
|
|
@ -12,7 +12,7 @@ var requirejs, require, define;
|
||||||
(function (global) {
|
(function (global) {
|
||||||
var req, s, head, baseElement, dataMain, src,
|
var req, s, head, baseElement, dataMain, src,
|
||||||
interactiveScript, currentlyAddingScript, mainScript, subPath,
|
interactiveScript, currentlyAddingScript, mainScript, subPath,
|
||||||
version = '2.1.7',
|
version = '2.1.8+',
|
||||||
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
|
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
|
||||||
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
|
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
|
||||||
jsSuffixRegExp = /\.js$/,
|
jsSuffixRegExp = /\.js$/,
|
||||||
|
|
@ -1609,7 +1609,7 @@ var requirejs, require, define;
|
||||||
|
|
||||||
//Join the path parts together, then figure out if baseUrl is needed.
|
//Join the path parts together, then figure out if baseUrl is needed.
|
||||||
url = syms.join('/');
|
url = syms.join('/');
|
||||||
url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
|
url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
|
||||||
url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
|
url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -3,72 +3,165 @@ var https = require("https")
|
||||||
, url = require("url")
|
, url = require("url")
|
||||||
, fs = require("fs");
|
, fs = require("fs");
|
||||||
|
|
||||||
|
var Path = require("path");
|
||||||
|
var spawn = require("child_process").spawn;
|
||||||
var async = require("asyncjs");
|
var async = require("asyncjs");
|
||||||
var rootDir = __dirname + "/../lib/ace/";
|
var rootDir = __dirname + "/../lib/ace/";
|
||||||
|
|
||||||
var deps = [{
|
var deps = {
|
||||||
path: "mode/css/csslint.js",
|
csslint: {
|
||||||
url: "https://raw.github.com/stubbornella/csslint/master/release/csslint-node.js",
|
path: "mode/css/csslint.js",
|
||||||
needsFixup: true
|
url: "https://raw.github.com/stubbornella/csslint/master/release/csslint-node.js",
|
||||||
}, {
|
needsFixup: true
|
||||||
path: "../../demo/kitchen-sink/require.js",
|
},
|
||||||
url: "https://raw.github.com/jrburke/requirejs/master/require.js",
|
requirejs: {
|
||||||
needsFixup: false
|
path: "../../demo/kitchen-sink/require.js",
|
||||||
}, {
|
url: "https://raw.github.com/jrburke/requirejs/master/require.js",
|
||||||
path: "mode/lua/luaparse.js",
|
needsFixup: false
|
||||||
url: "https://raw.github.com/oxyc/luaparse/master/luaparse.js",
|
},
|
||||||
needsFixup: true,
|
luaparse: {
|
||||||
postProcess: function(src) {
|
path: "mode/lua/luaparse.js",
|
||||||
return src.replace(
|
url: "https://raw.github.com/oxyc/luaparse/master/luaparse.js",
|
||||||
/\(function\s*\(root,\s*name,\s*factory\)\s*{[\s\S]*?}\(this,\s*'luaparse',/,
|
needsFixup: true,
|
||||||
"(function (root, name, factory) {\n factory(exports)\n}(this, 'luaparse',"
|
postProcess: function(src) {
|
||||||
)
|
return src.replace(
|
||||||
|
/\(function\s*\(root,\s*name,\s*factory\)\s*{[\s\S]*?}\(this,\s*'luaparse',/,
|
||||||
|
"(function (root, name, factory) {\n factory(exports)\n}(this, 'luaparse',"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
jshint: {
|
||||||
|
path: "mode/javascript/jshint.js",
|
||||||
|
url: "http://jshint.com/get/jshint-2.1.9.js",
|
||||||
|
fetch: function(_, cb) {
|
||||||
|
//run("npm install jshint@latest", function() {
|
||||||
|
var base = Path.join(__dirname, "/node_modules/jshint/")
|
||||||
|
var path = Path.join(base, "/src/stable/jshint")
|
||||||
|
run('browserify ' + path + ' -i console-browserify -r jshint', function(err, src) {
|
||||||
|
src = replaceConsoleBrowserify(src);
|
||||||
|
var version = JSON.parse(fs.readFileSync(base + "package.json")).version
|
||||||
|
src = [ "// " + version,
|
||||||
|
"var JSHINT;",
|
||||||
|
"(function () {",
|
||||||
|
"require = null;",
|
||||||
|
src,
|
||||||
|
"JSHINT = require('jshint').JSHINT;",
|
||||||
|
"}());"
|
||||||
|
].join("\n")
|
||||||
|
cb(err, src);
|
||||||
|
})
|
||||||
|
//});
|
||||||
|
},
|
||||||
|
needsFixup: true,
|
||||||
|
postProcess: function(src) {
|
||||||
|
src = src.replace(/(\],|\{)((?:\d+|"\w+"):\[)/g, "$1\n$2")
|
||||||
|
.replace(/^(\},)(\{[^{}\[\]]*?\}\])/gm, "$1\n$2")
|
||||||
|
|
||||||
|
src = src.replace(
|
||||||
|
/"Expected a conditional expression and instead saw an assignment."/g,
|
||||||
|
'"Assignment in conditional expression"'
|
||||||
|
);
|
||||||
|
|
||||||
|
src = src.replace(/\brequire\(["']|\(require,|\(require\)/g, function(r){
|
||||||
|
return r.replace("require", "req");
|
||||||
|
})
|
||||||
|
|
||||||
|
src = src.replace(/var defaultMaxListeners = 10;/, function(a) {return a.replace("10", "200")});
|
||||||
|
|
||||||
|
src = src.replace(/var JSHINT;\s*\(function[\s()]+\{\s*/, "")
|
||||||
|
.replace(/JSHINT = .*\n\s*\}\(\)\);\s*/, "");
|
||||||
|
src += '\n'
|
||||||
|
+ 'function req() {return require.apply(this, arguments)}\n'
|
||||||
|
+ 'module.exports = req("jshint");\n';
|
||||||
|
return src;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
emmet: {
|
||||||
|
path: "ext/emmet core.js",
|
||||||
|
url: [
|
||||||
|
"https://raw.github.com/sergeche/emmet-sublime/master/emmet/emmet-app.js",
|
||||||
|
"https://raw.github.com/sergeche/emmet-sublime/master/emmet/snippets.json"
|
||||||
|
],
|
||||||
|
postProcess: function(data) {
|
||||||
|
return data[0]
|
||||||
|
.replace("define(emmet)", "define('emmet', [], emmet)")
|
||||||
|
.replace(/(emmet.define\('bootstrap'.*)[\s\S]*$/, function(_, x) {
|
||||||
|
return x + "\n" +
|
||||||
|
"var snippets = " + data[1] + ";\n" +
|
||||||
|
"var res = require('resources');\n" +
|
||||||
|
"var userData = res.getVocabulary('user') || {};\n" +
|
||||||
|
"res.setVocabulary(require('utils').deepMerge(userData, snippets), 'user');\n" +
|
||||||
|
"});";
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
coffee: {
|
||||||
|
fetch: function(){
|
||||||
|
var rootHref = "https://raw.github.com/jashkenas/coffee-script/master/";
|
||||||
|
var path = "mode/coffee/";
|
||||||
|
|
||||||
|
var subDir = "lib/coffee-script/";
|
||||||
|
var deps = [
|
||||||
|
"helpers.js",
|
||||||
|
"lexer.js",
|
||||||
|
"nodes.js",
|
||||||
|
"parser.js",
|
||||||
|
"rewriter.js",
|
||||||
|
"scope.js"
|
||||||
|
].map(function(x) {
|
||||||
|
return {
|
||||||
|
name: x,
|
||||||
|
href: rootHref + subDir + x,
|
||||||
|
path: rootDir + path + x
|
||||||
|
};
|
||||||
|
});
|
||||||
|
deps.push({name:"LICENSE", href: rootHref + "LICENSE"});
|
||||||
|
|
||||||
|
var downloads = {}, counter = 0;
|
||||||
|
|
||||||
|
deps.forEach(function(x) {
|
||||||
|
download(x.href, function(err, data) {
|
||||||
|
counter++;
|
||||||
|
downloads[x.name] = data;
|
||||||
|
if (counter == deps.length)
|
||||||
|
allDone();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
function allDone() {
|
||||||
|
deps.pop();
|
||||||
|
var license = downloads.LICENSE.split('\n');
|
||||||
|
license = "/**\n * " + license.join("\n * ") + "\n */";
|
||||||
|
|
||||||
|
deps.forEach(function(x) {
|
||||||
|
var data = downloads[x.name];
|
||||||
|
console.log(x.name);
|
||||||
|
console.log(!data);
|
||||||
|
if (!data)
|
||||||
|
return;
|
||||||
|
if (x.name == "parser.js") {
|
||||||
|
data = data.replace("var parser = (function(){", "")
|
||||||
|
.replace(/\nreturn (new Parser)[\s\S]*$/, "\n\nmodule.exports = $1;\n\n");
|
||||||
|
} else {
|
||||||
|
data = data.replace("(function() {", "")
|
||||||
|
.replace(/\}\).call\(this\);\s*$/, "");
|
||||||
|
}
|
||||||
|
data = license
|
||||||
|
+ "\n\n"
|
||||||
|
+ "define(function(require, exports, module) {\n"
|
||||||
|
+ data
|
||||||
|
+ "\n});";
|
||||||
|
|
||||||
|
fs.writeFile(x.path, data, "utf-8", function(err){
|
||||||
|
if (err) throw err;
|
||||||
|
console.log("File " + x.name + " saved.");
|
||||||
|
console.warn("mode/coffee/coffee-script file needs to updated manually");
|
||||||
|
console.warn("mode/coffee/parser.js: parseError function needs to be modified");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, {
|
};
|
||||||
path: "mode/javascript/jshint.js",
|
|
||||||
url: "http://jshint.com/get/jshint-2.1.4.js",
|
|
||||||
needsFixup: true,
|
|
||||||
postProcess: function(src) {
|
|
||||||
src = src.replace(/(\],|\{)((?:\d+|"\w+"):\[)/g, "$1\n$2")
|
|
||||||
.replace(/^(\},)(\{[^{}\[\]]*?\}\])/gm, "$1\n$2")
|
|
||||||
|
|
||||||
src = src.replace(
|
|
||||||
/"Expected a conditional expression and instead saw an assignment."/g,
|
|
||||||
'"Assignment in conditional expression"'
|
|
||||||
);
|
|
||||||
|
|
||||||
src = src.replace(/\brequire\(["']|\(require,|\(require\)/g, function(r){
|
|
||||||
return r.replace("require", "req");
|
|
||||||
})
|
|
||||||
|
|
||||||
src = src.replace(/var defaultMaxListeners = 10;/, function(a) {return a.replace("10", "200")});
|
|
||||||
|
|
||||||
src = src.replace(/var JSHINT;\s*\(function[\s()]+\{\s*/, "")
|
|
||||||
.replace(/JSHINT = .*\n\s*\}\(\)\);\s*/, "");
|
|
||||||
src += '\n'
|
|
||||||
+ 'function req() {return require.apply(this, arguments)}\n'
|
|
||||||
+ 'module.exports = req("jshint");\n';
|
|
||||||
return src;
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
path: "ext/emmet-core.js",
|
|
||||||
url: [
|
|
||||||
"https://raw.github.com/sergeche/emmet-sublime/master/emmet/emmet-app.js",
|
|
||||||
"https://raw.github.com/sergeche/emmet-sublime/master/emmet/snippets.json"
|
|
||||||
],
|
|
||||||
postProcess: function(data) {
|
|
||||||
return data[0]
|
|
||||||
.replace("define(emmet)", "define('emmet', [], emmet)")
|
|
||||||
.replace(/(emmet.define\('bootstrap'.*)[\s\S]*$/, function(_, x) {
|
|
||||||
return x + "\n" +
|
|
||||||
"var snippets = " + data[1] + ";\n" +
|
|
||||||
"var res = require('resources');\n" +
|
|
||||||
"var userData = res.getVocabulary('user') || {};\n" +
|
|
||||||
"res.setVocabulary(require('utils').deepMerge(userData, snippets), 'user');\n" +
|
|
||||||
"});";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}];
|
|
||||||
|
|
||||||
var download = function(href, callback) {
|
var download = function(href, callback) {
|
||||||
if (Array.isArray(href))
|
if (Array.isArray(href))
|
||||||
|
|
@ -92,7 +185,9 @@ var download = function(href, callback) {
|
||||||
};
|
};
|
||||||
|
|
||||||
var getDep = function(dep) {
|
var getDep = function(dep) {
|
||||||
download(dep.url, function(err, data) {
|
if (!dep.fetch)
|
||||||
|
dep.fetch = download
|
||||||
|
dep.fetch(dep.url, function(err, data) {
|
||||||
if (dep.postProcess)
|
if (dep.postProcess)
|
||||||
data = dep.postProcess(data);
|
data = dep.postProcess(data);
|
||||||
if (dep.needsFixup)
|
if (dep.needsFixup)
|
||||||
|
|
@ -107,74 +202,59 @@ var getDep = function(dep) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
deps.slice(-1).forEach(getDep);
|
function run(cmd, cb) {
|
||||||
|
var proc = process.platform == "win32"
|
||||||
|
? spawn("cmd", ["/c", cmd], {cwd: __dirname})
|
||||||
|
: spawn("bash", ["-c", cmd], {cwd: __dirname});
|
||||||
|
|
||||||
// coffee-script
|
var result = "", err = "";
|
||||||
void function(){
|
proc.stderr.setEncoding("utf8");
|
||||||
var rootHref = "https://raw.github.com/jashkenas/coffee-script/master/";
|
proc.stderr.on('data', function (data) {
|
||||||
var path = "mode/coffee/";
|
err += data;
|
||||||
|
});
|
||||||
|
|
||||||
var subDir = "lib/coffee-script/";
|
proc.stdout.setEncoding("utf8");
|
||||||
var deps = [
|
proc.stdout.on('data', function (data) {
|
||||||
"helpers.js",
|
result += data;
|
||||||
"lexer.js",
|
});
|
||||||
"nodes.js",
|
|
||||||
"parser.js",
|
|
||||||
"rewriter.js",
|
|
||||||
"scope.js"
|
|
||||||
].map(function(x) {
|
|
||||||
return {
|
|
||||||
name: x,
|
|
||||||
href: rootHref + subDir + x,
|
|
||||||
path: rootDir + path + x
|
|
||||||
};
|
|
||||||
});
|
|
||||||
deps.push({name:"LICENSE", href: rootHref + "LICENSE"});
|
|
||||||
|
|
||||||
var downloads = {}, counter = 0;
|
proc.on('exit', done);
|
||||||
|
proc.on('close', done);
|
||||||
deps.forEach(function(x) {
|
function done(code) {
|
||||||
download(x.href, function(err, data) {
|
if (code !== 0) {
|
||||||
counter++;
|
console.error(cmd + '::: process exited with code :::' + code);
|
||||||
downloads[x.name] = data;
|
console.error(err)
|
||||||
if (counter == deps.length)
|
}
|
||||||
allDone();
|
cb(err, result)
|
||||||
});
|
|
||||||
});
|
|
||||||
function allDone() {
|
|
||||||
deps.pop();
|
|
||||||
var license = downloads.LICENSE.split('\n');
|
|
||||||
license = "/**\n * " + license.join("\n * ") + "\n */";
|
|
||||||
|
|
||||||
deps.forEach(function(x) {
|
|
||||||
var data = downloads[x.name];
|
|
||||||
console.log(x.name);
|
|
||||||
console.log(!data);
|
|
||||||
if (!data)
|
|
||||||
return;
|
|
||||||
if (x.name == "parser.js") {
|
|
||||||
data = data.replace("var parser = (function(){", "")
|
|
||||||
.replace(/\nreturn (new Parser)[\s\S]*$/, "\n\nmodule.exports = $1;\n\n");
|
|
||||||
} else {
|
|
||||||
data = data.replace("(function() {", "")
|
|
||||||
.replace(/\}\).call\(this\);\s*$/, "");
|
|
||||||
}
|
|
||||||
data = license
|
|
||||||
+ "\n\n"
|
|
||||||
+ "define(function(require, exports, module) {\n"
|
|
||||||
+ data
|
|
||||||
+ "\n});";
|
|
||||||
|
|
||||||
fs.writeFile(x.path, data, "utf-8", function(err){
|
|
||||||
if (err) throw err;
|
|
||||||
console.log("File " + x.name + " saved.");
|
|
||||||
console.warn("mode/coffee/coffee-script file needs to updated manually");
|
|
||||||
console.warn("mode/coffee/parser.js: parseError function needs to be modified");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}//();
|
}
|
||||||
|
|
||||||
|
function unquote(str) {
|
||||||
|
return str.replace(/\\(.)/g, function(x, a) {
|
||||||
|
return a == "n" ? "\n"
|
||||||
|
: a == "t" ? "\t"
|
||||||
|
: a == "r" ? "\r"
|
||||||
|
: a
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function replaceConsoleBrowserify(str) {
|
||||||
|
var simpleConsole = function(req,module,exports){
|
||||||
|
["log", "info", "warn", "error",
|
||||||
|
"time","timeEnd", "trace", "dir", "assert"
|
||||||
|
].forEach(function(x) {exports[x] = nop;});
|
||||||
|
function nop() {}
|
||||||
|
}
|
||||||
|
var m = /"console-browserify":(\d+)/.exec(str);
|
||||||
|
name = m && m[1];
|
||||||
|
if (name) {
|
||||||
|
str = str.replace(
|
||||||
|
"{1:[",
|
||||||
|
"{" + name + ":[" + simpleConsole + ",{}],\n1:["
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
getDep(deps.jshint)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue