Merge branch 'master' into development
Conflicts: packages/babel/package.json packages/babel/src/traversal/scope/index.js
This commit is contained in:
commit
faa5cbbd08
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "babel",
|
||||
"version": "5.8.21",
|
||||
"version": "5.8.23",
|
||||
"description": "Turn ES6 code into readable vanilla ES5 with source maps",
|
||||
"author": "Sebastian McKenzie <sebmck@gmail.com>",
|
||||
"homepage": "https://babeljs.io/",
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
BROWSERIFY_CMD="../../node_modules/browserify/bin/cmd.js"
|
||||
UGLIFY_CMD="../../node_modules/uglify-js/bin/uglifyjs"
|
||||
BROWSERIFY_IGNORE="-i esprima-fb"
|
||||
|
||||
mkdir -p dist
|
||||
|
||||
node scripts/cache-templates
|
||||
|
||||
node $BROWSERIFY_CMD -e lib/polyfill.js >dist/polyfill.js
|
||||
node $UGLIFY_CMD dist/polyfill.js >dist/polyfill.min.js
|
||||
|
||||
# Add a Unicode BOM so browsers will interpret the file as UTF-8
|
||||
node -p '"\uFEFF"' > dist/browser.js
|
||||
node $BROWSERIFY_CMD lib/api/browser.js -s babel $BROWSERIFY_IGNORE >>dist/browser.js
|
||||
node -p '"\uFEFF"' > dist/browser.min.js
|
||||
node $UGLIFY_CMD dist/browser.js >>dist/browser.min.js
|
||||
|
||||
node $BROWSERIFY_CMD lib/api/node.js --node $BROWSERIFY_IGNORE >dist/node.js
|
||||
|
||||
node ../babel-cli/lib/babel-external-helpers >dist/external-helpers.js
|
||||
node $UGLIFY_CMD dist/external-helpers.js >dist/external-helpers.min.js
|
||||
|
||||
rm -rf templates.json
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "babylon",
|
||||
"version": "5.8.22",
|
||||
"version": "5.8.23",
|
||||
"description": "",
|
||||
"author": "Sebastian McKenzie <sebmck@gmail.com>",
|
||||
"homepage": "https://babeljs.io/",
|
||||
|
||||
19
scripts/bootstrap.js
vendored
19
scripts/bootstrap.js
vendored
@ -10,14 +10,17 @@ exec("npm list --global --depth 1 babel >/dev/null 2>&1 && npm uninstall -g babe
|
||||
var packages = [];
|
||||
ls("packages/*").forEach(function (loc) {
|
||||
var name = path.basename(loc);
|
||||
if (name[0] !== ".") {
|
||||
var pkg = require("../packages/" + name + "/package.json");
|
||||
packages.push({
|
||||
folder: name,
|
||||
pkg: pkg,
|
||||
name: pkg.name
|
||||
});
|
||||
}
|
||||
if (name[0] === ".") return;
|
||||
|
||||
var pkgLoc = __dirname + "/../packages/" + name + "/package.json";
|
||||
if (!fs.existsSync(pkgLoc)) return;
|
||||
|
||||
var pkg = require(pkgLoc);
|
||||
packages.push({
|
||||
folder: name,
|
||||
pkg: pkg,
|
||||
name: pkg.name
|
||||
});
|
||||
});
|
||||
|
||||
// create links
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user