From 22eb40d204f6d7fddc5bda4f82c85c17fe0d6710 Mon Sep 17 00:00:00 2001 From: Henry Zhu Date: Sun, 26 Jun 2016 17:28:14 -0400 Subject: [PATCH] Build: use lerna 2.x beta (#3509) lerna changelog update --- Makefile | 5 ++--- VERSION | 1 - lerna.json | 25 +++++++++++++++++++++++++ package.json | 14 +++++++++----- 4 files changed, 36 insertions(+), 9 deletions(-) delete mode 100644 VERSION create mode 100644 lerna.json diff --git a/Makefile b/Makefile index 23c9633187..85dc06159b 100644 --- a/Makefile +++ b/Makefile @@ -52,15 +52,14 @@ publish: rm -rf packages/*/lib BABEL_ENV=production make build-dist make test - ./node_modules/.bin/lerna publish + ./node_modules/.bin/lerna publish --only-explicit-updates make clean #./scripts/build-website.sh bootstrap: npm install ./node_modules/.bin/lerna bootstrap - # remove all existing babel-runtimes and use the top-level babel-runtime - rm -rf packages/*/node_modules/babel-runtime make build cd packages/babel-runtime; \ + npm install; \ node scripts/build-dist.js diff --git a/VERSION b/VERSION deleted file mode 100644 index 20305ef028..0000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -6.10.4 \ No newline at end of file diff --git a/lerna.json b/lerna.json new file mode 100644 index 0000000000..2c54e3f4ea --- /dev/null +++ b/lerna.json @@ -0,0 +1,25 @@ +{ + "lerna": "2.0.0-beta.23", + "version": "6.10.4", + "changelog": { + "repo": "babel/babel", + "labels": { + "tag: bug fix": "Bug Fix", + "tag: breaking change": "Breaking Change", + "tag: documentation": "Documentation", + "tag: internal": "Internal", + "tag: new feature": "New Feature", + "tag: polish": "Polish", + "tag: spec compliancy": "Spec Compliancy" + } + }, + "bootstrapConfig": { + "ignore": "babel-runtime" + }, + "publishConfig": { + "ignore": [ + "*.md", + "test/**" + ] + } +} diff --git a/package.json b/package.json index e06fa98e25..ca906e1d15 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,13 @@ "devDependencies": { "async": "^1.5.0", "babel-core": "^6.3.17", - "babel-plugin-transform-runtime": "^6.3.13", "babel-plugin-transform-class-properties": "^6.6.0", "babel-plugin-transform-flow-strip-types": "^6.3.13", - "babel-runtime": "^6.0.0", + "babel-plugin-transform-runtime": "^6.3.13", "babel-preset-es2015": "^6.6.0", "babel-preset-es2015-loose": "^7.0.0", "babel-preset-stage-0": "^6.0.0", + "babel-runtime": "^6.0.0", "browserify": "^11.2.0", "bundle-collapser": "^1.2.1", "chai": "^2.2.0", @@ -18,7 +18,6 @@ "codecov.io": "^0.1.6", "derequire": "^2.0.2", "es5-shim": "^4.1.7", - "kcheck": "^2.0.0", "fs-readdir-recursive": "^0.1.2", "gulp": "^3.9.0", "gulp-babel": "^6.0.0", @@ -27,7 +26,9 @@ "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", "istanbul": "^0.3.5", - "lerna": "^1.0.0", + "kcheck": "^2.0.0", + "lerna": "2.0.0-beta.23", + "lerna-changelog": "^0.2.0", "lodash": "^4.2.0", "matcha": "^0.6.0", "mkdirp": "^0.5.1", @@ -44,7 +45,10 @@ "uglify-js": "^2.4.16" }, "babel": { - "presets": ["stage-0", "es2015-loose"], + "presets": [ + "stage-0", + "es2015-loose" + ], "plugins": [ "./scripts/add-module-exports", "transform-runtime",