Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into 7.0 #5368

Merged
merged 20 commits into from Feb 25, 2017
Merged

Merge master into 7.0 #5368

merged 20 commits into from Feb 25, 2017

Conversation

hzoo
Copy link
Member

@hzoo hzoo commented Feb 23, 2017

Merge conflicts

#4834, #5128

UU packages/babel-core/src/transformation/file/options/option-manager.js

screen shot 2017-02-23 at 6 56 51 pm

UU packages/babel-core/test/fixtures/resolution/resolve-addons-relative-to-file/node_modules/addons/preset.js

screen shot 2017-02-23 at 6 57 20 pm


#5321, #5322

UU packages/babel-generator/src/generators/statements.js (nothing)

if approved, just git push from cli

loganfsmyth and others added 20 commits February 14, 2017 11:26
Only the first for-await was correctly printed all subsequent for-await statements
where printed as for-of as the variable op was changed inside the buildForXStatement
* Pass `dirname` as extra metadata to preset constructor.

Sometimes a preset would like to know where it should resolve relative paths from (e.g. https://github.com/tleunen/babel-plugin-module-resolver) and this extra information makes that possible.

* Test for `dirname` passed into preset constructor

This adds a check for `dirname`’s existence and correctness to the
`resolve-addons-relative-to-file` test, and serves as a minimal example
of a path-aware preset.
`NODE_ENV=test` is exported by default. Therefore, targets that set `NODE_ENV` to `test` are cleaned up.
@codecov
Copy link

codecov bot commented Feb 24, 2017

Codecov Report

Merging #5368 into 7.0 will decrease coverage by -5.14%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##              7.0    #5368      +/-   ##
==========================================
- Coverage   90.38%   85.24%   -5.14%     
==========================================
  Files         204      204              
  Lines        9891     9570     -321     
  Branches     2695     2694       -1     
==========================================
- Hits         8940     8158     -782     
+ Misses        951      920      -31     
- Partials        0      492     +492
Impacted Files Coverage Δ
...kages/babel-generator/src/generators/statements.js 96.62% <ø> (-2.82%)
.../src/transformation/file/options/option-manager.js 83.47% <100%> (-10.74%)
packages/babel-generator/src/node/parentheses.js 91.59% <100%> (-0.78%)
packages/babel-polyfill/src/index.js 33.33% <ø> (-33.34%)
packages/babel-core/src/helpers/merge.js 75% <ø> (-25%)
packages/babel-messages/src/index.js 61.53% <ø> (-24.18%)
...ckages/babel-plugin-transform-runtime/src/index.js 75.4% <ø> (-21.32%)
packages/babel-helper-call-delegate/src/index.js 68% <ø> (-20%)
...kages/babel-traverse/src/path/lib/removal-hooks.js 59.25% <ø> (-18.52%)
...es/babel-plugin-transform-strict-mode/src/index.js 83.33% <ø> (-16.67%)
... and 119 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 87ca615...d33d023. Read the comment docs.

@hzoo hzoo merged commit d33d023 into 7.0 Feb 25, 2017
@hzoo hzoo added this to the Babel 7 milestone Feb 25, 2017
@hzoo hzoo deleted the merge-master branch February 25, 2017 17:23
@lock lock bot added the outdated A closed issue/PR that is archived due to age. Recommended to make a new issue label Oct 6, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Oct 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
outdated A closed issue/PR that is archived due to age. Recommended to make a new issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet