v7.0.0-beta.31

* add loose, useBuiltIns options to presets + use loose class properties

* whitelist helpers for babylon

* use transform-for-of-as-array in babylon

.babelrc.js

@@ -31,27 +31,34 @@ function istanbulHacks() {
 }
 
 let envOpts = {
-  loose: true
+  loose: true,
+  exclude: ["transform-typeof-symbol"],
 };
 
-module.exports = {
+const config = {
   comments: false,
   presets: [
-    ["env", envOpts],
-    "stage-0",
-    "flow"
+    ["@babel/env", envOpts],
+    "@babel/flow"
   ],
-  env: {
-    cov: {
-      auxiliaryCommentBefore: "istanbul ignore next",
-      plugins: [istanbulHacks]
-    }
-  }
+  plugins: [
+    ["@babel/proposal-class-properties", { loose: true }],
+    "@babel/proposal-export-namespace",
+    "@babel/proposal-numeric-separator",
+    ["@babel/proposal-object-rest-spread", { useBuiltIns: true}],
+  ]
 };
 
+if (process.env.BABEL_ENV === "cov") {
+  config.auxiliaryCommentBefore = "istanbul ignore next";
+  config.plugins.push(istanbulHacks);
+}
+
 if (process.env.BABEL_ENV === "development") {
   envOpts.targets = {
     node: "current"
   };
   envOpts.debug = true;
 }
+
+module.exports = config;

.eslintignore

@@ -20,6 +20,9 @@ experimental/babel-preset-env/data
 experimental/babel-preset-env/test/debug-fixtures
 packages/babel-standalone/babel.js
 packages/babel-standalone/babel.min.js
+packages/babylon/build
+packages/babylon/scripts
+packages/babylon/test/expressions
 
 # Prettier tries to insert trailing commas in function calls, which Node.js
 # doesn't natively support. This causes an error when loading the Gulp tasks.

.eslintrc

@@ -5,7 +5,8 @@
   ],
   "rules": {
     "curly": ["error", "multi-line"],
-    "prettier/prettier": ["error", { "trailingComma": "es5" }]
+    "prettier/prettier": ["error", { "trailingComma": "es5" }],
+    "no-case-declarations": "error"
   },
   "env": {
     "node": true,

.flowconfig

@@ -1,4 +1,5 @@
 [ignore]
+.*/build/.*
 .*/packages/.*/lib
 .*/packages/.*/test
 .*/codemods/.*/lib
@@ -21,4 +22,8 @@ lib/third-party-libs.js.flow
 [options]
 suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
 suppress_comment= \\(.\\|\n\\)*\\$FlowIssue
+suppress_comment= \\(.\\|\n\\)*\\$FlowIgnore
+suppress_type=$FlowFixMe
+suppress_type=$FlowSubtype
 esproposal.export_star_as=enable
+module.name_mapper='^@babel\/\([a-zA-Z0-9_\-]+\)$' -> '<PROJECT_ROOT>/packages/babel-\1/src/index'

.github/ISSUE_TEMPLATE.md

@@ -26,7 +26,7 @@ Choose one: is this a bug report or feature request?
 var your => (code) => here;
 ```
 
-### Babel Configuration (.babelrc, package.json, cli command)
+### Babel/Babylon Configuration (.babelrc, package.json, cli command)
 <!--- If describing a bug, tell us what your babel configuration looks like -->
 
 ```js
@@ -57,6 +57,7 @@ var your => (code) => here;
 | software         | version(s)
 | ---------------- | -------
 | Babel            |  
+| Babylon          | <!-- This is only needed if you are using Babylon directly -->
 | node             | 
 | npm              | 
 | Operating System | 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
-<!-- 
-Before making a PR please make sure to read our contributing guidelines 
+<!--
+Before making a PR please make sure to read our contributing guidelines
 https://github.com/babel/babel/blob/master/CONTRIBUTING.md
 
 For issue references: Add a comma-separated list of a [closing word](https://help.github.com/articles/closing-issues-via-commit-messages/) followed by the ticket number fixed by the PR. It should be underlined in the preview if done correctly.
@@ -8,11 +8,12 @@ For issue references: Add a comma-separated list of a [closing word](https://hel
 | Q                        | A <!--(Can use an emoji 👍) -->
 | ------------------------ | ---
 | Fixed Issues?            | `Fixes #1, Fixes #2` <!-- remove the (`) quotes to link the issues -->
-| Patch: Bug Fix?          | 
-| Major: Breaking Change?  | 
-| Minor: New Feature?      | 
+| Patch: Bug Fix?          |
+| Major: Breaking Change?  |
+| Minor: New Feature?      |
 | Tests Added + Pass?      | Yes
 | Documentation PR         | <!-- If so, add `[skip ci]` to your commit message to skip CI -->
-| Any Dependency Changes?  | 
+| Any Dependency Changes?  |
+| License                  | MIT
 
 <!-- Describe your changes below in as much detail as possible -->

.gitignore

@@ -3,11 +3,12 @@
 /packages/*/node_modules
 *.log
 *.cache
+/build
 /.eslintcache
 /browser.js
 /browser-polyfill.js
 /runtime.js
-/coverage
+coverage
 dist
 /.package.json
 package-lock.json
@@ -15,12 +16,16 @@ package-lock.json
 !/packages/babel-runtime/core-js/map.js
 /packages/babel-runtime/helpers/*.js
 !/packages/babel-runtime/helpers/toArray.js
+!/packages/babel-runtime/helpers/temporalRef.js
 /packages/babel-runtime/helpers/builtin/*.js
 !/packages/babel-runtime/helpers/builtin/toArray.js
+!/packages/babel-runtime/helpers/builtin/temporalRef.js
 /packages/babel-runtime/helpers/builtin/es6/*.js
 !/packages/babel-runtime/helpers/builtin/es6/toArray.js
+!/packages/babel-runtime/helpers/builtin/es6/temporalRef.js
 /packages/babel-runtime/helpers/es6/*.js
 !/packages/babel-runtime/helpers/es6/toArray.js
+!/packages/babel-runtime/helpers/es6/temporalRef.js
 /packages/babel-register/test/.babel
 /packages/babel-cli/test/tmp
 /packages/babel-node/test/tmp
@@ -31,3 +36,4 @@ packages/babel-standalone/babel.js
 packages/babel-standalone/babel.min.js
 /codemods/*/lib
 /codemods/*/node_modules
+/packages/babylon/build

.travis.yml

@@ -19,15 +19,25 @@ env:
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
 
+before_script:
+  - 'if [ "$JOB" = "babylon-flow-tests" ]; then make bootstrap-flow; fi'
+  - 'if [ "$JOB" = "babylon-test262-tests" ]; then make bootstrap-test262; fi'
+
 script:
   - 'if [ "$JOB" = "test" ]; then make test-ci; fi'
   - 'if [ "$JOB" = "lint" ]; then make lint && make flow; fi'
+  - 'if [ "$JOB" = "babylon-flow-tests" ]; then make test-flow-ci; fi'
+  - 'if [ "$JOB" = "babylon-test262-tests" ]; then make test-test262-ci; fi'
 
 matrix:
   fast_finish: true
   include:
     - node_js: "node"
       env: JOB=lint
+    - node_js: "node"
+      env: JOB=babylon-flow-tests
+    - node_js: "node"
+      env: JOB=babylon-test262-tests
 
 notifications:
   slack:

CHANGELOG.md

@@ -12,6 +12,7 @@
 _Note: Gaps between patch versions are faulty, broken or test releases._
 
 See [CHANGELOG - 6to5](/.github/CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
+See [Babylon's CHANGELOG](packages/babylon/CHANGELOG.md) for the Babylon pre-7.0.0-beta.29 version changelog.
 
 ## 6.26.0 (2017-08-16)
 

CONTRIBUTING.md

@@ -1,5 +1,3 @@
-# NOTE: DO NOT OPEN ISSUES FOR QUESTIONS AND SUPPORT. SEE THE README FOR MORE INFO.
-
 ----
 
 <p align="center" class="toc">
@@ -19,14 +17,14 @@
 
 # Contributing
 
-> Before contributing, please read our [code of conduct](https://github.com/babel/babel/blob/master/CODE_OF_CONDUCT.md).
-
-Contributions are always welcome, no matter how large or small.
+Contributions are always welcome, no matter how large or small. Before
+contributing, please read the
+[code of conduct](https://github.com/babel/babel/blob/master/CODE_OF_CONDUCT.md).
 
 ## Not sure where to start?
 
 - If you aren't just making a documentation change, you'll probably want to learn a bit about a few topics.
- - [ASTs](https://en.wikipedia.org/wiki/Abstract_syntax_tree) (Abstract Syntax Tree): The Babel AST [spec](https://github.com/babel/babylon/blob/master/ast/spec.md) is a bit different from [ESTree](https://github.com/estree/estree). The differences are listed [here](https://github.com/babel/babylon#output).
+ - [ASTs](https://en.wikipedia.org/wiki/Abstract_syntax_tree) (Abstract Syntax Tree): The Babel AST [spec](https://github.com/babel/babel/tree/master/packages/babylon/blob/master/ast/spec.md) is a bit different from [ESTree](https://github.com/estree/estree). The differences are listed [here](https://github.com/babel/babel/tree/master/packages/babylon#output).
  - Check out [`/doc`](https://github.com/babel/babel/tree/master/doc) for information about Babel's internals
  - Check out [the Babel Plugin Handbook](https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babel-plugin-handbook) - core plugins are written the same way as any other plugin!
  - Check out [AST Explorer](http://astexplorer.net/#/scUfOmVOG5) to learn more about ASTs or make your own plugin in the browser
@@ -117,7 +115,7 @@ $ TEST_ONLY=babel-cli make test
 `TEST_ONLY` will also match substrings of the package name:
 
 ```sh
-# Run tests for the babel-plugin-transform-es2015-classes package.
+# Run tests for the babel-plugin-transform-classes package.
 $ TEST_ONLY=es2015-class make test
 ```
 
@@ -148,7 +146,6 @@ $ BABEL_ENV=cov make build
 $ ./scripts/test-cov.sh
 ```
 
-
 #### Troubleshooting Tests
 
 In case you're not able to reproduce an error on CI locally, it may be due to
@@ -173,7 +170,7 @@ For example, in [`babel-plugin-transform-exponentiation-operator/test`](https://
 - There is an `index.js` file. It imports our [test helper](https://github.com/babel/babel/tree/master/packages/babel-helper-plugin-test-runner). (You don't have to worry about this).
 - There can be multiple folders under [`/fixtures`](https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-exponentiation-operator/test/fixtures)
    - There is an [`options.json`](https://github.com/babel/babel/blob/master/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/exponentian-operator/options.json) file whose function is similar to a `.babelrc` file, allowing you to pass in the plugins and settings you need for your tests.
-   - For this test, we only need the relevant plugin, so it's just `{ "plugins": ["transform-exponentiation-operator"] }`.
+   - For this test, we only need the relevant plugin, so it's just `{ "plugins": ["@babel/transform-exponentiation-operator"] }`.
    - If necessary, you can have an `options.json` with different options in each subfolder.
 
 - In each subfolder, you can organize your directory structure by categories of tests. (Example: these folders can be named after the feature you are testing or can reference the issue number they fix)
@@ -208,8 +205,8 @@ If you need to check for an error that is thrown you can add to the `options.jso
 ```js
 // options.json example
 {
-  "plugins": [["transform-object-rest-spread", { "useBuiltIns": "invalidOption" }]],
-  "throws": "transform-object-rest-spread currently only accepts a boolean option for useBuiltIns (defaults to false)"
+  "plugins": [["@babel/proposal-object-rest-spread", { "useBuiltIns": "invalidOption" }]],
+  "throws": "@babel/proposal-object-rest-spread currently only accepts a boolean option for useBuiltIns (defaults to false)"
 }
 ```
 
@@ -222,20 +219,33 @@ If the test requires a minimum Node version, you can add `minNodeVersion` (must
 }
 ```
 
+#### `babylon`
+
+Writing tests for Babylon is very
+similar to the other packages.
+Inside the `packages/babylon/tests/fixtures` folder are categories/groupings of test fixtures (es2015, flow,
+etc.). To add a test, create a folder under one of these groupings (or create a new one) with a
+descriptive name, and add the following:
+
+* Create an `actual.js` file that contains the code you want Babylon to parse.
+
+* Add an `expected.json` file with the expected parser output. For added convenience, if there is no `expected.json` present, the test runner will generate one for you.
+
 #### Bootstrapping expected output
 
 For both `babel-plugin-x` and `babylon`, you can easily generate an `expected.js`/`expected.json` automatically by just providing `actual.js` and running the tests as you usually would.
 
 ```
 // Example
-- babylon
-  - test
-    - fixtures
-      - comments
-        - basic
-          - block-trailing-comment
-            - actual.js
-            - expected.json (will be generated if not created)
+- packages
+  - babylon
+    - test
+      - fixtures
+        - comments
+          - basic
+            - block-trailing-comment
+              - actual.js
+              - expected.json (will be generated if not created)
 ```
 
 ### Debugging code
@@ -275,8 +285,20 @@ The debugger starts at the first executed line of code, which is Mocha's first l
 Click _Resume script execution_ <img src="https://i.imgur.com/TmYBn9d.png" alt="Resume script execution button." width="16"> to jump to the set breakpoint.
 Note that the code shown in Chrome DevTools is compiled code and therefore differs.
 
+## Creating a new plugin (`spec-new`)
+
+> Example: https://github.com/babel/babylon/pull/541
+
+- Create a new issue that describes the proposal (ex: [#538](https://github.com/babel/babylon/issues/538)). Include any relevant information like proposal repo/author, examples, parsing approaches, meeting notes, presentation slides, and more.
+- The pull request should include:
+  - [ ] An update to the [plugins](https://github.com/babel/babel/tree/master/packages/babylon#plugins) part of the readme. Add a new entry to that list for the new plugin flag (and link to the proposal)
+  - [ ] If any new nodes or modifications need to be added to the AST, update [ast/spec.md](https://github.com/babel/babel/bloc/master/packages/babylon/ast/spec.md)
+  - [ ] Make sure you use the `this.hasPlugin("plugin-name-here")` check in Babylon so that your new plugin code only runs when that flag is turned on (not default behavior)
+  - [ ] Add failing/passing tests according to spec behavior
+- Start working about the Babel transform itself!
+
 ## Internals
-- AST spec ([babylon/ast/spec.md](https://github.com/babel/babylon/blob/master/ast/spec.md))
+- AST spec ([babylon/ast/spec.md](https://github.com/babel/babel/tree/master/packages/babylon/blob/master/ast/spec.md))
 - Versioning ([doc/design/versioning.md](https://github.com/babel/babel/blob/master/doc/design/versioning.md)
 - Monorepo ([doc/design/monorepo.md](https://github.com/babel/babel/blob/master/doc/design/monorepo.md))
 - Compiler environment support ([doc/design/compiler-environment-support.md](https://github.com/babel/babel/blob/master/doc/design/compiler-environment-support.md))

Gulpfile.js

@@ -10,6 +10,7 @@ const newer = require("gulp-newer");
 const babel = require("gulp-babel");
 const watch = require("gulp-watch");
 const gutil = require("gulp-util");
+const filter = require("gulp-filter");
 const gulp = require("gulp");
 const path = require("path");
 const merge = require("merge-stream");
@@ -36,9 +37,11 @@ gulp.task("build", function() {
   return merge(
     sources.map(source => {
       const base = path.join(__dirname, source);
+      const f = filter(["**", "!**/packages/babylon/**"]);
 
       return gulp
         .src(getGlobFromSource(source), { base: base })
+        .pipe(f)
         .pipe(
           plumber({
             errorHandler: function(err) {
@@ -113,7 +116,15 @@ function webpackBuild() {
             // their project.json (or a ".babelrc" file). We need to ignore
             // those as we're using our own Babel options.
             babelrc: false,
-            presets: ["env"],
+            presets: [
+              [
+                "@babel/env",
+                {
+                  loose: true,
+                  exclude: ["transform-typeof-symbol"],
+                },
+              ],
+            ],
           },
         },
         {
@@ -125,10 +136,21 @@ function webpackBuild() {
             // their project.json (or a ".babelrc" file). We need to ignore
             // those as we're using our own Babel options.
             babelrc: false,
-            presets: ["env", "stage-0"],
+            presets: [
+              [
+                "@babel/env",
+                {
+                  loose: true,
+                  exclude: ["transform-typeof-symbol"],
+                },
+              ],
+              ["@babel/stage-0", { loose: true }],
+            ],
           },
         },
       ],
+      // babylon is already bundled and does not require parsing
+      noParse: [/babylon\/lib/],
     },
     node: {
       // Mock Node.js modules that Babel require()s but that we don't

Makefile

@@ -1,4 +1,6 @@
 MAKEFLAGS = -j1
+FLOW_COMMIT = 4cc2b9f7fadf2e9e445ee9b7b980c65d69d3fbc0
+TEST262_COMMIT = 1282e842febf418ca27df13fa4b32f7e5021b470
 
 export NODE_ENV = test
 
@@ -11,11 +13,17 @@ SOURCES = packages codemods experimental
 
 build: clean
 	make clean-lib
+  # Build babylon before building all other projects
+	make build-babylon
 	./node_modules/.bin/gulp build
 ifneq ("$(BABEL_ENV)", "cov")
 	make build-standalone
 endif
 
+build-babylon:
+	cd packages/babylon; \
+	./node_modules/.bin/rollup -c
+
 build-standalone:
 	./node_modules/.bin/gulp build-babel-standalone
 
@@ -67,6 +75,38 @@ test-ci-coverage:
 	./scripts/test-cov.sh
 	bash <(curl -s https://codecov.io/bash) -f coverage/coverage-final.json
 
+bootstrap-flow:
+	rm -rf ./build/flow
+	mkdir -p ./build
+	git clone --branch=master --single-branch --shallow-since=2017-01-01 https://github.com/facebook/flow.git ./build/flow
+	cd build/flow && git checkout $(FLOW_COMMIT)
+
+test-flow:
+	node scripts/tests/flow/run_babylon_flow_tests.js
+
+test-flow-ci:
+	make bootstrap
+	make test-flow
+
+test-flow-update-whitelist:
+	node scripts/tests/flow/run_babylon_flow_tests.js --update-whitelist
+
+bootstrap-test262:
+	rm -rf ./build/test262
+	mkdir -p ./build
+	git clone --branch=master --single-branch --shallow-since=2017-01-01 https://github.com/tc39/test262.git ./build/test262
+	cd build/test262 && git checkout $(TEST262_COMMIT)
+
+test-test262:
+	node scripts/tests/test262/run_babylon_test262.js
+
+test-test262-ci:
+	make bootstrap
+	make test-test262
+
+test-test262-update-whitelist:
+	node scripts/tests/test262/run_babylon_test262.js --update-whitelist
+
 publish:
 	git pull --rebase
 	make clean-lib

README.md

@@ -24,7 +24,7 @@
   <a href="https://medium.com/friendship-dot-js/i-peeked-into-my-node-modules-directory-and-you-wont-believe-what-happened-next-b89f63d21558"><img alt="Business Strategy Status" src="https://img.shields.io/badge/business%20model-flavortown-green.svg"></a>
 </p>
 
-Babel is community-driven and thus mostly maintained by a group of volunteers. It has a lot of [companies and projects](http://babeljs.io/users) using it but almost no sponsors/people funded to work on it. If you'd like to help maintain the future of the project, please consider:
+Babel is community-driven and thus mostly maintained by a group of [volunteers](https://babeljs.io/team). It has a lot of [companies and projects](http://babeljs.io/users) using it but almost no sponsors/people funded to work on it. If you'd like to help maintain the future of the project, please consider:
 
 - Giving developer time on the project. (Message us on [Twitter](https://twitter.com/babeljs) or [Slack](slack.babeljs.io))
 - [Giving funds by becoming a backer/sponsor on OpenCollective](https://opencollective.com/babel)
@@ -51,35 +51,34 @@ Babel is a tool that helps you write code in the latest version of JavaScript. W
 Try it out at our [REPL](https://babeljs.io/repl/build/master#?code_lz=NoRgNATGDMC6B0BbAhgBwBQDsAEBeAfNjgNTYgCUA3EA&lineWrap=true&presets=es2015%2Ces2016%2Ces2017&version=7.0.0-beta.2).
 
 - [FAQ](#faq)
-- [Team](#team)
 - [Backers](#backers)
 - [Sponsors](#sponsors)
 - [License](#license)
 
 ## FAQ
 
-### Docs?
+### Who maintains Babel?
 
-Check out our website: [babeljs.io](http://babeljs.io/)
+Mostly a handful of volunteers! Please check out our [team page](https://babeljs.io/team)!
 
 ### Looking for support?
 
 For questions and support please visit join our [Slack Community](https://slack.babeljs.io/), ask a question on [Stack Overflow](http://stackoverflow.com/questions/tagged/babeljs), or ping us on [Twitter](https://twitter.com/babeljs/).
 
+### Where are the docs?
+
+Check out our website: [babeljs.io](http://babeljs.io/), and report issues/features at [babel/website](https://github.com/babel/website/issues).
+
 ### Want to report a bug or request a feature?
 
 Please read through our [CONTRIBUTING.md](https://github.com/babel/babel/blob/master/CONTRIBUTING.md) and fill out the issue template at [babel/issues](https://github.com/babel/babel/issues)!
 
-### Want to report an issue with our website ([babeljs.io](https://babeljs.io))?
-
-For docs/website issues please visit the [babel/website](https://github.com/babel/website/issues).
-
 ### Want to contribute to Babel?
 
 Check out our [CONTRIBUTING.md](https://github.com/babel/babel/blob/master/CONTRIBUTING.md) to get started with setting up the repo.
 
 - If you have already joined Slack, join our [#development](https://babeljs.slack.com/messages/development) channel and say hi!
-- Check out the issues with the [good first issue](https://github.com/babel/babel/labels/good%20first%20issue) and [help wanted](https://github.com/babel/babel/labels/help%20wanted) label.
+- Check out the issues with the [good first issue](https://github.com/babel/babel/labels/good%20first%20issue) and [help wanted](https://github.com/babel/babel/labels/help%20wanted) label. We suggest also looking at the closed ones to get a sense of the kinds of issues you can tackle.
 - Our discussions/notes/roadmap: [babel/notes](https://github.com/babel/notes)
 - Our progress on TC39 proposals: [babel/proposals](https://github.com/babel/proposals)
 
@@ -87,46 +86,6 @@ Check out our [CONTRIBUTING.md](https://github.com/babel/babel/blob/master/CONTR
 
 The Babel repo is managed as a [monorepo](https://github.com/babel/babel/blob/master/doc/design/monorepo.md) that is composed of many [npm packages](/packages#readme).
 
-## Team
-
-### Core members
-
-[![Babel](https://avatars.githubusercontent.com/u/9637642?s=64)](https://github.com/babel) | [![Daniel Tschinder](https://avatars.githubusercontent.com/u/231804?s=64)](https://github.com/danez) | [![Logan Smyth](https://avatars.githubusercontent.com/u/132260?s=64)](https://github.com/loganfsmyth) | [![Henry Zhu](https://avatars.githubusercontent.com/u/588473?s=64)](https://github.com/hzoo) |
-|---|---|---|---|
-Babel | Daniel Tschinder | Logan Smyth | Henry Zhu |
-:octocat: [@babel](https://github.com/babel) | [@danez](https://github.com/danez) | [@loganfsmyth](https://github.com/loganfsmyth) | [@hzoo](https://github.com/hzoo) |
-:bird: [@babeljs](https://twitter.com/babeljs) | [@TschinderDaniel](https://twitter.com/TschinderDaniel) | [@loganfsmyth](https://twitter.com/loganfsmyth) | [@left_pad](https://twitter.com/left_pad) |
-
-### Members
-
-[![Andrew Levine](https://avatars.githubusercontent.com/u/5233399?s=64)](https://github.com/drewml) | [![Boopathi Rajaa](https://avatars.githubusercontent.com/u/294474?s=64)](https://github.com/boopathi) | [![Brian Ng](https://avatars.githubusercontent.com/u/56288?s=64)](https://github.com/existentialism) | [![Dan Harper](https://avatars.githubusercontent.com/u/510740?s=64)](https://github.com/danharper) | [![diogo franco](https://avatars.githubusercontent.com/u/73085?s=64)](https://github.com/kovensky) | [![Aaron Ang](https://avatars1.githubusercontent.com/u/7579804?s=64)](https://github.com/aaronang) | [![Artem Yavorsky](https://avatars2.githubusercontent.com/u/1521229?s=64)](https://github.com/yavorsky) |
-|---|---|---|---|---|---|---|
-| Andrew Levine | Boopathi Rajaa | Brian Ng | Dan Harper | Diogo Franco | Aaron Ang | Artem Yavorsky |
-| [@drewml](https://github.com/drewml) | [@boopathi](https://github.com/boopathi) | [@existentialism](https://github.com/existentialism) | [@danharper](https://github.com/danharper) | [@kovensky](https://github.com/kovensky) | [@aaronang](https://github.com/aaronang) | [@yavorsky](https://github.com/yavorsky) |
-| [@drewml](https://twitter.com/drewml) | [@heisenbugger](https://twitter.com/heisenbugger) | [@existentialism](https://twitter.com/existentialism) | [@DanHarper7](https://twitter.com/DanHarper7) | [@kovnsk](https://twitter.com/kovnsk) | [@_aaronang](https://twitter.com/_aaronang) | [@yavorsky_](https://twitter.com/yavorsky_) |
-
-[![Juriy Zaytsev](https://avatars.githubusercontent.com/u/383?s=64)](https://github.com/kangax) | [![Kai Cataldo](https://avatars.githubusercontent.com/u/7041728?s=64)](https://github.com/kaicataldo) | [![Moti Zilberman](https://avatars.githubusercontent.com/u/2246565?s=64)](https://github.com/motiz88) | [![Sven Sauleau](https://avatars3.githubusercontent.com/u/1493671?s=64)](https://github.com/xtuc) | [![Samuel Reed](https://avatars3.githubusercontent.com/u/1197375?s=64)](https://github.com/STRML) | [![Sergey Rubanov](https://avatars1.githubusercontent.com/u/1507086?s=64)](https://github.com/chicoxyzzy) |
-|---|---|---|---|---|---|
-| Juriy Zaytsev | Kai Cataldo | Moti Zilberman | Sven Sauleau | Samuel Reed | Sergey Rubanov |
-| [@kangax](https://github.com/kangax) | [@kaicataldo](https://github.com/kaicataldo) | [@motiz88](https://github.com/motiz88) | [@xtuc](https://github.com/xtuc) | [@STRML](https://github.com/STRML) | [@chicoxyzzy](https://github.com/chicoxyzzy) |
-| [@kangax](https://twitter.com/kangax) | [@kai_cataldo](https://twitter.com/kai_cataldo) | [@motiz88](https://twitter.com/motiz88) | [@svensauleau](https://twitter.com/svensauleau) | [@STRML_](https://twitter.com/STRML_) | [@chicoxyzzy](https://twitter.com/chicoxyzzy) |
-
-### Non-Human Members
-
-[<img src="https://github.com/babel/babel-bot/raw/master/babel-bot.png" height="64">](https://github.com/babel-bot) |
-|---|
-| Babel Bot |
-| [@babel-bot](https://github.com/babel-bot) |
-| [@babeljs](https://twitter.com/babeljs) |
-
-### Inactive members
-
-[![Amjad Masad](https://avatars.githubusercontent.com/u/587518?s=64)](https://github.com/amasad) | [![James Kyle](https://avatars.githubusercontent.com/u/952783?s=64)](https://github.com/thejameskyle) | [![Jesse McCarthy](https://avatars.githubusercontent.com/u/129203?s=64)](https://github.com/jmm) | [![Sebastian McKenzie](https://avatars.githubusercontent.com/u/853712?s=64)](https://github.com/kittens) (Creator) |
-|---|---|---|---|
-Amjad Masad | James Kyle | Jesse McCarthy | Sebastian McKenzie |
-[@amasad](https://github.com/amasad) | [@thejameskyle](https://github.com/thejameskyle) | [@jmm](https://github.com/jmm) | [@sebmck](https://twitter.com/sebmck) |
-| [@amasad](https://twitter.com/amasad) | [@thejameskyle](https://twitter.com/thejameskyle) | [@mccjm](https://twitter.com/mccjm) | [@kittens](https://github.com/kittens)
-
 ## Backers
 
 Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/babel#backer)]

codemods/babel-plugin-codemod-optional-catch-binding/README.md

@@ -1,4 +1,4 @@
-# babel-plugin-codemod-optional-catch-binding
+# @babel/plugin-codemod-optional-catch-binding
 
 > If the argument bound to the catch block is not referenced in the catch block, that argument and the catch binding is removed.
 
@@ -22,11 +22,10 @@ try {
 }
 ```
 
-
 ## Installation
 
 ```sh
-npm install --save-dev babel-plugin-codemod-optional-catch-binding
+npm install --save-dev @babel/plugin-codemod-optional-catch-binding
 ```
 
 ## Usage
@@ -37,21 +36,21 @@ npm install --save-dev babel-plugin-codemod-optional-catch-binding
 
 ```json
 {
-  "plugins": ["codemod-optional-catch-binding"]
+  "plugins": ["@babel/codemod-optional-catch-binding"]
 }
 ```
 
 ### Via CLI
 
 ```sh
-babel --plugins codemod-optional-catch-binding script.js
+babel --plugins @babel/codemod-optional-catch-binding script.js
 ```
 
 ### Via Node API
 
 ```javascript
-require("babel-core").transform("code", {
-  plugins: ["codemod-optional-catch-binding"]
+require("@babel/core").transform("code", {
+  plugins: ["@babel/codemod-optional-catch-binding"]
 });
 ```
 

codemods/babel-plugin-codemod-optional-catch-binding/package.json

@@ -1,17 +1,21 @@
 {
-  "name": "babel-plugin-codemod-optional-catch-binding",
-  "version": "7.0.0-beta.3",
+  "name": "@babel/plugin-codemod-optional-catch-binding",
+  "version": "7.0.0-beta.31",
   "description": "Remove unused catch bindings",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-remove-unused-catch-binding",
   "license": "MIT",
   "main": "lib/index.js",
   "keywords": [
-    "babel-plugin"
+    "@babel/plugin"
   ],
   "dependencies": {
-    "babel-plugin-syntax-optional-catch-binding": "7.0.0-beta.3"
+    "@babel/plugin-syntax-optional-catch-binding": "7.0.0-beta.31"
+  },
+  "peerDependencies": {
+    "@babel/core": "7.0.0-beta.31"
   },
   "devDependencies": {
-    "babel-helper-plugin-test-runner": "7.0.0-beta.3"
+    "@babel/core": "7.0.0-beta.31",
+    "@babel/helper-plugin-test-runner": "7.0.0-beta.31"
   }
 }

codemods/babel-plugin-codemod-optional-catch-binding/src/index.js

@@ -1,4 +1,4 @@
-import syntaxOptionalCatchBinding from "babel-plugin-syntax-optional-catch-binding";
+import syntaxOptionalCatchBinding from "@babel/plugin-syntax-optional-catch-binding";
 
 export default function(babel) {
   const { types: t } = babel;

codemods/babel-plugin-codemod-optional-catch-binding/test/index.js

@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);

experimental/babel-preset-env/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v1.6.1 (2017-10-17)
+
+### :bug: Bug Fix
+
+- Update compat table to fix two small issues ([#445](https://github.com/babel/babel-preset-env/pull/445)) (@danez)
+
+ES2015 destructuring is not fully supported in Edge 15 and the polyfill required again. `es6.math.imul` is supported on Android as of version 4.4
+
+- Add polyfills for ES6 static Object methods ([#441](https://github.com/babel/babel-preset-env/pull/441)) (@danez)
+
+Functions such as `Object.keys`, `Object.freeze`, ... do already exist in ES5, but their behaviour changed in ES2015. `babel-preset-env` with `builtIns: true` now adds the core-js polyfills for this methods if the browser only supports the ES5 variant of the method (like IE11 for example)
+
+- Normalize module format of plugins/built-ins data ([#376](https://github.com/babel/babel-preset-env/pull/376)) (@rtsao)
+
 ## v1.6.0 (2017-07-04)
 
 ### :rocket: New Feature
@@ -101,10 +115,10 @@ correctly report issues before they get transpiled away).
 
 - Allow use `babel-plugin-` prefix for include and exclude ([#242](https://github.com/babel/babel-preset-env/pull/242)) (@yavorsky)
 
-The `include` and `exclude` options now allow both prefixed (`babel-plugin-transform-es2015-spread`) 
+The `include` and `exclude` options now allow both prefixed (`babel-plugin-transform-es2015-spread`)
 and prefix-less (`transform-es2015-spread`) plugin names.
 
-### :memo: Documentation 
+### :memo: Documentation
 
 - Note babel plugin prefix handling in include/exclude ([#245](https://github.com/babel/babel-preset-env/pull/245)) (@existentialism)
 - Fix README: debug option shows info in stdout. ([#236](https://github.com/babel/babel-preset-env/pull/236)) (@Gerhut)
@@ -129,14 +143,14 @@ and prefix-less (`transform-es2015-spread`) plugin names.
 - Add check for ArrayBuffer[Symbol.species] ([#233](https://github.com/babel/babel-preset-env/pull/233)) (@existentialism)
 
 We now properly check for `Symbol.species` support in ArrayBuffer and include the
-polyfill if necessary. This should, as a side effect, fix ArrayBuffer-related 
+polyfill if necessary. This should, as a side effect, fix ArrayBuffer-related
 errors on IE9.
 
 ### :nail_care: Polish
 
 - Fill data with electron as a target. ([#229](https://github.com/babel/babel-preset-env/pull/229)) (@yavorsky)
 
-We've simplified things by adding `electron` as a target instead of doing a bunch of 
+We've simplified things by adding `electron` as a target instead of doing a bunch of
 things at runtime. Electron targets should now also be displayed in the debug output.
 
 - separate default builtins for platforms ([#226](https://github.com/babel/babel-preset-env/pull/226)) (@restrry)
@@ -144,7 +158,7 @@ things at runtime. Electron targets should now also be displayed in the debug ou
 If you are targeting the `node` environment exclusively, the always-included web polyfills
 (like `dom.iterable`, and a few others) will now no longer be included.
 
-### :memo: Documentation 
+### :memo: Documentation
 
  * remove deprecated projects ([#223](https://github.com/babel/babel-preset-env/pull/223)) [skip ci] (@stevemao)
 
@@ -158,8 +172,8 @@ If you are targeting the `node` environment exclusively, the always-included web
 
 - Refactor browser data parsing to handle families ([#208](https://github.com/babel/babel-preset-env/pull/208)) (@existentialism)
 
-When parsing plugin data, we weren't properly handling browser families. This caused 
-`transform-es2015-block-scoping` and other plugins to be incorrectly added for Edge >= 12. 
+When parsing plugin data, we weren't properly handling browser families. This caused
+`transform-es2015-block-scoping` and other plugins to be incorrectly added for Edge >= 12.
 (s/o to @mgol for the the report and review!)
 
 - Add typed array methods to built-ins features. ([#198](https://github.com/babel/babel-preset-env/pull/198)) (@yavorsky)
@@ -259,7 +273,7 @@ Given targets:
 ```txt
 {
   "firefox": 52,
-  "node": 7.4 
+  "node": 7.4
 }
 ```
 
@@ -305,7 +319,7 @@ Using plugins:
 - Update yarnfile ([#145](https://github.com/babel/babel-preset-env/pull/145)) (@baer)
 - devDeps: eslint-config-babel v5.0.0 ([#139](https://github.com/babel/babel-preset-env/pull/139)) (@kaicataldo)
 - Update compat-table, build data ([#135](https://github.com/babel/babel-preset-env/pull/135)) (@hzoo)
- 
+
 ## v1.1.8 (2017-01-10)
 
 ### :bug: Bug Fix
@@ -320,7 +334,7 @@ Makes sure that all transformations on `targets` (such as `exclude`/`include`) a
 - Include yarn.lock and update CI. ([#124](https://github.com/babel/babel-preset-env/pull/124)) (@existentialism)
 
 ## v1.1.7 (2017-01-09)
- 
+
 Had a publishing issue in the previous release.
 
 ## v1.1.6 (2017-01-06)
@@ -494,7 +508,7 @@ In
 
 ```js
 import "babel-polyfill"; // create an entry js file that contains this
-// or 
+// or
 import "core-js";
 ```
 

experimental/babel-preset-env/CONTRIBUTING.md

@@ -20,7 +20,7 @@ And add them in this structure:
 
 ```js
 // es2016
-"transform-exponentiation-operator": {
+"@babel/transform-exponentiation-operator": {
   features: [
     "exponentiation (**) operator",
   ],

experimental/babel-preset-env/README.md

@@ -1,16 +1,16 @@
-# babel-preset-env [![npm](https://img.shields.io/npm/v/babel-preset-env.svg)](https://www.npmjs.com/package/babel-preset-env) [![travis](https://img.shields.io/travis/babel/babel-preset-env/master.svg)](https://travis-ci.org/babel/babel-preset-env) [![npm-downloads](https://img.shields.io/npm/dm/babel-preset-env.svg)](https://www.npmjs.com/package/babel-preset-env) [![codecov](https://img.shields.io/codecov/c/github/babel/babel-preset-env/master.svg?maxAge=43200)](https://codecov.io/github/babel/babel-preset-env)
+# @babel/preset-env [![npm](https://img.shields.io/npm/v/babel-preset-env.svg)](https://www.npmjs.com/package/babel-preset-env) [![travis](https://img.shields.io/travis/babel/babel-preset-env/master.svg)](https://travis-ci.org/babel/babel-preset-env) [![npm-downloads](https://img.shields.io/npm/dm/babel-preset-env.svg)](https://www.npmjs.com/package/babel-preset-env) [![codecov](https://img.shields.io/codecov/c/github/babel/babel-preset-env/master.svg?maxAge=43200)](https://codecov.io/github/babel/babel-preset-env)
 
 > A Babel preset that compiles [ES2015+](https://github.com/tc39/proposals/blob/master/finished-proposals.md) down to ES5 by automatically determining the Babel plugins and polyfills you need based on your targeted browser or runtime environments.
 
 ```sh
-npm install babel-preset-env --save-dev
+npm install @babel/preset-env --save-dev
 ```
 
-Without any configuration options, babel-preset-env behaves exactly the same as babel-preset-latest (or babel-preset-es2015, babel-preset-es2016, and babel-preset-es2017 together).
+Without any configuration options, @babel/preset-env behaves exactly the same as @babel/preset-latest (or @babel/preset-es2015, @babel/preset-es2016, and @babel/preset-es2017 together).
 
 ```json
 {
-  "presets": ["env"]
+  "presets": ["@babel/env"]
 }
 ```
 
@@ -21,7 +21,7 @@ This example only includes the polyfills and code transforms needed for the last
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "browsers": ["last 2 versions", "safari >= 7"]
       }
@@ -35,7 +35,7 @@ Similarly, if you're targeting Node.js instead of the browser, you can configure
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "node": "6.10"
       }
@@ -49,7 +49,7 @@ For convenience, you can use `"node": "current"` to only include the necessary p
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "node": "current"
       }
@@ -85,9 +85,9 @@ This should be straightforward to do in most cases. There might be cases where p
 
 ### Support all plugins in Babel that are considered `latest`
 
-> Default behavior without options is the same as `babel-preset-latest`.
+> Default behavior without options is the same as `@babel/preset-latest`.
 
-It won't include `stage-x` plugins. env will support all plugins in what we consider the latest version of JavaScript (by matching what we do in [`babel-preset-latest`](http://babeljs.io/docs/plugins/preset-latest/)).
+It won't include `stage-x` plugins. env will support all plugins in what we consider the latest version of JavaScript (by matching what we do in [`@babel/preset-latest`](http://babeljs.io/docs/plugins/preset-latest/)).
 
 Ref: [#14](https://github.com/babel/babel-preset-env/issues/14)
 
@@ -109,7 +109,7 @@ Ref: [#19](https://github.com/babel/babel-preset-env/pull/19)
 
 [Browserslist](https://github.com/ai/browserslist) is a library used to share a supported list of browsers between different front-end tools like [autoprefixer](https://github.com/postcss/autoprefixer), [stylelint](https://stylelint.io/), [eslint-plugin-compat](https://github.com/amilajack/eslint-plugin-compat) and many others.
 
-By default, babel-preset-env will use [browserslist config sources](https://github.com/ai/browserslist#queries).
+By default, @babel/preset-env will use [browserslist config sources](https://github.com/ai/browserslist#queries).
 
 For example, to enable only the polyfills and plugins needed for a project targeting *last 2 versions* and *IE10*:
 
@@ -117,8 +117,8 @@ For example, to enable only the polyfills and plugins needed for a project targe
 ```json
 {
   "presets": [
-    ["env", {
-      "useBuiltIns": true
+    ["@babel/env", {
+      "useBuiltIns": "entry"
     }]
   ]
 }
@@ -152,22 +152,22 @@ Browserslist config will be ignored if: 1) `targets.browsers` was specified 2) o
 With [npm](https://www.npmjs.com):
 
 ```sh
-npm install --save-dev babel-preset-env
+npm install --save-dev @babel/preset-env
 ```
 
 Or [yarn](https://yarnpkg.com):
 
 ```sh
-yarn add babel-preset-env --dev
+yarn add @babel/preset-env --dev
 ```
 
 ## Usage
 
-The default behavior without options runs all transforms (behaves the same as [babel-preset-latest](https://babeljs.io/docs/plugins/preset-latest/)).
+The default behavior without options runs all transforms (behaves the same as [@babel/preset-latest](https://babeljs.io/docs/plugins/preset-latest/)).
 
 ```json
 {
-  "presets": ["env"]
+  "presets": ["@babel/env"]
 }
 ```
 
@@ -235,15 +235,15 @@ An array of plugins to always include.
 
 Valid options include any:
 
-- [Babel plugins](https://github.com/babel/babel-preset-env/blob/master/data/plugin-features.js) - both with (`babel-plugin-transform-es2015-spread`) and without prefix (`transform-es2015-spread`) are supported.
+- [Babel plugins](https://github.com/babel/babel-preset-env/blob/master/data/plugin-features.js) - both with (`@babel/plugin-transform-spread`) and without prefix (`transform-spread`) are supported.
 
 - [Built-ins](https://github.com/babel/babel-preset-env/blob/master/data/built-in-features.js), such as `map`, `set`, or `object.assign`.
 
 This option is useful if there is a bug in a native implementation, or a combination of a non-supported feature + a supported one doesn't work.
 
-For example, Node 4 supports native classes but not spread. If `super` is used with a spread argument, then the `transform-es2015-classes` transform needs to be `include`d, as it is not possible to transpile a spread with `super` otherwise.
+For example, Node 4 supports native classes but not spread. If `super` is used with a spread argument, then the `transform-classes` transform needs to be `include`d, as it is not possible to transpile a spread with `super` otherwise.
 
-> NOTE: The `include` and `exclude` options _only_ work with the [plugins included with this preset](https://github.com/babel/babel-preset-env/blob/master/data/plugin-features.js); so, for example, including `transform-do-expressions` or excluding `transform-function-bind` will throw errors. To use a plugin _not_ included with this preset, add them to your [config](https://babeljs.io/docs/usage/babelrc/) directly.
+> NOTE: The `include` and `exclude` options _only_ work with the [plugins included with this preset](https://github.com/babel/babel-preset-env/blob/master/data/plugin-features.js); so, for example, including `proposal-do-expressions` or excluding `proposal-function-bind` will throw errors. To use a plugin _not_ included with this preset, add them to your [config](https://babeljs.io/docs/usage/babelrc/) directly.
 
 ### `exclude`
 
@@ -253,16 +253,16 @@ An array of plugins to always exclude/remove.
 
 The possible options are the same as the `include` option.
 
-This option is useful for "blacklisting" a transform like `transform-regenerator` if you don't use generators and don't want to include `regeneratorRuntime` (when using `useBuiltIns`) or for using another plugin like [fast-async](https://github.com/MatAtBread/fast-async) instead of [Babel's async-to-gen](http://babeljs.io/docs/plugins/transform-async-generator-functions/).
+This option is useful for "blacklisting" a transform like `transform-regenerator` if you don't use generators and don't want to include `regeneratorRuntime` (when using `useBuiltIns`) or for using another plugin like [fast-async](https://github.com/MatAtBread/fast-async) instead of [Babel's async-to-gen](http://babeljs.io/docs/plugins/proposal-async-generator-functions/).
 
 ### `useBuiltIns`
 
 `"usage"` | `"entry"` | `false`, defaults to `false`.
 
-A way to apply `babel-preset-env` for polyfills (via `babel-polyfill`).
+A way to apply `@babel/preset-env` for polyfills (via `@babel/polyfill`).
 
 ```sh
-npm install babel-polyfill --save
+npm install @babel/polyfill --save
 ```
 
 #### `useBuiltIns: 'usage'`
@@ -286,12 +286,12 @@ var b = new Map();
 **Out (if environment doesn't support it)**
 
 ```js
-import "babel-polyfill/core-js/modules/es6.promise";
+import "@babel/polyfill/core-js/modules/es6.promise";
 var a = new Promise();
 ```
 
 ```js
-import "babel-polyfill/core-js/modules/es6.map";
+import "@babel/polyfill/core-js/modules/es6.map";
 var b = new Map();
 ```
 
@@ -307,28 +307,28 @@ var b = new Map();
 
 #### `useBuiltIns: 'entry'`
 
-> NOTE: Only use `require("babel-polyfill");` once in your whole app.
-> Multiple imports or requires of `babel-polyfill` will throw an error since it can cause global collisions and other issues that are hard to trace.
+> NOTE: Only use `require("@babel/polyfill");` once in your whole app.
+> Multiple imports or requires of `@babel/polyfill` will throw an error since it can cause global collisions and other issues that are hard to trace.
 > We recommend creating a single entry file that only contains the `require` statement.
 
-This option enables a new plugin that replaces the statement `import "babel-polyfill"` or `require("babel-polyfill")` with individual requires for `babel-polyfill` based on environment.
+This option enables a new plugin that replaces the statement `import "@babel/polyfill"` or `require("@babel/polyfill")` with individual requires for `@babel/polyfill` based on environment.
 
 **In**
 
 ```js
-import "babel-polyfill";
+import "@babel/polyfill";
 ```
 
 **Out (different based on environment)**
 
 ```js
-import "babel-polyfill/core-js/modules/es7.string.pad-start";
-import "babel-polyfill/core-js/modules/es7.string.pad-end";
+import "@babel/polyfill/core-js/modules/es7.string.pad-start";
+import "@babel/polyfill/core-js/modules/es7.string.pad-end";
 ```
 
 #### `useBuiltIns: false`
 
-Don't add polyfills automatically per file, or transform `import "babel-polyfill"` to individual polyfills.
+Don't add polyfills automatically per file, or transform `import "@babel/polyfill"` to individual polyfills.
 
 ### `forceAllTransforms`
 
@@ -342,7 +342,7 @@ Don't add polyfills automatically per file, or transform `import "babel-polyfill
   ```js
   module.exports = {
     presets: [
-      ["env", {
+      ["@babel/env", {
         targets: {
           chrome: 59,
           edge: 13,
@@ -387,7 +387,7 @@ Toggles whether or not [browserslist config sources](https://github.com/ai/brows
 
 `boolean`, defaults to `false`
 
-Toggles enabling support for builtin/feature proposals that have shipped in browsers. If your target environments have native support for a feature proposal, its matching parser syntax plugin is enabled instead of performing any transform. Note that this _does not_ enable the same transformations as [`babel-preset-stage3`](https://babeljs.io/docs/plugins/preset-stage-3/), since proposals can continue to change before landing in browsers.
+Toggles enabling support for builtin/feature proposals that have shipped in browsers. If your target environments have native support for a feature proposal, its matching parser syntax plugin is enabled instead of performing any transform. Note that this _does not_ enable the same transformations as [`@babel/preset-stage3`](https://babeljs.io/docs/plugins/preset-stage-3/), since proposals can continue to change before landing in browsers.
 
 The following are currently supported:
 
@@ -419,7 +419,7 @@ export class A {}
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "chrome": 52
       }
@@ -442,7 +442,7 @@ exports.A = A;
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "chrome": 52
       },
@@ -466,7 +466,7 @@ export class A {}
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "chrome": 52,
         "browsers": ["last 2 versions", "safari 7"]
@@ -491,7 +491,7 @@ export var A = function A() {
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "node": "current"
       }
@@ -514,12 +514,12 @@ exports.A = A;
 ```json
 {
   "presets": [
-    [ "env", {
+    ["@babel/env", {
       "targets": {
         "safari": 10
       },
       "modules": false,
-      "useBuiltIns": true,
+      "useBuiltIns": "entry",
       "debug": true
     }]
   ]
@@ -556,12 +556,12 @@ Using polyfills:
 ```json
 {
   "presets": [
-    ["env", {
+    ["@babel/env", {
       "targets": {
         "browsers": ["last 2 versions", "safari >= 7"]
       },
-      "include": ["transform-es2015-arrow-functions", "es6.map"],
-      "exclude": ["transform-regenerator", "es6.set"]
+      "include": ["@babel/transform-arrow-functions", "es6.map"],
+      "exclude": ["@babel/transform-regenerator", "es6.set"]
     }]
   ]
 }
@@ -569,4 +569,4 @@ Using polyfills:
 
 ## Issues
 
-If you get a `SyntaxError: Unexpected token ...` error when using the [object-rest-spread](https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-rest-spread) transform then make sure the plugin has been updated to, at least, `v6.19.0`.
+If you get a `SyntaxError: Unexpected token ...` error when using the [object-rest-spread](https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-object-rest-spread) transform then make sure the plugin has been updated to, at least, `v6.19.0`.

experimental/babel-preset-env/data/built-in-features.js

@@ -109,6 +109,18 @@ const es2015 = {
     ]
   },
 
+  "es6.object.freeze": "Object static methods accept primitives / Object.freeze",
+  "es6.object.seal": "Object static methods accept primitives / Object.seal",
+  "es6.object.prevent-extensions": "Object static methods accept primitives / Object.preventExtensions",
+  "es6.object.is-frozen": "Object static methods accept primitives / Object.isFrozen",
+  "es6.object.is-sealed": "Object static methods accept primitives / Object.isSealed",
+  "es6.object.is-extensible": "Object static methods accept primitives / Object.isExtensible",
+  "es6.object.get-own-property-descriptor":
+    "Object static methods accept primitives / Object.getOwnPropertyDescriptor",
+  "es6.object.get-prototype-of": "Object static methods accept primitives / Object.getPrototypeOf",
+  "es6.object.keys": "Object static methods accept primitives / Object.keys",
+  "es6.object.get-own-property-names": "Object static methods accept primitives / Object.getOwnPropertyNames",
+
   "es6.object.assign": "Object static methods / Object.assign",
   "es6.object.is": "Object static methods / Object.is",
   "es6.object.set-prototype-of": "Object static methods / Object.setPrototypeOf",

experimental/babel-preset-env/data/built-ins.json

@@ -300,6 +300,106 @@
     "opera": "38",
     "electron": "1.2"
   },
+  "es6.object.freeze": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.seal": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.prevent-extensions": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.is-frozen": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.is-sealed": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.is-extensible": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.get-own-property-descriptor": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.get-prototype-of": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "3.5",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.keys": {
+    "chrome": "40",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "27",
+    "electron": "0.21"
+  },
+  "es6.object.get-own-property-names": {
+    "chrome": "40",
+    "edge": "12",
+    "firefox": "33",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "opera": "27",
+    "electron": "0.21"
+  },
   "es6.object.assign": {
     "chrome": "45",
     "edge": "12",

experimental/babel-preset-env/data/plugin-features.js

@@ -1,101 +1,101 @@
 const es2015 = {
-  "check-es2015-constants": {
+  "check-constants": {
     features: [
       "const",
     ],
   },
-  "transform-es2015-arrow-functions": {
+  "transform-arrow-functions": {
     features: [
       "arrow functions",
     ],
   },
-  "transform-es2015-block-scoped-functions": {
+  "transform-block-scoped-functions": {
     features: [
       "block-level function declaration"
     ],
   },
-  "transform-es2015-block-scoping": {
+  "transform-block-scoping": {
     features: [
       "const",
       "let",
     ],
   },
-  "transform-es2015-classes": {
+  "transform-classes": {
     features: [
       "class",
       "super",
     ],
   },
-  "transform-es2015-computed-properties": {
+  "transform-computed-properties": {
     features: [
       "object literal extensions / computed properties",
     ],
   },
-  "transform-es2015-destructuring": {
+  "transform-destructuring": {
     features: [
       "destructuring, assignment",
       "destructuring, declarations",
       "destructuring, parameters",
     ],
   },
-  "transform-es2015-duplicate-keys": {
+  "transform-duplicate-keys": {
     features: [
       "miscellaneous / duplicate property names in strict mode",
     ],
   },
-  "transform-es2015-for-of": {
+  "transform-for-of": {
     features: [
       "for..of loops",
     ],
   },
-  "transform-es2015-function-name": {
+  "transform-function-name": {
     features: [
       "function \"name\" property",
     ]
   },
-  "transform-es2015-literals": {
+  "transform-literals": {
     features: [
       "Unicode code point escapes",
     ],
   },
-  "transform-es2015-object-super": {
+  "transform-object-super": {
     features: [
       "super",
     ],
   },
-  "transform-es2015-parameters": {
+  "transform-parameters": {
     features: [
       "default function parameters",
       "rest parameters",
     ],
   },
-  "transform-es2015-shorthand-properties": {
+  "transform-shorthand-properties": {
     features: [
       "object literal extensions / shorthand properties",
     ],
   },
-  "transform-es2015-spread": {
+  "transform-spread": {
     features: [
       "spread (...) operator",
     ],
   },
-  "transform-es2015-sticky-regex": {
+  "transform-sticky-regex": {
     features: [
       "RegExp \"y\" and \"u\" flags / \"y\" flag, lastIndex",
       "RegExp \"y\" and \"u\" flags / \"y\" flag",
     ],
   },
-  "transform-es2015-template-literals": {
+  "transform-template-literals": {
     features: [
       "template literals",
     ],
   },
-  "transform-es2015-typeof-symbol": {
+  "transform-typeof-symbol": {
     features: [
       "Symbol / typeof support"
     ],
   },
-  "transform-es2015-unicode-regex": {
+  "transform-unicode-regex": {
     features: [
       "RegExp \"y\" and \"u\" flags / \"u\" flag, case folding",
       "RegExp \"y\" and \"u\" flags / \"u\" flag, Unicode code point escapes",
@@ -128,11 +128,6 @@ const es2017 = {
       "async functions",
     ],
   },
-  "syntax-trailing-function-commas": {
-    features: [
-      "trailing commas in function syntax",
-    ],
-  }
 };
 
 const proposals = require("./shipped-proposals").features;

experimental/babel-preset-env/data/plugins.json

@@ -1,5 +1,5 @@
 {
-  "check-es2015-constants": {
+  "check-constants": {
     "chrome": "49",
     "edge": "14",
     "firefox": "51",
@@ -9,7 +9,7 @@
     "opera": "36",
     "electron": "1"
   },
-  "transform-es2015-arrow-functions": {
+  "transform-arrow-functions": {
     "chrome": "47",
     "edge": "13",
     "firefox": "45",
@@ -19,7 +19,7 @@
     "opera": "34",
     "electron": "0.36"
   },
-  "transform-es2015-block-scoped-functions": {
+  "transform-block-scoped-functions": {
     "chrome": "41",
     "edge": "12",
     "firefox": "46",
@@ -30,7 +30,7 @@
     "opera": "28",
     "electron": "0.24"
   },
-  "transform-es2015-block-scoping": {
+  "transform-block-scoping": {
     "chrome": "49",
     "edge": "14",
     "firefox": "51",
@@ -40,7 +40,7 @@
     "opera": "36",
     "electron": "1"
   },
-  "transform-es2015-classes": {
+  "transform-classes": {
     "chrome": "46",
     "edge": "13",
     "firefox": "45",
@@ -50,7 +50,7 @@
     "opera": "33",
     "electron": "0.36"
   },
-  "transform-es2015-computed-properties": {
+  "transform-computed-properties": {
     "chrome": "44",
     "edge": "12",
     "firefox": "34",
@@ -60,7 +60,7 @@
     "opera": "31",
     "electron": "0.31"
   },
-  "transform-es2015-destructuring": {
+  "transform-destructuring": {
     "chrome": "51",
     "firefox": "53",
     "safari": "10",
@@ -69,7 +69,7 @@
     "opera": "38",
     "electron": "1.2"
   },
-  "transform-es2015-duplicate-keys": {
+  "transform-duplicate-keys": {
     "chrome": "42",
     "edge": "12",
     "firefox": "34",
@@ -79,7 +79,7 @@
     "opera": "29",
     "electron": "0.27"
   },
-  "transform-es2015-for-of": {
+  "transform-for-of": {
     "chrome": "51",
     "edge": "15",
     "firefox": "53",
@@ -89,7 +89,7 @@
     "opera": "38",
     "electron": "1.2"
   },
-  "transform-es2015-function-name": {
+  "transform-function-name": {
     "chrome": "51",
     "firefox": "53",
     "safari": "10",
@@ -98,7 +98,7 @@
     "opera": "38",
     "electron": "1.2"
   },
-  "transform-es2015-literals": {
+  "transform-literals": {
     "chrome": "44",
     "edge": "12",
     "firefox": "53",
@@ -108,7 +108,7 @@
     "opera": "31",
     "electron": "0.31"
   },
-  "transform-es2015-object-super": {
+  "transform-object-super": {
     "chrome": "46",
     "edge": "13",
     "firefox": "45",
@@ -118,7 +118,7 @@
     "opera": "33",
     "electron": "0.36"
   },
-  "transform-es2015-parameters": {
+  "transform-parameters": {
     "chrome": "49",
     "edge": "14",
     "firefox": "53",
@@ -128,7 +128,7 @@
     "opera": "36",
     "electron": "1"
   },
-  "transform-es2015-shorthand-properties": {
+  "transform-shorthand-properties": {
     "chrome": "43",
     "edge": "12",
     "firefox": "33",
@@ -138,7 +138,7 @@
     "opera": "30",
     "electron": "0.29"
   },
-  "transform-es2015-spread": {
+  "transform-spread": {
     "chrome": "46",
     "edge": "13",
     "firefox": "36",
@@ -148,7 +148,7 @@
     "opera": "33",
     "electron": "0.36"
   },
-  "transform-es2015-sticky-regex": {
+  "transform-sticky-regex": {
     "chrome": "49",
     "edge": "13",
     "firefox": "3",
@@ -158,7 +158,7 @@
     "opera": "36",
     "electron": "1"
   },
-  "transform-es2015-template-literals": {
+  "transform-template-literals": {
     "chrome": "41",
     "edge": "13",
     "firefox": "34",
@@ -168,7 +168,7 @@
     "opera": "28",
     "electron": "0.24"
   },
-  "transform-es2015-typeof-symbol": {
+  "transform-typeof-symbol": {
     "chrome": "38",
     "edge": "12",
     "firefox": "36",
@@ -178,7 +178,7 @@
     "opera": "25",
     "electron": "0.2"
   },
-  "transform-es2015-unicode-regex": {
+  "transform-unicode-regex": {
     "chrome": "50",
     "edge": "13",
     "firefox": "46",
@@ -228,26 +228,17 @@
     "opera": "42",
     "electron": "1.6"
   },
-  "syntax-trailing-function-commas": {
-    "chrome": "58",
-    "edge": "14",
-    "firefox": "52",
-    "safari": "10",
-    "node": "8",
-    "ios": "10",
-    "opera": "45",
-    "electron": "1.7"
-  },
-  "transform-async-generator-functions": {
+  "proposal-async-generator-functions": {
     "chrome": "63",
+    "firefox": "57",
     "opera": "50"
   },
-  "transform-object-rest-spread": {
+  "proposal-object-rest-spread": {
     "chrome": "60",
     "firefox": "55",
     "node": "8.3",
     "opera": "47"
   },
-  "transform-optional-catch-binding": {},
-  "transform-unicode-property-regex": {}
+  "proposal-optional-catch-binding": {},
+  "proposal-unicode-property-regex": {}
 }

experimental/babel-preset-env/data/shipped-proposals.js

@@ -6,17 +6,17 @@ const builtIns = {
 };
 
 const features = {
-  "transform-async-generator-functions": "Asynchronous Iterators",
-  "transform-object-rest-spread": "object rest/spread properties",
-  "transform-optional-catch-binding": "optional catch binding",
-  "transform-unicode-property-regex": "RegExp Unicode Property Escapes",
+  "proposal-async-generator-functions": "Asynchronous Iterators",
+  "proposal-object-rest-spread": "object rest/spread properties",
+  "proposal-optional-catch-binding": "optional catch binding",
+  "proposal-unicode-property-regex": "RegExp Unicode Property Escapes",
 };
 
 const pluginSyntaxMap = new Map([
-  ["transform-async-generator-functions", "syntax-async-generators"],
-  ["transform-object-rest-spread", "syntax-object-rest-spread"],
-  ["transform-optional-catch-binding", "syntax-optional-catch-binding"],
-  ["transform-unicode-property-regex", null],
+  ["proposal-async-generator-functions", "syntax-async-generators"],
+  ["proposal-object-rest-spread", "syntax-object-rest-spread"],
+  ["proposal-optional-catch-binding", "syntax-optional-catch-binding"],
+  ["proposal-unicode-property-regex", null],
 ]);
 
 module.exports = { builtIns, features, pluginSyntaxMap };

experimental/babel-preset-env/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "babel-preset-env",
-  "version": "7.0.0-beta.3",
+  "name": "@babel/preset-env",
+  "version": "7.0.0-beta.31",
   "description": "A Babel preset for each environment.",
   "author": "Henry Zhu <hi@henryzoo.com>",
   "homepage": "https://babeljs.io/",
@@ -11,49 +11,53 @@
     "build-data": "node ./scripts/build-data.js"
   },
   "dependencies": {
-    "babel-plugin-check-es2015-constants": "7.0.0-beta.3",
-    "babel-plugin-syntax-async-generators": "7.0.0-beta.3",
-    "babel-plugin-syntax-object-rest-spread": "7.0.0-beta.3",
-    "babel-plugin-syntax-optional-catch-binding": "7.0.0-beta.3",
-    "babel-plugin-syntax-trailing-function-commas": "7.0.0-beta.0",
-    "babel-plugin-transform-async-generator-functions": "7.0.0-beta.3",
-    "babel-plugin-transform-async-to-generator": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-arrow-functions": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-block-scoped-functions": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-block-scoping": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-classes": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-computed-properties": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-destructuring": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-duplicate-keys": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-for-of": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-function-name": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-literals": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-modules-amd": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-modules-commonjs": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-modules-systemjs": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-modules-umd": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-object-super": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-parameters": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-shorthand-properties": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-spread": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-sticky-regex": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-template-literals": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-typeof-symbol": "7.0.0-beta.3",
-    "babel-plugin-transform-es2015-unicode-regex": "7.0.0-beta.3",
-    "babel-plugin-transform-exponentiation-operator": "7.0.0-beta.3",
-    "babel-plugin-transform-new-target": "7.0.0-beta.3",
-    "babel-plugin-transform-object-rest-spread": "7.0.0-beta.3",
-    "babel-plugin-transform-optional-catch-binding": "7.0.0-beta.3",
-    "babel-plugin-transform-regenerator": "7.0.0-beta.3",
-    "babel-plugin-transform-unicode-property-regex": "^2.0.5",
+    "@babel/plugin-check-constants": "7.0.0-beta.31",
+    "@babel/plugin-proposal-async-generator-functions": "7.0.0-beta.31",
+    "@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.31",
+    "@babel/plugin-proposal-optional-catch-binding": "7.0.0-beta.31",
+    "@babel/plugin-proposal-unicode-property-regex": "7.0.0-beta.31",
+    "@babel/plugin-syntax-async-generators": "7.0.0-beta.31",
+    "@babel/plugin-syntax-object-rest-spread": "7.0.0-beta.31",
+    "@babel/plugin-syntax-optional-catch-binding": "7.0.0-beta.31",
+    "@babel/plugin-transform-arrow-functions": "7.0.0-beta.31",
+    "@babel/plugin-transform-async-to-generator": "7.0.0-beta.31",
+    "@babel/plugin-transform-block-scoped-functions": "7.0.0-beta.31",
+    "@babel/plugin-transform-block-scoping": "7.0.0-beta.31",
+    "@babel/plugin-transform-classes": "7.0.0-beta.31",
+    "@babel/plugin-transform-computed-properties": "7.0.0-beta.31",
+    "@babel/plugin-transform-destructuring": "7.0.0-beta.31",
+    "@babel/plugin-transform-duplicate-keys": "7.0.0-beta.31",
+    "@babel/plugin-transform-exponentiation-operator": "7.0.0-beta.31",
+    "@babel/plugin-transform-for-of": "7.0.0-beta.31",
+    "@babel/plugin-transform-function-name": "7.0.0-beta.31",
+    "@babel/plugin-transform-literals": "7.0.0-beta.31",
+    "@babel/plugin-transform-modules-amd": "7.0.0-beta.31",
+    "@babel/plugin-transform-modules-commonjs": "7.0.0-beta.31",
+    "@babel/plugin-transform-modules-systemjs": "7.0.0-beta.31",
+    "@babel/plugin-transform-modules-umd": "7.0.0-beta.31",
+    "@babel/plugin-transform-new-target": "7.0.0-beta.31",
+    "@babel/plugin-transform-object-super": "7.0.0-beta.31",
+    "@babel/plugin-transform-parameters": "7.0.0-beta.31",
+    "@babel/plugin-transform-regenerator": "7.0.0-beta.31",
+    "@babel/plugin-transform-shorthand-properties": "7.0.0-beta.31",
+    "@babel/plugin-transform-spread": "7.0.0-beta.31",
+    "@babel/plugin-transform-sticky-regex": "7.0.0-beta.31",
+    "@babel/plugin-transform-template-literals": "7.0.0-beta.31",
+    "@babel/plugin-transform-typeof-symbol": "7.0.0-beta.31",
+    "@babel/plugin-transform-unicode-regex": "7.0.0-beta.31",
     "browserslist": "^2.4.0",
     "invariant": "^2.2.2",
     "semver": "^5.3.0"
   },
+  "peerDependencies": {
+    "@babel/core": "7.0.0-beta.31"
+  },
   "devDependencies": {
-    "babel-cli": "7.0.0-beta.3",
-    "babel-helper-fixtures": "7.0.0-beta.3",
-    "babel-helper-plugin-test-runner": "7.0.0-beta.3",
-    "compat-table": "kangax/compat-table#07dce174cc63f2b15b5f86b99cdfc89358dd072a"
+    "@babel/cli": "7.0.0-beta.31",
+    "@babel/core": "7.0.0-beta.31",
+    "@babel/helper-fixtures": "7.0.0-beta.31",
+    "@babel/helper-plugin-test-runner": "7.0.0-beta.31",
+    "compat-table": "kangax/compat-table#957f1ff15972e8fb2892a172f985e9af27bf1c75",
+    "electron-to-chromium": "^1.3.27"
   }
 }

experimental/babel-preset-env/scripts/smoke-test.js

@@ -91,7 +91,7 @@ const foo = new Promise((resolve) => {
   fs.writeFileSync(
     path.join(tempFolderPath, "index.js"),
     `
-import "babel-polyfill";
+import "@babel/polyfill";
 1 ** 2;
 `
   );

experimental/babel-preset-env/src/available-plugins.js

@@ -1,37 +1,36 @@
 export default {
-  "check-es2015-constants": require("babel-plugin-check-es2015-constants"),
-  "syntax-async-generators": require("babel-plugin-syntax-async-generators"),
-  "syntax-object-rest-spread": require("babel-plugin-syntax-object-rest-spread"),
-  "syntax-optional-catch-binding": require("babel-plugin-syntax-optional-catch-binding"),
-  "syntax-trailing-function-commas": require("babel-plugin-syntax-trailing-function-commas"),
-  "transform-async-to-generator": require("babel-plugin-transform-async-to-generator"),
-  "transform-async-generator-functions": require("babel-plugin-transform-async-generator-functions"),
-  "transform-es2015-arrow-functions": require("babel-plugin-transform-es2015-arrow-functions"),
-  "transform-es2015-block-scoped-functions": require("babel-plugin-transform-es2015-block-scoped-functions"),
-  "transform-es2015-block-scoping": require("babel-plugin-transform-es2015-block-scoping"),
-  "transform-es2015-classes": require("babel-plugin-transform-es2015-classes"),
-  "transform-es2015-computed-properties": require("babel-plugin-transform-es2015-computed-properties"),
-  "transform-es2015-destructuring": require("babel-plugin-transform-es2015-destructuring"),
-  "transform-es2015-duplicate-keys": require("babel-plugin-transform-es2015-duplicate-keys"),
-  "transform-es2015-for-of": require("babel-plugin-transform-es2015-for-of"),
-  "transform-es2015-function-name": require("babel-plugin-transform-es2015-function-name"),
-  "transform-es2015-literals": require("babel-plugin-transform-es2015-literals"),
-  "transform-es2015-modules-amd": require("babel-plugin-transform-es2015-modules-amd"),
-  "transform-es2015-modules-commonjs": require("babel-plugin-transform-es2015-modules-commonjs"),
-  "transform-es2015-modules-systemjs": require("babel-plugin-transform-es2015-modules-systemjs"),
-  "transform-es2015-modules-umd": require("babel-plugin-transform-es2015-modules-umd"),
-  "transform-es2015-object-super": require("babel-plugin-transform-es2015-object-super"),
-  "transform-es2015-parameters": require("babel-plugin-transform-es2015-parameters"),
-  "transform-es2015-shorthand-properties": require("babel-plugin-transform-es2015-shorthand-properties"),
-  "transform-es2015-spread": require("babel-plugin-transform-es2015-spread"),
-  "transform-es2015-sticky-regex": require("babel-plugin-transform-es2015-sticky-regex"),
-  "transform-es2015-template-literals": require("babel-plugin-transform-es2015-template-literals"),
-  "transform-es2015-typeof-symbol": require("babel-plugin-transform-es2015-typeof-symbol"),
-  "transform-es2015-unicode-regex": require("babel-plugin-transform-es2015-unicode-regex"),
-  "transform-exponentiation-operator": require("babel-plugin-transform-exponentiation-operator"),
-  "transform-new-target": require("babel-plugin-transform-new-target"),
-  "transform-object-rest-spread": require("babel-plugin-transform-object-rest-spread"),
-  "transform-optional-catch-binding": require("babel-plugin-transform-optional-catch-binding"),
-  "transform-regenerator": require("babel-plugin-transform-regenerator"),
-  "transform-unicode-property-regex": require("babel-plugin-transform-unicode-property-regex"),
+  "check-constants": require("@babel/plugin-check-constants"),
+  "syntax-async-generators": require("@babel/plugin-syntax-async-generators"),
+  "syntax-object-rest-spread": require("@babel/plugin-syntax-object-rest-spread"),
+  "syntax-optional-catch-binding": require("@babel/plugin-syntax-optional-catch-binding"),
+  "transform-async-to-generator": require("@babel/plugin-transform-async-to-generator"),
+  "proposal-async-generator-functions": require("@babel/plugin-proposal-async-generator-functions"),
+  "transform-arrow-functions": require("@babel/plugin-transform-arrow-functions"),
+  "transform-block-scoped-functions": require("@babel/plugin-transform-block-scoped-functions"),
+  "transform-block-scoping": require("@babel/plugin-transform-block-scoping"),
+  "transform-classes": require("@babel/plugin-transform-classes"),
+  "transform-computed-properties": require("@babel/plugin-transform-computed-properties"),
+  "transform-destructuring": require("@babel/plugin-transform-destructuring"),
+  "transform-duplicate-keys": require("@babel/plugin-transform-duplicate-keys"),
+  "transform-for-of": require("@babel/plugin-transform-for-of"),
+  "transform-function-name": require("@babel/plugin-transform-function-name"),
+  "transform-literals": require("@babel/plugin-transform-literals"),
+  "transform-modules-amd": require("@babel/plugin-transform-modules-amd"),
+  "transform-modules-commonjs": require("@babel/plugin-transform-modules-commonjs"),
+  "transform-modules-systemjs": require("@babel/plugin-transform-modules-systemjs"),
+  "transform-modules-umd": require("@babel/plugin-transform-modules-umd"),
+  "transform-object-super": require("@babel/plugin-transform-object-super"),
+  "transform-parameters": require("@babel/plugin-transform-parameters"),
+  "transform-shorthand-properties": require("@babel/plugin-transform-shorthand-properties"),
+  "transform-spread": require("@babel/plugin-transform-spread"),
+  "transform-sticky-regex": require("@babel/plugin-transform-sticky-regex"),
+  "transform-template-literals": require("@babel/plugin-transform-template-literals"),
+  "transform-typeof-symbol": require("@babel/plugin-transform-typeof-symbol"),
+  "transform-unicode-regex": require("@babel/plugin-transform-unicode-regex"),
+  "transform-exponentiation-operator": require("@babel/plugin-transform-exponentiation-operator"),
+  "transform-new-target": require("@babel/plugin-transform-new-target"),
+  "proposal-object-rest-spread": require("@babel/plugin-proposal-object-rest-spread"),
+  "proposal-optional-catch-binding": require("@babel/plugin-proposal-optional-catch-binding"),
+  "transform-regenerator": require("@babel/plugin-transform-regenerator"),
+  "proposal-unicode-property-regex": require("@babel/plugin-proposal-unicode-property-regex"),
 };

experimental/babel-preset-env/src/debug.js

@@ -38,7 +38,7 @@ export const logEntryPolyfills = (
   if (!importPolyfillIncluded) {
     console.log(
       `
-[${filename}] \`import 'babel-polyfill'\` was not found.`,
+[${filename}] \`import '@babel/polyfill'\` was not found.`,
     );
     return;
   }
@@ -52,7 +52,7 @@ export const logEntryPolyfills = (
 
   console.log(
     `
-[${filename}] Replaced \`babel-polyfill\` with the following polyfill${wordEnds(
+[${filename}] Replaced \`@babel/polyfill\` with the following polyfill${wordEnds(
       polyfills.size,
     )}:`,
   );

experimental/babel-preset-env/src/index.js

@@ -211,7 +211,7 @@ export default function buildPreset(
   const pluginUseBuiltIns = useBuiltIns !== false;
 
   // NOTE: not giving spec here yet to avoid compatibility issues when
-  // babel-plugin-transform-es2015-modules-commonjs gets its spec mode
+  // transform-modules-commonjs gets its spec mode
   if (modules !== false && moduleTransformations[modules]) {
     plugins.push([getPlugin(moduleTransformations[modules]), { loose }]);
   }
@@ -227,7 +227,7 @@ export default function buildPreset(
 
   if (debug && !hasBeenLogged) {
     hasBeenLogged = true;
-    console.log("babel-preset-env: `DEBUG` option");
+    console.log("@babel/preset-env: `DEBUG` option");
     console.log("\nUsing targets:");
     console.log(JSON.stringify(prettifyTargets(targets), null, 2));
     console.log(`\nUsing modules transform: ${modules.toString()}`);

experimental/babel-preset-env/src/module-transformations.js

@@ -1,6 +1,6 @@
 export default {
-  amd: "transform-es2015-modules-amd",
-  commonjs: "transform-es2015-modules-commonjs",
-  systemjs: "transform-es2015-modules-systemjs",
-  umd: "transform-es2015-modules-umd",
+  amd: "transform-modules-amd",
+  commonjs: "transform-modules-commonjs",
+  systemjs: "transform-modules-systemjs",
+  umd: "transform-modules-umd",
 };

experimental/babel-preset-env/src/use-built-ins-entry-plugin.js

@@ -11,7 +11,7 @@ type Plugin = {
 type RequireType = "require" | "import";
 
 function isPolyfillSource(value: string): boolean {
-  return value === "babel-polyfill";
+  return value === "@babel/polyfill";
 }
 
 export default function({ types: t }: { types: Object }): Plugin {
@@ -45,7 +45,7 @@ export default function({ types: t }: { types: Object }): Plugin {
     core: ?boolean,
   ): Object {
     if (core) {
-      polyfill = `babel-polyfill/lib/core-js/modules/${polyfill}`;
+      polyfill = `@babel/polyfill/lib/core-js/modules/${polyfill}`;
     }
 
     if (requireType === "import") {
@@ -67,7 +67,7 @@ export default function({ types: t }: { types: Object }): Plugin {
     if (regenerator) {
       imports.push(
         createImport(
-          "babel-polyfill/lib/regenerator-runtime/runtime",
+          "@babel/polyfill/lib/regenerator-runtime/runtime",
           requireType,
         ),
       );

experimental/babel-preset-env/src/use-built-ins-plugin.js

@@ -10,7 +10,7 @@ type Plugin = {
 };
 
 function isPolyfillSource(value: string): boolean {
-  return value === "babel-polyfill";
+  return value === "@babel/polyfill";
 }
 
 // function warnOnInstanceMethod() {
@@ -24,6 +24,11 @@ function has(obj: Object, key: string): boolean {
   return Object.prototype.hasOwnProperty.call(obj, key);
 }
 
+function getType(target: any): string {
+  if (Array.isArray(target)) return "array";
+  return typeof target;
+}
+
 // function getObjectString(node: Object): string {
 //   if (node.type === "Identifier") {
 //     return node.name;
@@ -34,12 +39,12 @@ function has(obj: Object, key: string): boolean {
 // }
 
 const modulePathMap = {
-  "regenerator-runtime": "babel-polyfill/lib/regenerator-runtime/runtime",
+  "regenerator-runtime": "@babel/polyfill/lib/regenerator-runtime/runtime",
 };
 
 const getModulePath = module => {
   return (
-    modulePathMap[module] || `babel-polyfill/lib/core-js/modules/${module}`
+    modulePathMap[module] || `@babel/polyfill/lib/core-js/modules/${module}`
   );
 };
 
@@ -103,7 +108,7 @@ export default function({ types: t }: { types: Object }): Plugin {
         console.warn(
           `
   When setting \`useBuiltIns: 'usage'\`, polyfills are automatically imported when needed.
-  Please remove the \`import 'babel-polyfill'\` call or use \`useBuiltIns: 'entry'\` instead.`,
+  Please remove the \`import '@babel/polyfill'\` call or use \`useBuiltIns: 'entry'\` instead.`,
         );
         path.remove();
       }
@@ -115,7 +120,7 @@ export default function({ types: t }: { types: Object }): Plugin {
             console.warn(
               `
   When setting \`useBuiltIns: 'usage'\`, polyfills are automatically imported when needed.
-  Please remove the \`require('babel-polyfill')\` call or use \`useBuiltIns: 'entry'\` instead.`,
+  Please remove the \`require('@babel/polyfill')\` call or use \`useBuiltIns: 'entry'\` instead.`,
             );
             bodyPath.remove();
           }
@@ -176,54 +181,49 @@ export default function({ types: t }: { types: Object }): Plugin {
         const prop = node.property;
 
         if (!t.isReferenced(obj, node)) return;
-
-        // doesn't reference the global
-        if (path.scope.getBindingIdentifier(obj.name)) return;
-
-        if (has(definitions.staticMethods, obj.name)) {
-          const staticMethods = definitions.staticMethods[obj.name];
-          if (has(staticMethods, prop.name)) {
-            const builtIn = staticMethods[prop.name];
+        let instanceType;
+        let evaluatedPropType = obj.name;
+        let propName = prop.name;
+        if (node.computed) {
+          if (t.isStringLiteral(prop)) {
+            propName = prop.value;
+          } else {
+            const res = path.get("property").evaluate();
+            if (res.confident && res.value) {
+              propName = res.value;
+            }
+          }
+        }
+        if (path.scope.getBindingIdentifier(obj.name)) {
+          const result = path.get("object").evaluate();
+          if (result.value) {
+            instanceType = getType(result.value);
+          } else if (result.deopt && result.deopt.isIdentifier()) {
+            evaluatedPropType = result.deopt.node.name;
+          }
+        }
+        if (has(definitions.staticMethods, evaluatedPropType)) {
+          const staticMethods = definitions.staticMethods[evaluatedPropType];
+          if (has(staticMethods, propName)) {
+            const builtIn = staticMethods[propName];
             addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
             // if (obj.name === "Array" && prop.name === "from") {
             //   addImport(
             //     path,
-            //     "babel-polyfill/lib/core-js/modules/web.dom.iterable",
+            //     "@babel/polyfill/lib/core-js/modules/web.dom.iterable",
             //     this.builtIns,
             //   );
             // }
           }
         }
 
-        if (
-          !node.computed &&
-          t.isIdentifier(prop) &&
-          has(definitions.instanceMethods, prop.name)
-        ) {
+        if (has(definitions.instanceMethods, propName)) {
           //warnOnInstanceMethod(state, getObjectString(node));
-          const builtIn = definitions.instanceMethods[prop.name];
-          addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
-        } else if (node.computed) {
-          if (
-            t.isStringLiteral(prop) &&
-            has(definitions.instanceMethods, prop.value)
-          ) {
-            const builtIn = definitions.instanceMethods[prop.value];
-            //warnOnInstanceMethod(state, `${obj.name}['${prop.value}']`);
-            addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
-          } else {
-            const res = path.get("property").evaluate();
-            if (res.confident) {
-              const builtIn = definitions.instanceMethods[res.value];
-              //warnOnInstanceMethod(state, `${obj.name}['${res.value}']`);
-              addUnsupported(
-                path.get("property"),
-                state.opts.polyfills,
-                builtIn,
-                this.builtIns,
-              );
-            }
+          let builtIn = definitions.instanceMethods[propName];
+          if (instanceType) {
+            builtIn = builtIn.filter(item => item.includes(instanceType));
           }
+          addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
         }
       },
 

experimental/babel-preset-env/test/debug-fixtures.js

@@ -1,7 +1,7 @@
 const chai = require("chai");
 const child = require("child_process");
 const fs = require("fs-extra");
-const helper = require("babel-helper-fixtures");
+const helper = require("@babel/helper-fixtures");
 const path = require("path");
 
 const fixtureLoc = path.join(__dirname, "debug-fixtures");
@@ -44,7 +44,7 @@ const assertTest = (stdout, stderr, opts) => {
 };
 
 const buildTest = opts => {
-  const binLoc = require.resolve("babel-cli/bin/babel");
+  const binLoc = require.resolve("@babel/cli/bin/babel");
 
   return callback => {
     clear();

experimental/babel-preset-env/test/debug-fixtures/android/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/android/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -8,34 +8,33 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "android":"4" }
-  transform-es2015-arrow-functions { "android":"4" }
-  transform-es2015-block-scoped-functions { "android":"4" }
-  transform-es2015-block-scoping { "android":"4" }
-  transform-es2015-classes { "android":"4" }
-  transform-es2015-computed-properties { "android":"4" }
-  transform-es2015-destructuring { "android":"4" }
-  transform-es2015-duplicate-keys { "android":"4" }
-  transform-es2015-for-of { "android":"4" }
-  transform-es2015-function-name { "android":"4" }
-  transform-es2015-literals { "android":"4" }
-  transform-es2015-object-super { "android":"4" }
-  transform-es2015-parameters { "android":"4" }
-  transform-es2015-shorthand-properties { "android":"4" }
-  transform-es2015-spread { "android":"4" }
-  transform-es2015-sticky-regex { "android":"4" }
-  transform-es2015-template-literals { "android":"4" }
-  transform-es2015-typeof-symbol { "android":"4" }
-  transform-es2015-unicode-regex { "android":"4" }
+  check-constants { "android":"4" }
+  transform-arrow-functions { "android":"4" }
+  transform-block-scoped-functions { "android":"4" }
+  transform-block-scoping { "android":"4" }
+  transform-classes { "android":"4" }
+  transform-computed-properties { "android":"4" }
+  transform-destructuring { "android":"4" }
+  transform-duplicate-keys { "android":"4" }
+  transform-for-of { "android":"4" }
+  transform-function-name { "android":"4" }
+  transform-literals { "android":"4" }
+  transform-object-super { "android":"4" }
+  transform-parameters { "android":"4" }
+  transform-shorthand-properties { "android":"4" }
+  transform-spread { "android":"4" }
+  transform-sticky-regex { "android":"4" }
+  transform-template-literals { "android":"4" }
+  transform-typeof-symbol { "android":"4" }
+  transform-unicode-regex { "android":"4" }
   transform-new-target { "android":"4" }
   transform-regenerator { "android":"4" }
   transform-exponentiation-operator { "android":"4" }
   transform-async-to-generator { "android":"4" }
-  syntax-trailing-function-commas { "android":"4" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es6.typed.array-buffer { "android":"4" }
   es6.typed.int8-array { "android":"4" }
   es6.typed.uint8-array { "android":"4" }
@@ -65,6 +64,16 @@ Using polyfills with `entry` option:
   es6.reflect.set-prototype-of { "android":"4" }
   es6.promise { "android":"4" }
   es6.symbol { "android":"4" }
+  es6.object.freeze { "android":"4" }
+  es6.object.seal { "android":"4" }
+  es6.object.prevent-extensions { "android":"4" }
+  es6.object.is-frozen { "android":"4" }
+  es6.object.is-sealed { "android":"4" }
+  es6.object.is-extensible { "android":"4" }
+  es6.object.get-own-property-descriptor { "android":"4" }
+  es6.object.get-prototype-of { "android":"4" }
+  es6.object.keys { "android":"4" }
+  es6.object.get-own-property-names { "android":"4" }
   es6.object.assign { "android":"4" }
   es6.object.is { "android":"4" }
   es6.object.set-prototype-of { "android":"4" }
@@ -123,4 +132,4 @@ Using polyfills with `entry` option:
   web.timers { "android":"4" }
   web.immediate { "android":"4" }
   web.dom.iterable { "android":"4" }
-src/in.js -> lib/in.js
+src/in.js -> lib/in.js

experimental/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -8,14 +8,13 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  transform-es2015-destructuring { "node":"6" }
-  transform-es2015-for-of { "node":"6" }
-  transform-es2015-function-name { "node":"6" }
+  transform-destructuring { "node":"6" }
+  transform-for-of { "node":"6" }
+  transform-function-name { "node":"6" }
   transform-exponentiation-operator { "node":"6" }
   transform-async-to-generator { "node":"6" }
-  syntax-trailing-function-commas { "node":"6" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] `import 'babel-polyfill'` was not found.
+[src/in.js] `import '@babel/polyfill'` was not found.
 src/in.js -> lib/in.js

experimental/babel-preset-env/test/debug-fixtures/builtins-uglify/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt

@@ -1,7 +1,7 @@
 The uglify target has been deprecated. Set the top level
 option `forceAllTransforms: true` instead.
 
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -11,37 +11,36 @@ Using targets:
 Using modules transform: false
 
 Using plugins:
-  check-es2015-constants {}
-  transform-es2015-arrow-functions {}
-  transform-es2015-block-scoped-functions {}
-  transform-es2015-block-scoping {}
-  transform-es2015-classes {}
-  transform-es2015-computed-properties {}
-  transform-es2015-destructuring {}
-  transform-es2015-duplicate-keys {}
-  transform-es2015-for-of {}
-  transform-es2015-function-name {}
-  transform-es2015-literals {}
-  transform-es2015-object-super {}
-  transform-es2015-parameters {}
-  transform-es2015-shorthand-properties {}
-  transform-es2015-spread {}
-  transform-es2015-sticky-regex {}
-  transform-es2015-template-literals {}
-  transform-es2015-typeof-symbol {}
-  transform-es2015-unicode-regex {}
+  check-constants {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-block-scoping {}
+  transform-classes {}
+  transform-computed-properties {}
+  transform-destructuring {}
+  transform-duplicate-keys {}
+  transform-for-of {}
+  transform-function-name {}
+  transform-literals {}
+  transform-object-super {}
+  transform-parameters {}
+  transform-shorthand-properties {}
+  transform-spread {}
+  transform-sticky-regex {}
+  transform-template-literals {}
+  transform-typeof-symbol {}
+  transform-unicode-regex {}
   transform-new-target {}
   transform-regenerator {}
   transform-exponentiation-operator {}
   transform-async-to-generator {}
-  syntax-trailing-function-commas { "chrome":"55" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es7.string.pad-start { "chrome":"55" }
   es7.string.pad-end { "chrome":"55" }
   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

experimental/babel-preset-env/test/debug-fixtures/builtins/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/builtins/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -10,34 +10,33 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "ie":"10" }
-  transform-es2015-arrow-functions { "ie":"10" }
-  transform-es2015-block-scoped-functions { "ie":"10" }
-  transform-es2015-block-scoping { "ie":"10" }
-  transform-es2015-classes { "ie":"10" }
-  transform-es2015-computed-properties { "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" }
-  transform-es2015-object-super { "ie":"10" }
-  transform-es2015-parameters { "ie":"10" }
-  transform-es2015-shorthand-properties { "ie":"10" }
-  transform-es2015-spread { "ie":"10" }
-  transform-es2015-sticky-regex { "ie":"10" }
-  transform-es2015-template-literals { "ie":"10" }
-  transform-es2015-typeof-symbol { "ie":"10" }
-  transform-es2015-unicode-regex { "ie":"10" }
+  check-constants { "ie":"10" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-block-scoping { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-destructuring { "ie":"10", "node":"6" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-for-of { "ie":"10", "node":"6" }
+  transform-function-name { "ie":"10", "node":"6" }
+  transform-literals { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-sticky-regex { "ie":"10" }
+  transform-template-literals { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-unicode-regex { "ie":"10" }
   transform-new-target { "ie":"10" }
   transform-regenerator { "ie":"10" }
   transform-exponentiation-operator { "ie":"10", "node":"6" }
   transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6" }
-  syntax-trailing-function-commas { "chrome":"54", "ie":"10", "node":"6" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es6.typed.array-buffer { "ie":"10", "node":"6" }
   es6.typed.int8-array { "ie":"10", "node":"6" }
   es6.typed.uint8-array { "ie":"10", "node":"6" }
@@ -67,6 +66,16 @@ Using polyfills with `entry` option:
   es6.reflect.set-prototype-of { "ie":"10" }
   es6.promise { "ie":"10", "node":"6" }
   es6.symbol { "ie":"10", "node":"6" }
+  es6.object.freeze { "ie":"10" }
+  es6.object.seal { "ie":"10" }
+  es6.object.prevent-extensions { "ie":"10" }
+  es6.object.is-frozen { "ie":"10" }
+  es6.object.is-sealed { "ie":"10" }
+  es6.object.is-extensible { "ie":"10" }
+  es6.object.get-own-property-descriptor { "ie":"10" }
+  es6.object.get-prototype-of { "ie":"10" }
+  es6.object.keys { "ie":"10" }
+  es6.object.get-own-property-names { "ie":"10" }
   es6.object.assign { "ie":"10" }
   es6.object.is { "ie":"10" }
   es6.object.set-prototype-of { "ie":"10" }
@@ -125,4 +134,4 @@ Using polyfills with `entry` option:
   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

experimental/babel-preset-env/test/debug-fixtures/electron/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/electron/stdout.txt

@@ -5,7 +5,7 @@ Warning, the following targets are using a decimal version:
 We recommend using a string for minor/patch versions to avoid numbers like 6.10
 getting parsed as 6.1, which can lead to unexpected behavior.
 
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -15,22 +15,21 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "electron":"0.36" }
-  transform-es2015-block-scoping { "electron":"0.36" }
-  transform-es2015-destructuring { "electron":"0.36" }
-  transform-es2015-for-of { "electron":"0.36" }
-  transform-es2015-function-name { "electron":"0.36" }
-  transform-es2015-parameters { "electron":"0.36" }
-  transform-es2015-sticky-regex { "electron":"0.36" }
-  transform-es2015-unicode-regex { "electron":"0.36" }
+  check-constants { "electron":"0.36" }
+  transform-block-scoping { "electron":"0.36" }
+  transform-destructuring { "electron":"0.36" }
+  transform-for-of { "electron":"0.36" }
+  transform-function-name { "electron":"0.36" }
+  transform-parameters { "electron":"0.36" }
+  transform-sticky-regex { "electron":"0.36" }
+  transform-unicode-regex { "electron":"0.36" }
   transform-regenerator { "electron":"0.36" }
   transform-exponentiation-operator { "electron":"0.36" }
   transform-async-to-generator { "electron":"0.36" }
-  syntax-trailing-function-commas { "electron":"0.36" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es6.typed.array-buffer { "electron":"0.36" }
   es6.typed.data-view { "electron":"0.36" }
   es6.typed.int8-array { "electron":"0.36" }

experimental/babel-preset-env/test/debug-fixtures/force-all-transforms/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -8,37 +8,36 @@ Using targets:
 Using modules transform: false
 
 Using plugins:
-  check-es2015-constants {}
-  transform-es2015-arrow-functions {}
-  transform-es2015-block-scoped-functions {}
-  transform-es2015-block-scoping {}
-  transform-es2015-classes {}
-  transform-es2015-computed-properties {}
-  transform-es2015-destructuring {}
-  transform-es2015-duplicate-keys {}
-  transform-es2015-for-of {}
-  transform-es2015-function-name {}
-  transform-es2015-literals {}
-  transform-es2015-object-super {}
-  transform-es2015-parameters {}
-  transform-es2015-shorthand-properties {}
-  transform-es2015-spread {}
-  transform-es2015-sticky-regex {}
-  transform-es2015-template-literals {}
-  transform-es2015-typeof-symbol {}
-  transform-es2015-unicode-regex {}
+  check-constants {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-block-scoping {}
+  transform-classes {}
+  transform-computed-properties {}
+  transform-destructuring {}
+  transform-duplicate-keys {}
+  transform-for-of {}
+  transform-function-name {}
+  transform-literals {}
+  transform-object-super {}
+  transform-parameters {}
+  transform-shorthand-properties {}
+  transform-spread {}
+  transform-sticky-regex {}
+  transform-template-literals {}
+  transform-typeof-symbol {}
+  transform-unicode-regex {}
   transform-new-target {}
   transform-regenerator {}
   transform-exponentiation-operator {}
   transform-async-to-generator {}
-  syntax-trailing-function-commas { "chrome":"55" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es7.string.pad-start { "chrome":"55" }
   es7.string.pad-end { "chrome":"55" }
   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

experimental/babel-preset-env/test/debug-fixtures/plugins-only/options.json

@@ -5,7 +5,7 @@
       "exclude": [
         "transform-async-to-generator",
         "transform-regenerator",
-        "transform-es2015-parameters"
+        "transform-parameters"
       ],
       "targets": {
         "firefox": 52,

experimental/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt

@@ -5,7 +5,7 @@ Warning, the following targets are using a decimal version:
 We recommend using a string for minor/patch versions to avoid numbers like 6.10
 getting parsed as 6.1, which can lead to unexpected behavior.
 
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -16,11 +16,10 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  transform-es2015-destructuring { "firefox":"52" }
-  transform-es2015-for-of { "firefox":"52" }
-  transform-es2015-function-name { "firefox":"52" }
-  transform-es2015-literals { "firefox":"52" }
-  syntax-trailing-function-commas { "node":"7.4" }
+  transform-destructuring { "firefox":"52" }
+  transform-for-of { "firefox":"52" }
+  transform-function-name { "firefox":"52" }
+  transform-literals { "firefox":"52" }
 
 Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.
 src/in.js -> lib/in.js

experimental/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -8,16 +8,16 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  transform-async-generator-functions { "chrome":"60" }
+  proposal-async-generator-functions { "chrome":"60" }
   syntax-object-rest-spread { "chrome":"60" }
-  transform-optional-catch-binding { "chrome":"60" }
-  transform-unicode-property-regex { "chrome":"60" }
+  proposal-optional-catch-binding { "chrome":"60" }
+  proposal-unicode-property-regex { "chrome":"60" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es7.promise.finally { "chrome":"60" }
   web.timers { "chrome":"60" }
   web.immediate { "chrome":"60" }
   web.dom.iterable { "chrome":"60" }
-src/in.js -> lib/in.js
+src/in.js -> lib/in.js

experimental/babel-preset-env/test/debug-fixtures/shippedProposals/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {}
@@ -6,38 +6,37 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants {}
-  transform-es2015-arrow-functions {}
-  transform-es2015-block-scoped-functions {}
-  transform-es2015-block-scoping {}
-  transform-es2015-classes {}
-  transform-es2015-computed-properties {}
-  transform-es2015-destructuring {}
-  transform-es2015-duplicate-keys {}
-  transform-es2015-for-of {}
-  transform-es2015-function-name {}
-  transform-es2015-literals {}
-  transform-es2015-object-super {}
-  transform-es2015-parameters {}
-  transform-es2015-shorthand-properties {}
-  transform-es2015-spread {}
-  transform-es2015-sticky-regex {}
-  transform-es2015-template-literals {}
-  transform-es2015-typeof-symbol {}
-  transform-es2015-unicode-regex {}
+  check-constants {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-block-scoping {}
+  transform-classes {}
+  transform-computed-properties {}
+  transform-destructuring {}
+  transform-duplicate-keys {}
+  transform-for-of {}
+  transform-function-name {}
+  transform-literals {}
+  transform-object-super {}
+  transform-parameters {}
+  transform-shorthand-properties {}
+  transform-spread {}
+  transform-sticky-regex {}
+  transform-template-literals {}
+  transform-typeof-symbol {}
+  transform-unicode-regex {}
   transform-new-target {}
   transform-regenerator {}
   transform-exponentiation-operator {}
   transform-async-to-generator {}
-  syntax-trailing-function-commas {}
-  transform-async-generator-functions {}
-  transform-object-rest-spread {}
-  transform-optional-catch-binding {}
-  transform-unicode-property-regex {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-optional-catch-binding {}
+  proposal-unicode-property-regex {}
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es6.typed.array-buffer {}
   es6.typed.data-view {}
   es6.typed.int8-array {}
@@ -68,6 +67,16 @@ Using polyfills with `entry` option:
   es6.reflect.set-prototype-of {}
   es6.promise {}
   es6.symbol {}
+  es6.object.freeze {}
+  es6.object.seal {}
+  es6.object.prevent-extensions {}
+  es6.object.is-frozen {}
+  es6.object.is-sealed {}
+  es6.object.is-extensible {}
+  es6.object.get-own-property-descriptor {}
+  es6.object.get-prototype-of {}
+  es6.object.keys {}
+  es6.object.get-own-property-names {}
   es6.object.assign {}
   es6.object.is {}
   es6.object.set-prototype-of {}
@@ -127,4 +136,4 @@ Using polyfills with `entry` option:
   web.timers {}
   web.immediate {}
   web.dom.iterable {}
-src/in.js -> lib/in.js
+src/in.js -> lib/in.js

experimental/babel-preset-env/test/debug-fixtures/specific-targets/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -13,34 +13,33 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-es2015-arrow-functions { "ie":"10", "ios":"9", "safari":"7" }
-  transform-es2015-block-scoped-functions { "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-computed-properties { "ie":"10", "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" }
-  transform-es2015-object-super { "ie":"10", "ios":"9", "safari":"7" }
-  transform-es2015-parameters { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-es2015-shorthand-properties { "ie":"10", "safari":"7" }
-  transform-es2015-spread { "ie":"10", "ios":"9", "safari":"7" }
-  transform-es2015-sticky-regex { "ie":"10", "ios":"9", "safari":"7" }
-  transform-es2015-template-literals { "ie":"10", "safari":"7" }
-  transform-es2015-typeof-symbol { "ie":"10", "safari":"7" }
-  transform-es2015-unicode-regex { "ie":"10", "ios":"9", "safari":"7" }
+  check-constants { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-arrow-functions { "ie":"10", "ios":"9", "safari":"7" }
+  transform-block-scoped-functions { "ie":"10", "ios":"9", "safari":"7" }
+  transform-block-scoping { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-classes { "ie":"10", "ios":"9", "safari":"7" }
+  transform-computed-properties { "ie":"10", "safari":"7" }
+  transform-destructuring { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-duplicate-keys { "ie":"10", "safari":"7" }
+  transform-for-of { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-function-name { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-literals { "firefox":"49", "ie":"10", "safari":"7" }
+  transform-object-super { "ie":"10", "ios":"9", "safari":"7" }
+  transform-parameters { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-shorthand-properties { "ie":"10", "safari":"7" }
+  transform-spread { "ie":"10", "ios":"9", "safari":"7" }
+  transform-sticky-regex { "ie":"10", "ios":"9", "safari":"7" }
+  transform-template-literals { "ie":"10", "safari":"7" }
+  transform-typeof-symbol { "ie":"10", "safari":"7" }
+  transform-unicode-regex { "ie":"10", "ios":"9", "safari":"7" }
   transform-new-target { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
   transform-regenerator { "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
   transform-exponentiation-operator { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
   transform-async-to-generator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  syntax-trailing-function-commas { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es6.typed.array-buffer { "ie":"10", "ios":"9", "safari":"7" }
   es6.typed.int8-array { "ie":"10", "ios":"9", "safari":"7" }
   es6.typed.uint8-array { "ie":"10", "ios":"9", "safari":"7" }
@@ -70,6 +69,16 @@ Using polyfills with `entry` option:
   es6.reflect.set-prototype-of { "ie":"10", "ios":"9", "safari":"7" }
   es6.promise { "ie":"10", "ios":"9", "safari":"7" }
   es6.symbol { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.object.freeze { "ie":"10", "safari":"7" }
+  es6.object.seal { "ie":"10", "safari":"7" }
+  es6.object.prevent-extensions { "ie":"10", "safari":"7" }
+  es6.object.is-frozen { "ie":"10", "safari":"7" }
+  es6.object.is-sealed { "ie":"10", "safari":"7" }
+  es6.object.is-extensible { "ie":"10", "safari":"7" }
+  es6.object.get-own-property-descriptor { "ie":"10", "safari":"7" }
+  es6.object.get-prototype-of { "ie":"10", "safari":"7" }
+  es6.object.keys { "ie":"10", "safari":"7" }
+  es6.object.get-own-property-names { "ie":"10", "safari":"7" }
   es6.object.assign { "ie":"10", "safari":"7" }
   es6.object.is { "ie":"10", "safari":"7" }
   es6.object.set-prototype-of { "ie":"10", "safari":"7" }
@@ -128,4 +137,4 @@ Using polyfills with `entry` option:
   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

experimental/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -10,29 +10,28 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "firefox":"50", "ie":"11" }
-  transform-es2015-arrow-functions { "ie":"11" }
-  transform-es2015-block-scoping { "firefox":"50", "ie":"11" }
-  transform-es2015-classes { "ie":"11" }
-  transform-es2015-computed-properties { "ie":"11" }
-  transform-es2015-destructuring { "firefox":"50", "ie":"11" }
-  transform-es2015-duplicate-keys { "ie":"11" }
-  transform-es2015-for-of { "firefox":"50", "ie":"11" }
-  transform-es2015-function-name { "firefox":"50", "ie":"11" }
-  transform-es2015-literals { "firefox":"50", "ie":"11" }
-  transform-es2015-object-super { "ie":"11" }
-  transform-es2015-parameters { "firefox":"50", "ie":"11" }
-  transform-es2015-shorthand-properties { "ie":"11" }
-  transform-es2015-spread { "ie":"11" }
-  transform-es2015-sticky-regex { "ie":"11" }
-  transform-es2015-template-literals { "ie":"11" }
-  transform-es2015-typeof-symbol { "ie":"11" }
-  transform-es2015-unicode-regex { "ie":"11" }
+  check-constants { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-template-literals { "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
   transform-new-target { "ie":"11" }
   transform-regenerator { "firefox":"50", "ie":"11" }
   transform-exponentiation-operator { "firefox":"50", "ie":"11" }
   transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
-  syntax-trailing-function-commas { "chrome":"52", "firefox":"50", "ie":"11" }
 
 Using polyfills with `usage` option:
 
@@ -40,4 +39,4 @@ Using polyfills with `usage` option:
 src/in.js -> lib/in.js
 
 [src/in2.js] Based on your code and targets, none were added.
-src/in2.js -> lib/in2.js
+src/in2.js -> lib/in2.js

experimental/babel-preset-env/test/debug-fixtures/usage-with-import/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/usage-with-import/stderr.txt

@@ -1,2 +1,2 @@
   When setting `useBuiltIns: 'usage'`, polyfills are automatically imported when needed.
-  Please remove the `import 'babel-polyfill'` call or use `useBuiltIns: 'entry'` instead.
+  Please remove the `import '@babel/polyfill'` call or use `useBuiltIns: 'entry'` instead.

experimental/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -8,7 +8,6 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  syntax-trailing-function-commas { "chrome":"55" }
 
 Using polyfills with `usage` option:
 

experimental/babel-preset-env/test/debug-fixtures/usage/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -10,29 +10,28 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "firefox":"50", "ie":"11" }
-  transform-es2015-arrow-functions { "ie":"11" }
-  transform-es2015-block-scoping { "firefox":"50", "ie":"11" }
-  transform-es2015-classes { "ie":"11" }
-  transform-es2015-computed-properties { "ie":"11" }
-  transform-es2015-destructuring { "firefox":"50", "ie":"11" }
-  transform-es2015-duplicate-keys { "ie":"11" }
-  transform-es2015-for-of { "firefox":"50", "ie":"11" }
-  transform-es2015-function-name { "firefox":"50", "ie":"11" }
-  transform-es2015-literals { "firefox":"50", "ie":"11" }
-  transform-es2015-object-super { "ie":"11" }
-  transform-es2015-parameters { "firefox":"50", "ie":"11" }
-  transform-es2015-shorthand-properties { "ie":"11" }
-  transform-es2015-spread { "ie":"11" }
-  transform-es2015-sticky-regex { "ie":"11" }
-  transform-es2015-template-literals { "ie":"11" }
-  transform-es2015-typeof-symbol { "ie":"11" }
-  transform-es2015-unicode-regex { "ie":"11" }
+  check-constants { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-template-literals { "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
   transform-new-target { "ie":"11" }
   transform-regenerator { "firefox":"50", "ie":"11" }
   transform-exponentiation-operator { "firefox":"50", "ie":"11" }
   transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
-  syntax-trailing-function-commas { "chrome":"52", "firefox":"50", "ie":"11" }
 
 Using polyfills with `usage` option:
 
@@ -44,4 +43,4 @@ src/in.js -> lib/in.js
 [src/in2.js] Added following polyfills:
   regenerator-runtime { "chrome":"52", "firefox":"50", "ie":"11" }
   web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
-src/in2.js -> lib/in2.js
+src/in2.js -> lib/in2.js

experimental/babel-preset-env/test/debug-fixtures/versions-decimals/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt

@@ -6,7 +6,7 @@ Warning, the following targets are using a decimal version:
 We recommend using a string for minor/patch versions to avoid numbers like 6.10
 getting parsed as 6.1, which can lead to unexpected behavior.
 
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -19,34 +19,33 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "electron":"0.36", "ie":"10" }
-  transform-es2015-arrow-functions { "ie":"10" }
-  transform-es2015-block-scoped-functions { "ie":"10" }
-  transform-es2015-block-scoping { "electron":"0.36", "ie":"10" }
-  transform-es2015-classes { "ie":"10" }
-  transform-es2015-computed-properties { "ie":"10" }
-  transform-es2015-destructuring { "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-es2015-duplicate-keys { "ie":"10" }
-  transform-es2015-for-of { "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-es2015-function-name { "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-es2015-literals { "ie":"10" }
-  transform-es2015-object-super { "ie":"10" }
-  transform-es2015-parameters { "electron":"0.36", "ie":"10" }
-  transform-es2015-shorthand-properties { "ie":"10" }
-  transform-es2015-spread { "ie":"10" }
-  transform-es2015-sticky-regex { "electron":"0.36", "ie":"10" }
-  transform-es2015-template-literals { "ie":"10" }
-  transform-es2015-typeof-symbol { "ie":"10" }
-  transform-es2015-unicode-regex { "electron":"0.36", "ie":"10" }
+  check-constants { "electron":"0.36", "ie":"10" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-block-scoping { "electron":"0.36", "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-destructuring { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-for-of { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-function-name { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-literals { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-parameters { "electron":"0.36", "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-sticky-regex { "electron":"0.36", "ie":"10" }
+  transform-template-literals { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-unicode-regex { "electron":"0.36", "ie":"10" }
   transform-new-target { "ie":"10" }
   transform-regenerator { "electron":"0.36", "ie":"10" }
   transform-exponentiation-operator { "electron":"0.36", "ie":"10", "node":"6.1" }
   transform-async-to-generator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  syntax-trailing-function-commas { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es6.typed.array-buffer { "electron":"0.36", "ie":"10", "node":"6.1" }
   es6.typed.data-view { "electron":"0.36" }
   es6.typed.int8-array { "electron":"0.36", "ie":"10", "node":"6.1" }
@@ -77,6 +76,16 @@ Using polyfills with `entry` option:
   es6.reflect.set-prototype-of { "electron":"0.36", "ie":"10" }
   es6.promise { "electron":"0.36", "ie":"10", "node":"6.1" }
   es6.symbol { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.object.freeze { "ie":"10" }
+  es6.object.seal { "ie":"10" }
+  es6.object.prevent-extensions { "ie":"10" }
+  es6.object.is-frozen { "ie":"10" }
+  es6.object.is-sealed { "ie":"10" }
+  es6.object.is-extensible { "ie":"10" }
+  es6.object.get-own-property-descriptor { "ie":"10" }
+  es6.object.get-prototype-of { "ie":"10" }
+  es6.object.keys { "ie":"10" }
+  es6.object.get-own-property-names { "ie":"10" }
   es6.object.assign { "ie":"10" }
   es6.object.is { "ie":"10" }
   es6.object.set-prototype-of { "ie":"10" }
@@ -135,4 +144,4 @@ Using polyfills with `entry` option:
   web.timers { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
   web.immediate { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
   web.dom.iterable { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-src/in.js -> lib/in.js
+src/in.js -> lib/in.js

experimental/babel-preset-env/test/debug-fixtures/versions-strings/in/in.js

@@ -1 +1 @@
-import 'babel-polyfill';
+import '@babel/polyfill';

experimental/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt

@@ -1,4 +1,4 @@
-babel-preset-env: `DEBUG` option
+@babel/preset-env: `DEBUG` option
 
 Using targets:
 {
@@ -10,34 +10,33 @@ Using targets:
 Using modules transform: commonjs
 
 Using plugins:
-  check-es2015-constants { "ie":"10" }
-  transform-es2015-arrow-functions { "ie":"10" }
-  transform-es2015-block-scoped-functions { "ie":"10" }
-  transform-es2015-block-scoping { "ie":"10" }
-  transform-es2015-classes { "ie":"10" }
-  transform-es2015-computed-properties { "ie":"10" }
-  transform-es2015-destructuring { "ie":"10" }
-  transform-es2015-duplicate-keys { "ie":"10" }
-  transform-es2015-for-of { "ie":"10" }
-  transform-es2015-function-name { "ie":"10" }
-  transform-es2015-literals { "ie":"10" }
-  transform-es2015-object-super { "ie":"10" }
-  transform-es2015-parameters { "ie":"10" }
-  transform-es2015-shorthand-properties { "ie":"10" }
-  transform-es2015-spread { "ie":"10" }
-  transform-es2015-sticky-regex { "ie":"10" }
-  transform-es2015-template-literals { "ie":"10" }
-  transform-es2015-typeof-symbol { "ie":"10" }
-  transform-es2015-unicode-regex { "ie":"10" }
+  check-constants { "ie":"10" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-block-scoping { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-destructuring { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-for-of { "ie":"10" }
+  transform-function-name { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-sticky-regex { "ie":"10" }
+  transform-template-literals { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-unicode-regex { "ie":"10" }
   transform-new-target { "ie":"10" }
   transform-regenerator { "ie":"10" }
   transform-exponentiation-operator { "ie":"10", "node":"6.10" }
   transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6.10" }
-  syntax-trailing-function-commas { "chrome":"54", "ie":"10", "node":"6.10" }
 
 Using polyfills with `entry` option:
 
-[src/in.js] Replaced `babel-polyfill` with the following polyfills:
+[src/in.js] Replaced `@babel/polyfill` with the following polyfills:
   es6.typed.array-buffer { "ie":"10" }
   es6.typed.int8-array { "ie":"10" }
   es6.typed.uint8-array { "ie":"10" }
@@ -67,6 +66,16 @@ Using polyfills with `entry` option:
   es6.reflect.set-prototype-of { "ie":"10" }
   es6.promise { "ie":"10" }
   es6.symbol { "ie":"10" }
+  es6.object.freeze { "ie":"10" }
+  es6.object.seal { "ie":"10" }
+  es6.object.prevent-extensions { "ie":"10" }
+  es6.object.is-frozen { "ie":"10" }
+  es6.object.is-sealed { "ie":"10" }
+  es6.object.is-extensible { "ie":"10" }
+  es6.object.get-own-property-descriptor { "ie":"10" }
+  es6.object.get-prototype-of { "ie":"10" }
+  es6.object.keys { "ie":"10" }
+  es6.object.get-own-property-names { "ie":"10" }
   es6.object.assign { "ie":"10" }
   es6.object.is { "ie":"10" }
   es6.object.set-prototype-of { "ie":"10" }
@@ -125,4 +134,4 @@ Using polyfills with `entry` option:
   web.timers { "chrome":"54", "ie":"10", "node":"6.10" }
   web.immediate { "chrome":"54", "ie":"10", "node":"6.10" }
   web.dom.iterable { "chrome":"54", "ie":"10", "node":"6.10" }
-src/in.js -> lib/in.js
+src/in.js -> lib/in.js

experimental/babel-preset-env/test/fixtures.js

@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);

experimental/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/expected.js

@@ -1,3 +1,3 @@
-import "babel-polyfill/lib/core-js/modules/es6.symbol";
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
-Symbol.iterator in arr;
+import "@babel/polyfill/lib/core-js/modules/es6.symbol";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
+Symbol.iterator in arr;

experimental/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/expected.js

@@ -1,3 +1,3 @@
-import "babel-polyfill/lib/core-js/modules/es6.symbol";
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
-arr[Symbol.iterator]();
+import "@babel/polyfill/lib/core-js/modules/es6.symbol";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
+arr[Symbol.iterator]();

experimental/babel-preset-env/test/fixtures/dom-iterable/yield-star/expected.js

@@ -1,5 +1,5 @@
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
 
 function* a() {
   yield* 1;
-}
+}

experimental/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/actual.js

@@ -1 +1 @@
-import "babel-polyfill";
+import "@babel/polyfill";

experimental/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/expected.js

@@ -1,2 +1,2 @@
-import "babel-polyfill/lib/core-js/modules/es6.typed.data-view";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.apply";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.data-view";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.apply";

experimental/babel-preset-env/test/fixtures/plugin-options/regenerator-false/actual.js

@@ -1 +1 @@
-import "babel-polyfill";
+import "@babel/polyfill";

experimental/babel-preset-env/test/fixtures/plugin-options/regenerator-true/actual.js

@@ -1 +1 @@
-import "babel-polyfill";
+import "@babel/polyfill";

experimental/babel-preset-env/test/fixtures/plugin-options/regenerator-true/expected.js

@@ -1 +1 @@
-import "babel-polyfill/lib/regenerator-runtime/runtime";
+import "@babel/polyfill/lib/regenerator-runtime/runtime";

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/actual.js

@@ -0,0 +1,12 @@
+var objectClass = Object;
+var arrayInstance = [];
+var assignStr = "assign";
+var entriesStr = "entries";
+var valuesStr = "values";
+var inclidesStr = "includes";
+var findStr = "find";
+
+// Allow static methods be assigned to variables only directly in the module.
+externalVar[valuesStr]; // don't include
+objectClass[assignStr]({}); // include
+arrayInstance[entriesStr]({}); // don't include

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/expected.js

@@ -0,0 +1,14 @@
+import "@babel/polyfill/lib/core-js/modules/es6.object.assign";
+var objectClass = Object;
+var arrayInstance = [];
+var assignStr = "assign";
+var entriesStr = "entries";
+var valuesStr = "values";
+var inclidesStr = "includes";
+var findStr = "find"; // Allow static methods be assigned to variables only directly in the module.
+
+externalVar[valuesStr]; // don't include
+
+objectClass[assignStr]({}); // include
+
+arrayInstance[entriesStr]({}); // don't include

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/options.json

@@ -0,0 +1,8 @@
+{
+  "presets": [
+    ["../../../../lib", {
+      "useBuiltIns": "usage",
+      "modules": false
+    }]
+  ]
+}

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/actual.js

@@ -0,0 +1,8 @@
+var arrayInstance = [];
+var inclidesStr = "includes";
+var findStr = "find";
+
+// Allow instance methods be assigned to variables.
+arrayInstance[inclidesStr](); // include
+externalVar[findStr]; // include
+

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/expected.js

@@ -0,0 +1,10 @@
+import "@babel/polyfill/lib/core-js/modules/es6.array.find";
+import "@babel/polyfill/lib/core-js/modules/es7.array.includes";
+var arrayInstance = [];
+var inclidesStr = "includes";
+var findStr = "find"; // Allow instance methods be assigned to variables.
+
+arrayInstance[inclidesStr](); // include
+
+externalVar[findStr]; // include
+

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/options.json

@@ -0,0 +1,8 @@
+{
+  "presets": [
+    ["../../../../lib", {
+      "useBuiltIns": "usage",
+      "modules": false
+    }]
+  ]
+}

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/expected.js

@@ -1,19 +1,19 @@
-import "babel-polyfill/lib/core-js/modules/es6.regexp.split";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.replace";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.search";
-import "babel-polyfill/lib/core-js/modules/es6.array.copy-within";
-import "babel-polyfill/lib/core-js/modules/es6.string.ends-with";
-import "babel-polyfill/lib/core-js/modules/es6.string.code-point-at";
-import "babel-polyfill/lib/core-js/modules/es6.string.starts-with";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-end";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-start";
-import "babel-polyfill/lib/core-js/modules/es6.array.fill";
-import "babel-polyfill/lib/core-js/modules/es6.array.find-index";
-import "babel-polyfill/lib/core-js/modules/es6.array.find";
-import "babel-polyfill/lib/core-js/modules/es7.array.includes";
-import "babel-polyfill/lib/core-js/modules/es6.string.includes";
-import "babel-polyfill/lib/core-js/modules/es6.map";
-import "babel-polyfill/lib/core-js/modules/es6.array.from";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.split";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.replace";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.search";
+import "@babel/polyfill/lib/core-js/modules/es6.array.copy-within";
+import "@babel/polyfill/lib/core-js/modules/es6.string.ends-with";
+import "@babel/polyfill/lib/core-js/modules/es6.string.code-point-at";
+import "@babel/polyfill/lib/core-js/modules/es6.string.starts-with";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-end";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-start";
+import "@babel/polyfill/lib/core-js/modules/es6.array.fill";
+import "@babel/polyfill/lib/core-js/modules/es6.array.find-index";
+import "@babel/polyfill/lib/core-js/modules/es6.array.find";
+import "@babel/polyfill/lib/core-js/modules/es7.array.includes";
+import "@babel/polyfill/lib/core-js/modules/es6.string.includes";
+import "@babel/polyfill/lib/core-js/modules/es6.map";
+import "@babel/polyfill/lib/core-js/modules/es6.array.from";
 Array.from; // static function
 
 Map; // top level built-in
@@ -47,4 +47,4 @@ j["search"]; // computed with template
 k[asdf3]; // computed with concat strings
 
 var _k2 = k,
-    _a = _k2[asdf2]; // computed
+    _a = _k2[asdf2]; // computed

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/expected.js

@@ -1,9 +1,9 @@
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
-import "babel-polyfill/lib/core-js/modules/es6.symbol";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.match";
-import "babel-polyfill/lib/core-js/modules/es6.promise";
-import "babel-polyfill/lib/core-js/modules/es6.map";
-import "babel-polyfill/lib/core-js/modules/es6.array.from";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
+import "@babel/polyfill/lib/core-js/modules/es6.symbol";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.match";
+import "@babel/polyfill/lib/core-js/modules/es6.promise";
+import "@babel/polyfill/lib/core-js/modules/es6.map";
+import "@babel/polyfill/lib/core-js/modules/es6.array.from";
 Array.from; // static method
 
 Map; // built-in
@@ -31,4 +31,4 @@ G.assign; // static method
 
 function H(WeakMap) {
   var blah = new WeakMap();
-} // shadowed
+} // shadowed

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/expected.js

@@ -1,5 +1,5 @@
-import "babel-polyfill/lib/core-js/modules/es6.promise";
-import "babel-polyfill/lib/regenerator-runtime/runtime";
+import "@babel/polyfill/lib/core-js/modules/es6.promise";
+import "@babel/polyfill/lib/regenerator-runtime/runtime";
 
 var a = function () {
   var _ref = _asyncToGenerator(

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/expected.js

@@ -1,4 +1,4 @@
-import "babel-polyfill/lib/regenerator-runtime/runtime";
+import "@babel/polyfill/lib/regenerator-runtime/runtime";
 
 var _marked =
 /*#__PURE__*/

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/actual.js

@@ -1,4 +1,4 @@
-import "babel-polyfill";
-import "babel-polyfill";
-require("babel-polyfill");
-require("babel-polyfill");
+import "@babel/polyfill";
+import "@babel/polyfill";
+require("@babel/polyfill");
+require("@babel/polyfill");

experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-tranform/expected.js

@@ -1,5 +1,5 @@
 "use strict";
 
-require("babel-polyfill/lib/core-js/modules/es6.promise");
+require("@babel/polyfill/lib/core-js/modules/es6.promise");
 
-Promise;
+Promise;

experimental/babel-preset-env/test/fixtures/preset-options/.use-builtins-all-exec/exec.js

@@ -1,3 +1,3 @@
 if (parseInt(process.version.slice(1)) > 5) {
-  require('babel-polyfill');
+  require('@babel/polyfill');
 }

experimental/babel-preset-env/test/fixtures/preset-options/electron/actual.js

@@ -1,3 +1,3 @@
-import "babel-polyfill";
+import "@babel/polyfill";
 
 a ** b;

experimental/babel-preset-env/test/fixtures/preset-options/electron/expected.js

@@ -1,9 +1,9 @@
-import "babel-polyfill/lib/core-js/modules/es7.object.values";
-import "babel-polyfill/lib/core-js/modules/es7.object.entries";
-import "babel-polyfill/lib/core-js/modules/es7.object.get-own-property-descriptors";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-start";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-end";
-import "babel-polyfill/lib/core-js/modules/web.timers";
-import "babel-polyfill/lib/core-js/modules/web.immediate";
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
-a ** b;
+import "@babel/polyfill/lib/core-js/modules/es7.object.values";
+import "@babel/polyfill/lib/core-js/modules/es7.object.entries";
+import "@babel/polyfill/lib/core-js/modules/es7.object.get-own-property-descriptors";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-start";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-end";
+import "@babel/polyfill/lib/core-js/modules/web.timers";
+import "@babel/polyfill/lib/core-js/modules/web.immediate";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
+a ** b;

experimental/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/actual.js

@@ -1 +1 @@
-import "babel-polyfill";
+import "@babel/polyfill";

experimental/babel-preset-env/test/fixtures/preset-options/exclude-include/actual.js

@@ -1,7 +1,7 @@
-import "babel-polyfill";
+import "@babel/polyfill";
 
 async function a() {
   await 1;
 }
 
-(() => {})
+(() => {})

experimental/babel-preset-env/test/fixtures/preset-options/exclude-include/expected.js

@@ -1,11 +1,11 @@
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-end";
-import "babel-polyfill/lib/core-js/modules/web.timers";
-import "babel-polyfill/lib/core-js/modules/web.immediate";
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
-import "babel-polyfill/lib/core-js/modules/es6.map";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-end";
+import "@babel/polyfill/lib/core-js/modules/web.timers";
+import "@babel/polyfill/lib/core-js/modules/web.immediate";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
+import "@babel/polyfill/lib/core-js/modules/es6.map";
 
 async function a() {
   await 1;
 }
 
-(function () {});
+(function () {});

experimental/babel-preset-env/test/fixtures/preset-options/exclude-include/options.json

@@ -12,7 +12,7 @@
         "es7.string.pad-start"
       ],
       "include": [
-        "transform-es2015-arrow-functions",
+        "transform-arrow-functions",
         "es6.map"
       ]
     }]

experimental/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/actual.js

@@ -1 +1 @@
-import "babel-polyfill";
+import "@babel/polyfill";

experimental/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/expected.js

@@ -1,88 +1,98 @@
-import "babel-polyfill/lib/core-js/modules/es6.typed.array-buffer";
-import "babel-polyfill/lib/core-js/modules/es6.typed.data-view";
-import "babel-polyfill/lib/core-js/modules/es6.typed.int8-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint8-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint8-clamped-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.int16-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint16-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.int32-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint32-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.float32-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.float64-array";
-import "babel-polyfill/lib/core-js/modules/es6.map";
-import "babel-polyfill/lib/core-js/modules/es6.set";
-import "babel-polyfill/lib/core-js/modules/es6.weak-map";
-import "babel-polyfill/lib/core-js/modules/es6.weak-set";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.apply";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.construct";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.define-property";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.delete-property";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.get";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.get-own-property-descriptor";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.get-prototype-of";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.has";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.is-extensible";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.own-keys";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.prevent-extensions";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.set";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.set-prototype-of";
-import "babel-polyfill/lib/core-js/modules/es6.promise";
-import "babel-polyfill/lib/core-js/modules/es6.symbol";
-import "babel-polyfill/lib/core-js/modules/es6.object.assign";
-import "babel-polyfill/lib/core-js/modules/es6.object.is";
-import "babel-polyfill/lib/core-js/modules/es6.object.set-prototype-of";
-import "babel-polyfill/lib/core-js/modules/es6.function.name";
-import "babel-polyfill/lib/core-js/modules/es6.string.raw";
-import "babel-polyfill/lib/core-js/modules/es6.string.from-code-point";
-import "babel-polyfill/lib/core-js/modules/es6.string.code-point-at";
-import "babel-polyfill/lib/core-js/modules/es6.string.repeat";
-import "babel-polyfill/lib/core-js/modules/es6.string.starts-with";
-import "babel-polyfill/lib/core-js/modules/es6.string.ends-with";
-import "babel-polyfill/lib/core-js/modules/es6.string.includes";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.flags";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.match";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.replace";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.split";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.search";
-import "babel-polyfill/lib/core-js/modules/es6.array.from";
-import "babel-polyfill/lib/core-js/modules/es6.array.of";
-import "babel-polyfill/lib/core-js/modules/es6.array.copy-within";
-import "babel-polyfill/lib/core-js/modules/es6.array.find";
-import "babel-polyfill/lib/core-js/modules/es6.array.find-index";
-import "babel-polyfill/lib/core-js/modules/es6.array.fill";
-import "babel-polyfill/lib/core-js/modules/es6.array.iterator";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-finite";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-safe-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-nan";
-import "babel-polyfill/lib/core-js/modules/es6.number.epsilon";
-import "babel-polyfill/lib/core-js/modules/es6.number.min-safe-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.max-safe-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.parse-float";
-import "babel-polyfill/lib/core-js/modules/es6.number.parse-int";
-import "babel-polyfill/lib/core-js/modules/es6.math.acosh";
-import "babel-polyfill/lib/core-js/modules/es6.math.asinh";
-import "babel-polyfill/lib/core-js/modules/es6.math.atanh";
-import "babel-polyfill/lib/core-js/modules/es6.math.cbrt";
-import "babel-polyfill/lib/core-js/modules/es6.math.clz32";
-import "babel-polyfill/lib/core-js/modules/es6.math.cosh";
-import "babel-polyfill/lib/core-js/modules/es6.math.expm1";
-import "babel-polyfill/lib/core-js/modules/es6.math.fround";
-import "babel-polyfill/lib/core-js/modules/es6.math.hypot";
-import "babel-polyfill/lib/core-js/modules/es6.math.imul";
-import "babel-polyfill/lib/core-js/modules/es6.math.log1p";
-import "babel-polyfill/lib/core-js/modules/es6.math.log10";
-import "babel-polyfill/lib/core-js/modules/es6.math.log2";
-import "babel-polyfill/lib/core-js/modules/es6.math.sign";
-import "babel-polyfill/lib/core-js/modules/es6.math.sinh";
-import "babel-polyfill/lib/core-js/modules/es6.math.tanh";
-import "babel-polyfill/lib/core-js/modules/es6.math.trunc";
-import "babel-polyfill/lib/core-js/modules/es7.array.includes";
-import "babel-polyfill/lib/core-js/modules/es7.object.values";
-import "babel-polyfill/lib/core-js/modules/es7.object.entries";
-import "babel-polyfill/lib/core-js/modules/es7.object.get-own-property-descriptors";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-start";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-end";
-import "babel-polyfill/lib/core-js/modules/web.timers";
-import "babel-polyfill/lib/core-js/modules/web.immediate";
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.array-buffer";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.data-view";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.int8-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint8-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint8-clamped-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.int16-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint16-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.int32-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint32-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.float32-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.float64-array";
+import "@babel/polyfill/lib/core-js/modules/es6.map";
+import "@babel/polyfill/lib/core-js/modules/es6.set";
+import "@babel/polyfill/lib/core-js/modules/es6.weak-map";
+import "@babel/polyfill/lib/core-js/modules/es6.weak-set";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.apply";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.construct";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.define-property";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.delete-property";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.get";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.get-own-property-descriptor";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.get-prototype-of";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.has";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.is-extensible";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.own-keys";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.prevent-extensions";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.set";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.set-prototype-of";
+import "@babel/polyfill/lib/core-js/modules/es6.promise";
+import "@babel/polyfill/lib/core-js/modules/es6.symbol";
+import "@babel/polyfill/lib/core-js/modules/es6.object.freeze";
+import "@babel/polyfill/lib/core-js/modules/es6.object.seal";
+import "@babel/polyfill/lib/core-js/modules/es6.object.prevent-extensions";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is-frozen";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is-sealed";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is-extensible";
+import "@babel/polyfill/lib/core-js/modules/es6.object.get-own-property-descriptor";
+import "@babel/polyfill/lib/core-js/modules/es6.object.get-prototype-of";
+import "@babel/polyfill/lib/core-js/modules/es6.object.keys";
+import "@babel/polyfill/lib/core-js/modules/es6.object.get-own-property-names";
+import "@babel/polyfill/lib/core-js/modules/es6.object.assign";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is";
+import "@babel/polyfill/lib/core-js/modules/es6.object.set-prototype-of";
+import "@babel/polyfill/lib/core-js/modules/es6.function.name";
+import "@babel/polyfill/lib/core-js/modules/es6.string.raw";
+import "@babel/polyfill/lib/core-js/modules/es6.string.from-code-point";
+import "@babel/polyfill/lib/core-js/modules/es6.string.code-point-at";
+import "@babel/polyfill/lib/core-js/modules/es6.string.repeat";
+import "@babel/polyfill/lib/core-js/modules/es6.string.starts-with";
+import "@babel/polyfill/lib/core-js/modules/es6.string.ends-with";
+import "@babel/polyfill/lib/core-js/modules/es6.string.includes";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.flags";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.match";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.replace";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.split";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.search";
+import "@babel/polyfill/lib/core-js/modules/es6.array.from";
+import "@babel/polyfill/lib/core-js/modules/es6.array.of";
+import "@babel/polyfill/lib/core-js/modules/es6.array.copy-within";
+import "@babel/polyfill/lib/core-js/modules/es6.array.find";
+import "@babel/polyfill/lib/core-js/modules/es6.array.find-index";
+import "@babel/polyfill/lib/core-js/modules/es6.array.fill";
+import "@babel/polyfill/lib/core-js/modules/es6.array.iterator";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-finite";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-safe-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-nan";
+import "@babel/polyfill/lib/core-js/modules/es6.number.epsilon";
+import "@babel/polyfill/lib/core-js/modules/es6.number.min-safe-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.max-safe-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.parse-float";
+import "@babel/polyfill/lib/core-js/modules/es6.number.parse-int";
+import "@babel/polyfill/lib/core-js/modules/es6.math.acosh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.asinh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.atanh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.cbrt";
+import "@babel/polyfill/lib/core-js/modules/es6.math.clz32";
+import "@babel/polyfill/lib/core-js/modules/es6.math.cosh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.expm1";
+import "@babel/polyfill/lib/core-js/modules/es6.math.fround";
+import "@babel/polyfill/lib/core-js/modules/es6.math.hypot";
+import "@babel/polyfill/lib/core-js/modules/es6.math.imul";
+import "@babel/polyfill/lib/core-js/modules/es6.math.log1p";
+import "@babel/polyfill/lib/core-js/modules/es6.math.log10";
+import "@babel/polyfill/lib/core-js/modules/es6.math.log2";
+import "@babel/polyfill/lib/core-js/modules/es6.math.sign";
+import "@babel/polyfill/lib/core-js/modules/es6.math.sinh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.tanh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.trunc";
+import "@babel/polyfill/lib/core-js/modules/es7.array.includes";
+import "@babel/polyfill/lib/core-js/modules/es7.object.values";
+import "@babel/polyfill/lib/core-js/modules/es7.object.entries";
+import "@babel/polyfill/lib/core-js/modules/es7.object.get-own-property-descriptors";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-start";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-end";
+import "@babel/polyfill/lib/core-js/modules/web.timers";
+import "@babel/polyfill/lib/core-js/modules/web.immediate";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";

experimental/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/actual.js

@@ -1 +1 @@
-import "babel-polyfill";
+import "@babel/polyfill";

experimental/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/expected.js

@@ -1,87 +1,97 @@
-import "babel-polyfill/lib/core-js/modules/es6.typed.array-buffer";
-import "babel-polyfill/lib/core-js/modules/es6.typed.int8-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint8-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint8-clamped-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.int16-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint16-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.int32-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.uint32-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.float32-array";
-import "babel-polyfill/lib/core-js/modules/es6.typed.float64-array";
-import "babel-polyfill/lib/core-js/modules/es6.map";
-import "babel-polyfill/lib/core-js/modules/es6.set";
-import "babel-polyfill/lib/core-js/modules/es6.weak-map";
-import "babel-polyfill/lib/core-js/modules/es6.weak-set";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.apply";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.construct";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.define-property";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.delete-property";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.get";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.get-own-property-descriptor";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.get-prototype-of";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.has";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.is-extensible";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.own-keys";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.prevent-extensions";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.set";
-import "babel-polyfill/lib/core-js/modules/es6.reflect.set-prototype-of";
-import "babel-polyfill/lib/core-js/modules/es6.promise";
-import "babel-polyfill/lib/core-js/modules/es6.symbol";
-import "babel-polyfill/lib/core-js/modules/es6.object.assign";
-import "babel-polyfill/lib/core-js/modules/es6.object.is";
-import "babel-polyfill/lib/core-js/modules/es6.function.name";
-import "babel-polyfill/lib/core-js/modules/es6.string.raw";
-import "babel-polyfill/lib/core-js/modules/es6.string.from-code-point";
-import "babel-polyfill/lib/core-js/modules/es6.string.code-point-at";
-import "babel-polyfill/lib/core-js/modules/es6.string.repeat";
-import "babel-polyfill/lib/core-js/modules/es6.string.starts-with";
-import "babel-polyfill/lib/core-js/modules/es6.string.ends-with";
-import "babel-polyfill/lib/core-js/modules/es6.string.includes";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.flags";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.match";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.replace";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.split";
-import "babel-polyfill/lib/core-js/modules/es6.regexp.search";
-import "babel-polyfill/lib/core-js/modules/es6.array.from";
-import "babel-polyfill/lib/core-js/modules/es6.array.of";
-import "babel-polyfill/lib/core-js/modules/es6.array.copy-within";
-import "babel-polyfill/lib/core-js/modules/es6.array.find";
-import "babel-polyfill/lib/core-js/modules/es6.array.find-index";
-import "babel-polyfill/lib/core-js/modules/es6.array.fill";
-import "babel-polyfill/lib/core-js/modules/es6.array.iterator";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-finite";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-safe-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.is-nan";
-import "babel-polyfill/lib/core-js/modules/es6.number.epsilon";
-import "babel-polyfill/lib/core-js/modules/es6.number.min-safe-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.max-safe-integer";
-import "babel-polyfill/lib/core-js/modules/es6.number.parse-float";
-import "babel-polyfill/lib/core-js/modules/es6.number.parse-int";
-import "babel-polyfill/lib/core-js/modules/es6.math.acosh";
-import "babel-polyfill/lib/core-js/modules/es6.math.asinh";
-import "babel-polyfill/lib/core-js/modules/es6.math.atanh";
-import "babel-polyfill/lib/core-js/modules/es6.math.cbrt";
-import "babel-polyfill/lib/core-js/modules/es6.math.clz32";
-import "babel-polyfill/lib/core-js/modules/es6.math.cosh";
-import "babel-polyfill/lib/core-js/modules/es6.math.expm1";
-import "babel-polyfill/lib/core-js/modules/es6.math.fround";
-import "babel-polyfill/lib/core-js/modules/es6.math.hypot";
-import "babel-polyfill/lib/core-js/modules/es6.math.imul";
-import "babel-polyfill/lib/core-js/modules/es6.math.log1p";
-import "babel-polyfill/lib/core-js/modules/es6.math.log10";
-import "babel-polyfill/lib/core-js/modules/es6.math.log2";
-import "babel-polyfill/lib/core-js/modules/es6.math.sign";
-import "babel-polyfill/lib/core-js/modules/es6.math.sinh";
-import "babel-polyfill/lib/core-js/modules/es6.math.tanh";
-import "babel-polyfill/lib/core-js/modules/es6.math.trunc";
-import "babel-polyfill/lib/core-js/modules/es7.array.includes";
-import "babel-polyfill/lib/core-js/modules/es7.object.values";
-import "babel-polyfill/lib/core-js/modules/es7.object.entries";
-import "babel-polyfill/lib/core-js/modules/es7.object.get-own-property-descriptors";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-start";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-end";
-import "babel-polyfill/lib/core-js/modules/web.timers";
-import "babel-polyfill/lib/core-js/modules/web.immediate";
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
-import "babel-polyfill/lib/regenerator-runtime/runtime";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.array-buffer";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.int8-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint8-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint8-clamped-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.int16-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint16-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.int32-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.uint32-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.float32-array";
+import "@babel/polyfill/lib/core-js/modules/es6.typed.float64-array";
+import "@babel/polyfill/lib/core-js/modules/es6.map";
+import "@babel/polyfill/lib/core-js/modules/es6.set";
+import "@babel/polyfill/lib/core-js/modules/es6.weak-map";
+import "@babel/polyfill/lib/core-js/modules/es6.weak-set";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.apply";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.construct";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.define-property";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.delete-property";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.get";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.get-own-property-descriptor";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.get-prototype-of";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.has";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.is-extensible";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.own-keys";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.prevent-extensions";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.set";
+import "@babel/polyfill/lib/core-js/modules/es6.reflect.set-prototype-of";
+import "@babel/polyfill/lib/core-js/modules/es6.promise";
+import "@babel/polyfill/lib/core-js/modules/es6.symbol";
+import "@babel/polyfill/lib/core-js/modules/es6.object.freeze";
+import "@babel/polyfill/lib/core-js/modules/es6.object.seal";
+import "@babel/polyfill/lib/core-js/modules/es6.object.prevent-extensions";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is-frozen";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is-sealed";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is-extensible";
+import "@babel/polyfill/lib/core-js/modules/es6.object.get-own-property-descriptor";
+import "@babel/polyfill/lib/core-js/modules/es6.object.get-prototype-of";
+import "@babel/polyfill/lib/core-js/modules/es6.object.keys";
+import "@babel/polyfill/lib/core-js/modules/es6.object.get-own-property-names";
+import "@babel/polyfill/lib/core-js/modules/es6.object.assign";
+import "@babel/polyfill/lib/core-js/modules/es6.object.is";
+import "@babel/polyfill/lib/core-js/modules/es6.function.name";
+import "@babel/polyfill/lib/core-js/modules/es6.string.raw";
+import "@babel/polyfill/lib/core-js/modules/es6.string.from-code-point";
+import "@babel/polyfill/lib/core-js/modules/es6.string.code-point-at";
+import "@babel/polyfill/lib/core-js/modules/es6.string.repeat";
+import "@babel/polyfill/lib/core-js/modules/es6.string.starts-with";
+import "@babel/polyfill/lib/core-js/modules/es6.string.ends-with";
+import "@babel/polyfill/lib/core-js/modules/es6.string.includes";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.flags";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.match";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.replace";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.split";
+import "@babel/polyfill/lib/core-js/modules/es6.regexp.search";
+import "@babel/polyfill/lib/core-js/modules/es6.array.from";
+import "@babel/polyfill/lib/core-js/modules/es6.array.of";
+import "@babel/polyfill/lib/core-js/modules/es6.array.copy-within";
+import "@babel/polyfill/lib/core-js/modules/es6.array.find";
+import "@babel/polyfill/lib/core-js/modules/es6.array.find-index";
+import "@babel/polyfill/lib/core-js/modules/es6.array.fill";
+import "@babel/polyfill/lib/core-js/modules/es6.array.iterator";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-finite";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-safe-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.is-nan";
+import "@babel/polyfill/lib/core-js/modules/es6.number.epsilon";
+import "@babel/polyfill/lib/core-js/modules/es6.number.min-safe-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.max-safe-integer";
+import "@babel/polyfill/lib/core-js/modules/es6.number.parse-float";
+import "@babel/polyfill/lib/core-js/modules/es6.number.parse-int";
+import "@babel/polyfill/lib/core-js/modules/es6.math.acosh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.asinh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.atanh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.cbrt";
+import "@babel/polyfill/lib/core-js/modules/es6.math.clz32";
+import "@babel/polyfill/lib/core-js/modules/es6.math.cosh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.expm1";
+import "@babel/polyfill/lib/core-js/modules/es6.math.fround";
+import "@babel/polyfill/lib/core-js/modules/es6.math.hypot";
+import "@babel/polyfill/lib/core-js/modules/es6.math.imul";
+import "@babel/polyfill/lib/core-js/modules/es6.math.log1p";
+import "@babel/polyfill/lib/core-js/modules/es6.math.log10";
+import "@babel/polyfill/lib/core-js/modules/es6.math.log2";
+import "@babel/polyfill/lib/core-js/modules/es6.math.sign";
+import "@babel/polyfill/lib/core-js/modules/es6.math.sinh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.tanh";
+import "@babel/polyfill/lib/core-js/modules/es6.math.trunc";
+import "@babel/polyfill/lib/core-js/modules/es7.array.includes";
+import "@babel/polyfill/lib/core-js/modules/es7.object.values";
+import "@babel/polyfill/lib/core-js/modules/es7.object.entries";
+import "@babel/polyfill/lib/core-js/modules/es7.object.get-own-property-descriptors";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-start";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-end";
+import "@babel/polyfill/lib/core-js/modules/web.timers";
+import "@babel/polyfill/lib/core-js/modules/web.immediate";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
+import "@babel/polyfill/lib/regenerator-runtime/runtime";

experimental/babel-preset-env/test/fixtures/preset-options/include-built-ins/actual.js

@@ -1 +1 @@
-import "babel-polyfill";
+import "@babel/polyfill";

experimental/babel-preset-env/test/fixtures/preset-options/include-built-ins/expected.js

@@ -1,7 +1,7 @@
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-start";
-import "babel-polyfill/lib/core-js/modules/es7.string.pad-end";
-import "babel-polyfill/lib/core-js/modules/web.timers";
-import "babel-polyfill/lib/core-js/modules/web.immediate";
-import "babel-polyfill/lib/core-js/modules/web.dom.iterable";
-import "babel-polyfill/lib/core-js/modules/es6.map";
-import "babel-polyfill/lib/core-js/modules/es6.set";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-start";
+import "@babel/polyfill/lib/core-js/modules/es7.string.pad-end";
+import "@babel/polyfill/lib/core-js/modules/web.timers";
+import "@babel/polyfill/lib/core-js/modules/web.immediate";
+import "@babel/polyfill/lib/core-js/modules/web.dom.iterable";
+import "@babel/polyfill/lib/core-js/modules/es6.map";
+import "@babel/polyfill/lib/core-js/modules/es6.set";

experimental/babel-preset-env/test/fixtures/preset-options/include/options.json

@@ -2,7 +2,7 @@
   "presets": [
     ["../../../../lib", {
       "targets": {},
-      "include": ["transform-es2015-modules-commonjs"],
+      "include": ["transform-modules-commonjs"],
       "modules": false
     }]
   ]

experimental/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/expected.js

@@ -1,5 +1,5 @@
 var agf = function () {
-  var _ref = _asyncGenerator.wrap(
+  var _ref = _wrapAsyncGenerator(
   /*#__PURE__*/
   regeneratorRuntime.mark(function _callee() {
     return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -7,7 +7,7 @@ var agf = function () {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return _asyncGenerator.await(1);
+            return _awaitAsyncGenerator(1);
 
           case 2:
             _context.next = 4;
@@ -26,19 +26,21 @@ var agf = function () {
   };
 }();
 
-function AwaitValue(value) { this.value = value; }
+function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
 
-function AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; if (value instanceof AwaitValue) { Promise.resolve(value.value).then(function (arg) { resume("next", arg); }, function (arg) { resume("throw", arg); }); } else { settle(result.done ? "return" : "normal", result.value); } } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
+function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
 
-if (typeof Symbol === "function" && Symbol.asyncIterator) { AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
+function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
 
-AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
+if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
 
-AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
+_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
 
-AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
+_AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
 
-var _asyncGenerator = { wrap: function wrap(fn) { return function () { return new AsyncGenerator(fn.apply(this, arguments)); }; }, await: function _await(value) { return new AwaitValue(value); } };
+_AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
+
+function _AwaitValue(value) { this.wrapped = value; }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 

experimental/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/expected.js

@@ -1,15 +1,15 @@
 "use strict";
 
-require("babel-polyfill/lib/core-js/modules/es6.symbol");
+require("@babel/polyfill/lib/core-js/modules/es6.symbol");
 
-require("babel-polyfill/lib/core-js/modules/es6.promise");
+require("@babel/polyfill/lib/core-js/modules/es6.promise");
 
-require("babel-polyfill/lib/regenerator-runtime/runtime");
+require("@babel/polyfill/lib/regenerator-runtime/runtime");
 
-require("babel-polyfill/lib/core-js/modules/es6.object.assign");
+require("@babel/polyfill/lib/core-js/modules/es6.object.assign");
 
 var agf = function () {
-  var _ref = _asyncGenerator.wrap(
+  var _ref = _wrapAsyncGenerator(
   /*#__PURE__*/
   regeneratorRuntime.mark(function _callee() {
     return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -17,7 +17,7 @@ var agf = function () {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return _asyncGenerator.await(1);
+            return _awaitAsyncGenerator(1);
 
           case 2:
             _context.next = 4;
@@ -36,19 +36,21 @@ var agf = function () {
   };
 }();
 
-function AwaitValue(value) { this.value = value; }
+function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
 
-function AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; if (value instanceof AwaitValue) { Promise.resolve(value.value).then(function (arg) { resume("next", arg); }, function (arg) { resume("throw", arg); }); } else { settle(result.done ? "return" : "normal", result.value); } } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
+function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
 
-if (typeof Symbol === "function" && Symbol.asyncIterator) { AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
+function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
 
-AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
+if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
 
-AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
+_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
 
-AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
+_AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
 
-var _asyncGenerator = { wrap: function wrap(fn) { return function () { return new AsyncGenerator(fn.apply(this, arguments)); }; }, await: function _await(value) { return new AwaitValue(value); } };
+_AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
+
+function _AwaitValue(value) { this.wrapped = value; }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 

experimental/babel-preset-env/test/fixtures/preset-options/shippedProposals/expected.js

@@ -1,5 +1,5 @@
 var agf = function () {
-  var _ref = _asyncGenerator.wrap(
+  var _ref = _wrapAsyncGenerator(
   /*#__PURE__*/
   regeneratorRuntime.mark(function _callee() {
     return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -7,7 +7,7 @@ var agf = function () {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return _asyncGenerator.await(1);
+            return _awaitAsyncGenerator(1);
 
           case 2:
             _context.next = 4;
@@ -26,19 +26,21 @@ var agf = function () {
   };
 }();
 
-function AwaitValue(value) { this.value = value; }
+function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
 
-function AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; if (value instanceof AwaitValue) { Promise.resolve(value.value).then(function (arg) { resume("next", arg); }, function (arg) { resume("throw", arg); }); } else { settle(result.done ? "return" : "normal", result.value); } } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
+function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
 
-if (typeof Symbol === "function" && Symbol.asyncIterator) { AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
+function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
 
-AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
+if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
 
-AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
+_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
 
-AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
+_AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
 
-var _asyncGenerator = { wrap: function wrap(fn) { return function () { return new AsyncGenerator(fn.apply(this, arguments)); }; }, await: function _await(value) { return new AwaitValue(value); } };
+_AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
+
+function _AwaitValue(value) { this.wrapped = value; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }