cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable prefer const (#5113)

Browse Source
This commit is contained in:
Henry Zhu
2017-01-14 09:48:52 -05:00
committed by GitHub
parent 982850731e
commit 672adba9a1
177 changed files with 1862 additions and 1863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/babel-cli/src/_babel-node.js
View File

@@ -11,7 +11,7 @@ import _ from "lodash";
import "babel-polyfill";
import register from "babel-register";
let program = new commander.Command("babel-node");
const program = new commander.Command("babel-node");
program.option("-e, --eval [script]", "Evaluate script");
program.option("-p, --print [code]", "Evaluate script and print result");
@@ -21,7 +21,7 @@ program.option("-x, --extensions [extensions]", "List of extensions to hook into
program.option("-w, --plugins [string]", "", util.list);
program.option("-b, --presets [string]", "", util.list);
let pkg = require("../package.json");
const pkg = require("../package.json");
program.version(pkg.version);
program.usage("[options] [ -e script | script.js ] [arguments]");
program.parse(process.argv);
@@ -38,7 +38,7 @@ register({
//
let replPlugin = ({ types: t }) => ({
const replPlugin = ({ types: t }) => ({
visitor: {
ModuleDeclaration(path) {
throw path.buildCodeFrameError("Modules aren't supported in the REPL");
@@ -62,7 +62,7 @@ let replPlugin = ({ types: t }) => ({
//
let _eval = function (code, filename) {
const _eval = function (code, filename) {
code = code.trim();
if (!code) return undefined;
@@ -84,7 +84,7 @@ if (program.eval || program.print) {
global.__filename = "[eval]";
global.__dirname = process.cwd();
let module = new Module(global.__filename);
const module = new Module(global.__filename);
module.filename = global.__filename;
module.paths = Module._nodeModulePaths(global.__dirname);
@@ -92,9 +92,9 @@ if (program.eval || program.print) {
global.module = module;
global.require = module.require.bind(module);
let result = _eval(code, global.__filename);
const result = _eval(code, global.__filename);
if (program.print) {
let output = _.isString(result) ? result : inspect(result);
const output = _.isString(result) ? result : inspect(result);
process.stdout.write(output + "\n");
}
} else {
@@ -111,7 +111,7 @@ if (program.eval || program.print) {
}
if (arg[0] === "-") {
let parsedArg = program[arg.slice(2)];
const parsedArg = program[arg.slice(2)];
if (parsedArg && parsedArg !== true) {
ignoreNext = true;
}
@@ -123,7 +123,7 @@ if (program.eval || program.print) {
args = args.slice(i);
// make the filename absolute
let filename = args[0];
const filename = args[0];
if (!pathIsAbsolute(filename)) args[0] = path.join(process.cwd(), filename);
// add back on node and concat the sliced args

12
packages/babel-cli/src/babel-node.js
View File

@@ -5,8 +5,8 @@
* when found, before invoking the "real" _babel-node(1) executable.
*/
let getV8Flags = require("v8flags");
let path = require("path");
const getV8Flags = require("v8flags");
const path = require("path");
let args = [path.join(__dirname, "_babel-node")];
@@ -14,7 +14,7 @@ let babelArgs = process.argv.slice(2);
let userArgs;
// separate node arguments from script arguments
let argSeparator = babelArgs.indexOf("--");
const argSeparator = babelArgs.indexOf("--");
if (argSeparator > -1) {
userArgs = babelArgs.slice(argSeparator); // including the --
babelArgs = babelArgs.slice(0, argSeparator);
@@ -75,13 +75,13 @@ getV8Flags(function (err, v8Flags) {
}
try {
let kexec = require("kexec");
const kexec = require("kexec");
kexec(process.argv[0], args);
} catch (err) {
if (err.code !== "MODULE_NOT_FOUND") throw err;
let child_process = require("child_process");
let proc = child_process.spawn(process.argv[0], args, { stdio: "inherit" });
const child_process = require("child_process");
const proc = child_process.spawn(process.argv[0], args, { stdio: "inherit" });
proc.on("exit", function (code, signal) {
process.on("exit", function () {
if (signal) {

32
packages/babel-cli/src/babel/dir.js
View File

@@ -1,18 +1,18 @@
let outputFileSync = require("output-file-sync");
let slash = require("slash");
let path = require("path");
let util = require("./util");
let fs = require("fs");
let _ = require("lodash");
const outputFileSync = require("output-file-sync");
const slash = require("slash");
const path = require("path");
const util = require("./util");
const fs = require("fs");
const _ = require("lodash");
module.exports = function (commander, filenames) {
function write(src, relative) {
// remove extension and then append back on .js
relative = relative.replace(/\.(\w*?)$/, "") + ".js";
let dest = path.join(commander.outDir, relative);
const dest = path.join(commander.outDir, relative);
let data = util.compile(src, {
const data = util.compile(src, {
sourceFileName: slash(path.relative(dest + "/..", src)),
sourceMapTarget: path.basename(relative)
});
@@ -20,7 +20,7 @@ module.exports = function (commander, filenames) {
// we've requested explicit sourcemaps to be written to disk
if (data.map && commander.sourceMaps && commander.sourceMaps !== "inline") {
let mapLoc = dest + ".map";
const mapLoc = dest + ".map";
data.code = util.addSourceMappingUrl(data.code, mapLoc);
outputFileSync(mapLoc, JSON.stringify(data.map));
}
@@ -37,7 +37,7 @@ module.exports = function (commander, filenames) {
if (util.canCompile(filename, commander.extensions)) {
write(src, filename);
} else if (commander.copyFiles) {
let dest = path.join(commander.outDir, filename);
const dest = path.join(commander.outDir, filename);
outputFileSync(dest, fs.readFileSync(src));
util.chmod(src, dest);
}
@@ -46,13 +46,13 @@ module.exports = function (commander, filenames) {
function handle(filename) {
if (!fs.existsSync(filename)) return;
let stat = fs.statSync(filename);
const stat = fs.statSync(filename);
if (stat.isDirectory(filename)) {
let dirname = filename;
const dirname = filename;
_.each(util.readdir(dirname), function (filename) {
let src = path.join(dirname, filename);
const src = path.join(dirname, filename);
handleFile(src, filename);
});
} else {
@@ -65,17 +65,17 @@ module.exports = function (commander, filenames) {
}
if (commander.watch) {
let chokidar = util.requireChokidar();
const chokidar = util.requireChokidar();
_.each(filenames, function (dirname) {
let watcher = chokidar.watch(dirname, {
const watcher = chokidar.watch(dirname, {
persistent: true,
ignoreInitial: true
});
_.each(["add", "change"], function (type) {
watcher.on(type, function (filename) {
let relative = path.relative(dirname, filename) || filename;
const relative = path.relative(dirname, filename) || filename;
try {
handleFile(filename, relative);
} catch (err) {

48
packages/babel-cli/src/babel/file.js
View File

@@ -1,10 +1,10 @@
let convertSourceMap = require("convert-source-map");
let sourceMap = require("source-map");
let slash = require("slash");
let path = require("path");
let util = require("./util");
let fs = require("fs");
let _ = require("lodash");
const convertSourceMap = require("convert-source-map");
const sourceMap = require("source-map");
const slash = require("slash");
const path = require("path");
const util = require("./util");
const fs = require("fs");
const _ = require("lodash");
module.exports = function (commander, filenames, opts) {
if (commander.sourceMaps === "inline") {
@@ -13,8 +13,8 @@ module.exports = function (commander, filenames, opts) {
let results = [];
let buildResult = function () {
let map = new sourceMap.SourceMapGenerator({
const buildResult = function () {
const map = new sourceMap.SourceMapGenerator({
file: path.basename(commander.outFile || "") || "stdout",
sourceRoot: opts.sourceRoot
});
@@ -26,8 +26,8 @@ module.exports = function (commander, filenames, opts) {
code += result.code + "\n";
if (result.map) {
let consumer = new sourceMap.SourceMapConsumer(result.map);
let sources = new Set();
const consumer = new sourceMap.SourceMapConsumer(result.map);
const sources = new Set();
consumer.eachMapping(function (mapping) {
if (mapping.source != null) sources.add(mapping.source);
@@ -46,7 +46,7 @@ module.exports = function (commander, filenames, opts) {
});
sources.forEach((source) => {
let content = consumer.sourceContentFor(source, true);
const content = consumer.sourceContentFor(source, true);
if (content !== null) {
map.setSourceContent(source, content);
}
@@ -68,13 +68,13 @@ module.exports = function (commander, filenames, opts) {
};
};
let output = function () {
let result = buildResult();
const output = function () {
const result = buildResult();
if (commander.outFile) {
// we've requested for a sourcemap to be written to disk
if (commander.sourceMaps && commander.sourceMaps !== "inline") {
let mapLoc = commander.outFile + ".map";
const mapLoc = commander.outFile + ".map";
result.code = util.addSourceMappingUrl(result.code, mapLoc);
fs.writeFileSync(mapLoc, JSON.stringify(result.map));
}
@@ -85,13 +85,13 @@ module.exports = function (commander, filenames, opts) {
}
};
let stdin = function () {
const stdin = function () {
let code = "";
process.stdin.setEncoding("utf8");
process.stdin.on("readable", function () {
let chunk = process.stdin.read();
const chunk = process.stdin.read();
if (chunk !== null) code += chunk;
});
@@ -103,16 +103,16 @@ module.exports = function (commander, filenames, opts) {
});
};
let walk = function () {
let _filenames = [];
const walk = function () {
const _filenames = [];
results = [];
_.each(filenames, function (filename) {
if (!fs.existsSync(filename)) return;
let stat = fs.statSync(filename);
const stat = fs.statSync(filename);
if (stat.isDirectory()) {
let dirname = filename;
const dirname = filename;
_.each(util.readdirFilter(filename), function (filename) {
_filenames.push(path.join(dirname, filename));
@@ -131,7 +131,7 @@ module.exports = function (commander, filenames, opts) {
}
sourceFilename = slash(sourceFilename);
let data = util.compile(filename, {
const data = util.compile(filename, {
sourceFileName: sourceFilename,
});
@@ -142,14 +142,14 @@ module.exports = function (commander, filenames, opts) {
output();
};
let files = function () {
const files = function () {
if (!commander.skipInitialBuild) {
walk();
}
if (commander.watch) {
let chokidar = util.requireChokidar();
const chokidar = util.requireChokidar();
chokidar.watch(filenames, {
persistent: true,
ignoreInitial: true

24
packages/babel-cli/src/babel/index.js
View File

@@ -3,14 +3,14 @@
require("babel-core");
let fs = require("fs");
let commander = require("commander");
let kebabCase = require("lodash/kebabCase");
let options = require("babel-core").options;
let util = require("babel-core").util;
let uniq = require("lodash/uniq");
let each = require("lodash/each");
let glob = require("glob");
const fs = require("fs");
const commander = require("commander");
const kebabCase = require("lodash/kebabCase");
const options = require("babel-core").options;
const util = require("babel-core").util;
const uniq = require("lodash/uniq");
const each = require("lodash/each");
const glob = require("glob");
each(options, function (option, key) {
if (option.hidden) return;
@@ -31,7 +31,7 @@ each(options, function (option, key) {
arg = "-" + option.shorthand + ", " + arg;
}
let desc = [];
const desc = [];
if (option.deprecated) desc.push("[DEPRECATED] " + option.deprecated);
if (option.description) desc.push(option.description);
@@ -46,7 +46,7 @@ commander.option("-d, --out-dir [out]", "Compile an input directory of modules i
commander.option("-D, --copy-files", "When compiling a directory copy over non-compilable files");
commander.option("-q, --quiet", "Don't log anything");
let pkg = require("../../package.json");
const pkg = require("../../package.json");
commander.version(pkg.version + " (babel-core " + require("babel-core").version + ")");
commander.usage("[options] <files ...>");
commander.parse(process.argv);
@@ -59,7 +59,7 @@ if (commander.extensions) {
//
let errors = [];
const errors = [];
let filenames = commander.args.reduce(function (globbed, input) {
let files = glob.sync(input);
@@ -104,7 +104,7 @@ if (errors.length) {
//
let opts = exports.opts = {};
const opts = exports.opts = {};
each(options, function (opt, key) {
if (commander[key] !== undefined && commander[key] !== opt.default) {

22
packages/babel-cli/src/babel/util.js
View File

@@ -1,11 +1,11 @@
let commander = require("commander");
let readdir = require("fs-readdir-recursive");
let index = require("./index");
let babel = require("babel-core");
let util = require("babel-core").util;
let path = require("path");
let fs = require("fs");
let _ = require("lodash");
const commander = require("commander");
const readdir = require("fs-readdir-recursive");
const index = require("./index");
const babel = require("babel-core");
const util = require("babel-core").util;
const path = require("path");
const fs = require("fs");
const _ = require("lodash");
export function chmod(src, dest) {
fs.chmodSync(dest, fs.statSync(src).mode);
@@ -19,7 +19,7 @@ export function readdirFilter(filename) {
export { readdir };
export let canCompile = util.canCompile;
export const canCompile = util.canCompile;
export function shouldIgnore(loc) {
return util.shouldIgnore(loc, index.opts.ignore, index.opts.only);
@@ -37,7 +37,7 @@ export function transform(filename, code, opts) {
opts = _.defaults(opts || {}, index.opts);
opts.filename = filename;
let result = babel.transform(code, opts);
const result = babel.transform(code, opts);
result.filename = filename;
result.actual = code;
return result;
@@ -45,7 +45,7 @@ export function transform(filename, code, opts) {
export function compile(filename, opts) {
try {
let code = fs.readFileSync(filename, "utf8");
const code = fs.readFileSync(filename, "utf8");
return transform(filename, code, opts);
} catch (err) {
if (commander.watch) {

62
packages/babel-cli/test/index.js
View File

@@ -1,29 +1,29 @@
let readdir = require("fs-readdir-recursive");
let helper = require("babel-helper-fixtures");
let assert = require("assert");
let rimraf = require("rimraf");
let outputFileSync = require("output-file-sync");
let child = require("child_process");
let path = require("path");
let chai = require("chai");
let fs = require("fs");
let _ = require("lodash");
const readdir = require("fs-readdir-recursive");
const helper = require("babel-helper-fixtures");
const assert = require("assert");
const rimraf = require("rimraf");
const outputFileSync = require("output-file-sync");
const child = require("child_process");
const path = require("path");
const chai = require("chai");
const fs = require("fs");
const _ = require("lodash");
let fixtureLoc = path.join(__dirname, "fixtures");
let tmpLoc = path.join(__dirname, "tmp");
const fixtureLoc = path.join(__dirname, "fixtures");
const tmpLoc = path.join(__dirname, "tmp");
let presetLocs = [
const presetLocs = [
path.join(__dirname, "../../babel-preset-es2015"),
path.join(__dirname, "../../babel-preset-react")
].join(",");
let pluginLocs = [
const pluginLocs = [
path.join(__dirname, "/../../babel-plugin-transform-strict-mode"),
path.join(__dirname, "/../../babel-plugin-transform-es2015-modules-commonjs"),
].join(",");
let readDir = function (loc) {
let files = {};
const readDir = function (loc) {
const files = {};
if (fs.existsSync(loc)) {
_.each(readdir(loc), function (filename) {
files[filename] = helper.readFile(path.join(loc, filename));
@@ -32,14 +32,14 @@ let readDir = function (loc) {
return files;
};
let saveInFiles = function (files) {
const saveInFiles = function (files) {
_.each(files, function (content, filename) {
outputFileSync(filename, content);
});
};
let assertTest = function (stdout, stderr, opts) {
let expectStderr = opts.stderr.trim();
const assertTest = function (stdout, stderr, opts) {
const expectStderr = opts.stderr.trim();
stderr = stderr.trim();
if (opts.stderr) {
@@ -52,7 +52,7 @@ let assertTest = function (stdout, stderr, opts) {
throw new Error("stderr:\n" + stderr);
}
let expectStdout = opts.stdout.trim();
const expectStdout = opts.stdout.trim();
stdout = stdout.trim();
stdout = stdout.replace(/\\/g, "/");
@@ -67,13 +67,13 @@ let assertTest = function (stdout, stderr, opts) {
}
_.each(opts.outFiles, function (expect, filename) {
let actual = helper.readFile(filename);
const actual = helper.readFile(filename);
chai.expect(actual).to.equal(expect, "out-file " + filename);
});
};
let buildTest = function (binName, testName, opts) {
let binLoc = path.join(__dirname, "../lib", binName);
const buildTest = function (binName, testName, opts) {
const binLoc = path.join(__dirname, "../lib", binName);
return function (callback) {
clear();
@@ -91,7 +91,7 @@ let buildTest = function (binName, testName, opts) {
args = args.concat(opts.args);
let spawn = child.spawn(process.execPath, args);
const spawn = child.spawn(process.execPath, args);
let stderr = "";
let stdout = "";
@@ -127,7 +127,7 @@ let buildTest = function (binName, testName, opts) {
};
};
let clear = function () {
const clear = function () {
process.chdir(__dirname);
if (fs.existsSync(tmpLoc)) rimraf.sync(tmpLoc);
fs.mkdirSync(tmpLoc);
@@ -137,22 +137,22 @@ let clear = function () {
_.each(fs.readdirSync(fixtureLoc), function (binName) {
if (binName[0] === ".") return;
let suiteLoc = path.join(fixtureLoc, binName);
const suiteLoc = path.join(fixtureLoc, binName);
describe("bin/" + binName, function () {
_.each(fs.readdirSync(suiteLoc), function (testName) {
if (testName[0] === ".") return;
let testLoc = path.join(suiteLoc, testName);
const testLoc = path.join(suiteLoc, testName);
let opts = {
const opts = {
args: []
};
let optionsLoc = path.join(testLoc, "options.json");
const optionsLoc = path.join(testLoc, "options.json");
if (fs.existsSync(optionsLoc)) _.merge(opts, require(optionsLoc));
_.each(["stdout", "stdin", "stderr"], function (key) {
let loc = path.join(testLoc, key + ".txt");
const loc = path.join(testLoc, key + ".txt");
if (fs.existsSync(loc)) {
opts[key] = helper.readFile(loc);
} else {
@@ -163,7 +163,7 @@ _.each(fs.readdirSync(fixtureLoc), function (binName) {
opts.outFiles = readDir(path.join(testLoc, "out-files"));
opts.inFiles = readDir(path.join(testLoc, "in-files"));
let babelrcLoc = path.join(testLoc, ".babelrc");
const babelrcLoc = path.join(testLoc, ".babelrc");
if (fs.existsSync(babelrcLoc)) {
// copy .babelrc file to tmp directory
opts.inFiles[".babelrc"] = helper.readFile(babelrcLoc);