Merge branch 'master' into 2.0

This commit is contained in:
Brian Ng 2017-03-12 10:48:54 -05:00
commit 1e9cf572a8
7 changed files with 42 additions and 42 deletions

View File

@ -34,15 +34,6 @@
"ios": 10,
"opera": 33
},
"transform-es2015-duplicate-keys": {
"chrome": 42,
"edge": 12,
"firefox": 34,
"safari": 9,
"node": 4,
"ios": 9,
"opera": 29
},
"transform-es2015-computed-properties": {
"chrome": 44,
"edge": 12,
@ -69,6 +60,15 @@
"ios": 10,
"opera": 38
},
"transform-es2015-duplicate-keys": {
"chrome": 42,
"edge": 12,
"firefox": 34,
"safari": 9,
"node": 4,
"ios": 9,
"opera": 29
},
"transform-es2015-for-of": {
"chrome": 51,
"edge": 15,

View File

@ -49,7 +49,7 @@
"babel-plugin-transform-exponentiation-operator": "7.0.0-alpha.1",
"babel-plugin-transform-regenerator": "7.0.0-alpha.1",
"browserslist": "^1.4.0",
"electron-to-chromium": "^1.1.0",
"electron-to-chromium": "^1.2.6",
"invariant": "^2.2.2"
},
"devDependencies": {
@ -61,17 +61,17 @@
"babel-plugin-transform-flow-strip-types": "7.0.0-alpha.1",
"babel-preset-env": "2.0.0-alpha.1",
"babel-register": "7.0.0-alpha.1",
"chai": "^3.0.0",
"chai": "^3.5.0",
"codecov": "^1.0.1",
"compat-table": "kangax/compat-table#c38f039b8ea7fadf347d3e300fec3611645e31e9",
"eslint": "^3.13.1",
"eslint-config-babel": "^5.0.0",
"eslint": "^3.17.1",
"eslint-config-babel": "^6.0.0",
"eslint-plugin-flowtype": "^2.29.1",
"fs-extra": "^2.0.0",
"lodash": "^4.15.0",
"mocha": "^3.0.2",
"lodash": "^4.17.4",
"mocha": "^3.2.0",
"nyc": "^10.1.2",
"rimraf": "^2.5.4"
"rimraf": "^2.6.1"
},
"babel": {
"presets": [

View File

@ -163,7 +163,7 @@ export const transformIncludesAndExcludes = (opts) => ({
export default function buildPreset(context, opts = {}) {
const validatedOptions = normalizeOptions(opts);
const {debug, loose, moduleType, useBuiltIns} = validatedOptions;
const { debug, loose, moduleType, useBuiltIns } = validatedOptions;
const targets = getTargets(validatedOptions.targets);
const include = transformIncludesAndExcludes(validatedOptions.include);

View File

@ -13,10 +13,10 @@ Using plugins:
transform-es2015-block-scoped-functions {"uglify":true}
transform-es2015-block-scoping {"uglify":true}
transform-es2015-classes {"uglify":true}
transform-es2015-duplicate-keys {"uglify":true}
transform-es2015-computed-properties {"uglify":true}
check-es2015-constants {"uglify":true}
transform-es2015-destructuring {"uglify":true}
transform-es2015-duplicate-keys {"uglify":true}
transform-es2015-for-of {"uglify":true}
transform-es2015-function-name {"uglify":true}
transform-es2015-literals {"uglify":true}
@ -39,4 +39,4 @@ Using polyfills:
web.timers {"chrome":55}
web.immediate {"chrome":55}
web.dom.iterable {"chrome":55}
src/in.js -> lib/in.js
src/in.js -> lib/in.js

View File

@ -14,10 +14,10 @@ Using plugins:
transform-es2015-block-scoped-functions {"ie":10}
transform-es2015-block-scoping {"ie":10}
transform-es2015-classes {"ie":10}
transform-es2015-duplicate-keys {"ie":10}
transform-es2015-computed-properties {"ie":10}
check-es2015-constants {"ie":10}
transform-es2015-destructuring {"ie":10,"node":6}
transform-es2015-duplicate-keys {"ie":10}
transform-es2015-for-of {"ie":10,"node":6}
transform-es2015-function-name {"ie":10,"node":6}
transform-es2015-literals {"ie":10}
@ -111,4 +111,4 @@ Using polyfills:
web.timers {"chrome":54,"ie":10,"node":6}
web.immediate {"chrome":54,"ie":10,"node":6}
web.dom.iterable {"chrome":54,"ie":10,"node":6}
src/in.js -> lib/in.js
src/in.js -> lib/in.js

View File

@ -17,10 +17,10 @@ Using plugins:
transform-es2015-block-scoped-functions {"edge":13,"ie":10,"ios":9,"safari":7}
transform-es2015-block-scoping {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
transform-es2015-classes {"ie":10,"ios":9,"safari":7}
transform-es2015-duplicate-keys {"ie":10,"safari":7}
transform-es2015-computed-properties {"ie":10,"safari":7}
check-es2015-constants {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
transform-es2015-destructuring {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
transform-es2015-duplicate-keys {"ie":10,"safari":7}
transform-es2015-for-of {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
transform-es2015-function-name {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
transform-es2015-literals {"firefox":49,"ie":10,"safari":7}
@ -123,4 +123,4 @@ Using polyfills:
web.timers {"chrome":54,"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
web.immediate {"chrome":54,"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
web.dom.iterable {"chrome":54,"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7}
src/in.js -> lib/in.js
src/in.js -> lib/in.js

View File

@ -39,8 +39,8 @@ ajv-keywords@^1.0.0:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
ajv@^4.7.0, ajv@^4.9.1:
version "4.11.4"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.4.tgz#ebf3a55d4b132ea60ff5847ae85d2ef069960b45"
version "4.11.5"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
dependencies:
co "^4.6.0"
json-stable-stringify "^1.0.1"
@ -1406,7 +1406,7 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"
chai@^3.0.0:
chai@^3.0.0, chai@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
dependencies:
@ -1672,8 +1672,8 @@ debug@2.2.0, debug@~2.2.0:
ms "0.7.1"
debug@^2.1.1, debug@^2.2.0:
version "2.6.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
version "2.6.2"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.2.tgz#dfa96a861ee9b8c2f29349b3bcc41aa599a71e0f"
dependencies:
ms "0.7.2"
@ -1790,7 +1790,7 @@ ecc-jsbn@~0.1.1:
dependencies:
jsbn "~0.1.0"
electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.5:
electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.5, electron-to-chromium@^1.2.6:
version "1.2.6"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.6.tgz#f38ad51d1919b06bc07275c62629db803ddca05a"
@ -1947,9 +1947,9 @@ esdown@latest:
version "1.1.16"
resolved "https://registry.yarnpkg.com/esdown/-/esdown-1.1.16.tgz#0ef0382fcabd14db10adfbeccf109257d2838d9e"
eslint-config-babel@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-babel/-/eslint-config-babel-5.0.0.tgz#2f1ac1d58104fc0b50a2964ddb08f8901bbbbd8a"
eslint-config-babel@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-babel/-/eslint-config-babel-6.0.0.tgz#66feedf6ce6e04abe585cec1a65b5bcc96bed50a"
eslint-plugin-flowtype@^2.29.1:
version "2.30.3"
@ -1957,7 +1957,7 @@ eslint-plugin-flowtype@^2.29.1:
dependencies:
lodash "^4.15.0"
eslint@^3.13.1:
eslint@^3.17.1:
version "3.17.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.17.1.tgz#b80ae12d9c406d858406fccda627afce33ea10ea"
dependencies:
@ -2483,8 +2483,8 @@ is-binary-path@^1.0.0:
binary-extensions "^1.0.0"
is-buffer@^1.0.2:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
version "1.1.5"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
is-builtin-module@^1.0.0:
version "1.0.0"
@ -2885,7 +2885,7 @@ lodash@3.7.x:
version "3.7.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
lodash@^4.0.0, lodash@^4.1.0, lodash@^4.15.0, lodash@^4.2.0, lodash@^4.3.0:
lodash@^4.0.0, lodash@^4.1.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@ -2970,7 +2970,7 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
dependencies:
minimist "0.0.8"
mocha@^3.0.2:
mocha@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
dependencies:
@ -3571,7 +3571,7 @@ right-align@^0.1.1:
dependencies:
align-text "^0.1.1"
rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.4:
rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.4, rimraf@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
dependencies:
@ -3987,8 +3987,8 @@ typescript@latest:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.1.tgz#4862b662b988a4c8ff691cc7969622d24db76ae9"
uglify-js@^2.6:
version "2.8.11"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.11.tgz#11a51c43d810b47bc00aee4d512cb3947ddd1ac4"
version "2.8.12"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.12.tgz#8a50f5d482243650b7108f6080aa3a6afe2a6c55"
dependencies:
source-map "~0.5.1"
uglify-to-browserify "~1.0.0"
@ -4148,8 +4148,8 @@ y18n@^3.2.1:
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
yallist@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4"
version "2.0.1"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.1.tgz#6c11279640abd6ed0a86dd32ed56b03caa9df4f1"
yargs-parser@^4.0.2, yargs-parser@^4.2.0:
version "4.2.1"