From 1f842fec0fd4c20a2c1075b55a6def065e292670 Mon Sep 17 00:00:00 2001
From: Daniel Tschinder <daniel@tschinder.de>
Date: Sat, 1 Dec 2018 18:24:56 -0800
Subject: [PATCH 1/3] Ignore fixture directories that do not contain input or
 exec

---
 packages/babel-helper-fixtures/src/index.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/babel-helper-fixtures/src/index.js b/packages/babel-helper-fixtures/src/index.js
index 29a15433658e..687d642105c9 100644
--- a/packages/babel-helper-fixtures/src/index.js
+++ b/packages/babel-helper-fixtures/src/index.js
@@ -70,7 +70,7 @@ function findFile(filepath: string, allowJSON: boolean) {
     throw new Error(`Found conflicting file matches: ${matches.join(", ")}`);
   }
 
-  return matches[0] || filepath + ".js";
+  return matches[0];
 }
 
 export default function get(entryLoc): Array<Suite> {
@@ -101,10 +101,23 @@ export default function get(entryLoc): Array<Suite> {
     }
 
     function push(taskName, taskDir) {
-      const actualLoc = findFile(taskDir + "/input");
-      const expectLoc = findFile(taskDir + "/output", true /* allowJSON */);
+      const taskDirStats = fs.statSync(taskDir);
+      let actualLoc = findFile(taskDir + "/input");
       let execLoc = findFile(taskDir + "/exec");
 
+      // If neither input nor exec is present it is not a real testcase
+      if (taskDirStats.isDirectory() && !actualLoc && !execLoc) {
+        return;
+      } else if (!actualLoc) {
+        actualLoc = taskDir + "/input.js";
+      } else if (!execLoc) {
+        execLoc = taskDir + "/exec.js";
+      }
+
+      const expectLoc =
+        findFile(taskDir + "/output", true /* allowJSON */) ||
+        taskDir + "/output.js";
+
       const actualLocAlias =
         suiteName + "/" + taskName + "/" + path.basename(actualLoc);
       const expectLocAlias =
@@ -112,7 +125,7 @@ export default function get(entryLoc): Array<Suite> {
       let execLocAlias =
         suiteName + "/" + taskName + "/" + path.basename(actualLoc);
 
-      if (fs.statSync(taskDir).isFile()) {
+      if (taskDirStats.isFile()) {
         const ext = path.extname(taskDir);
         if (EXTENSIONS.indexOf(ext) === -1) return;
 

From e61e64823847778eac4b29ec3bdf282c27928b16 Mon Sep 17 00:00:00 2001
From: Daniel Tschinder <daniel@tschinder.de>
Date: Sat, 1 Dec 2018 18:28:48 -0800
Subject: [PATCH 2/3] Fix parser test fixtures structures for some imported
 esprima tests.

---
 .../input.js}                                 |   0
 .../object-binding-pattern-01/output.json     | 370 ++++++++++++
 .../input.js}                                 |   0
 .../object-binding-pattern-empty/output.json  | 106 ++++
 .../input.js}                                 |   0
 .../options.json                              |   3 +
 .../input.js}                                 |   0
 .../options.json                              |   3 +
 .../input.js}                                 |   0
 .../options.json                              |   3 +
 .../input.js}                                 |   0
 .../options.json                              |   3 +
 .../input.js}                                 |   0
 .../output.json                               | 194 +++++++
 .../input.js}                                 |   0
 .../output.json                               | 534 ++++++++++++++++++
 .../invalid-member-expr.failure.json          |   1 -
 .../invalid-method-in-pattern.failure.json    |   1 -
 .../invalid-nested-param.failure.json         |   1 -
 ...d-pattern-without-parenthesis.failure.json |   1 -
 ...nvalid-rest-in-object-pattern.failure.json |   1 -
 .../object-binding-pattern/output.json        |  34 --
 .../.invalid_lone_surrogate/input.js          |   2 +-
 .../escape-sequences/input.js                 |   2 +-
 .../escape-sequences/output.json              |  85 ++-
 .../line-terminators/input.js                 |   2 +-
 .../line-terminators/output.json              |  85 ++-
 .../literal-escape-sequences/input.js         |   2 +-
 .../literal-escape-sequences/output.json      |  85 ++-
 .../migrated_0000/input.js                    |   2 +-
 .../migrated_0000/output.json                 |  89 +--
 .../migrated_0001/input.js                    |   2 +-
 .../migrated_0001/output.json                 |  89 +--
 .../migrated_0002/input.js                    |   2 +-
 .../migrated_0002/output.json                 |  89 +--
 .../migrated_0000/input.js}                   |   0
 .../migrated_0000/output.json                 |  99 ++++
 .../migrated_0001/input.js}                   |   0
 .../migrated_0001/output.json                 |  99 ++++
 .../migrated_0002/input.js}                   |   0
 .../migrated_0002/output.json                 | 120 ++++
 .../migrated_0003/input.js}                   |   0
 .../migrated_0003/output.json                 | 120 ++++
 .../migrated_0004/input.js}                   |   0
 .../migrated_0004/output.json                 | 122 ++++
 .../migrated_0005/input.js}                   |   0
 .../migrated_0005/output.json                 | 160 ++++++
 .../migrated_0006/input.js}                   |   0
 .../migrated_0006/output.json                 | 161 ++++++
 .../migrated_0007/input.js}                   |   0
 .../migrated_0007/output.json                 |  99 ++++
 .../migrated_0008/input.js                    |   1 +
 .../migrated_0008/output.json                 |  99 ++++
 .../migrated_0009/input.js                    |   1 +
 .../migrated_0009/output.json                 |  99 ++++
 .../migrated_0010/input.js                    |   1 +
 .../migrated_0010/output.json                 |  99 ++++
 .../migrated_0011/input.js                    |   1 +
 .../migrated_0011/output.json                 |  99 ++++
 .../migrated_0012/input.js                    |   1 +
 .../migrated_0012/options.json                |   3 +
 .../.migrated_0024/input.js}                  |   0
 .../.migrated_0024/output.json                |  70 +++
 .../migrated_0000/input.js}                   |   0
 .../migrated_0000/output.json                 |  70 +++
 .../migrated_0001/input.js}                   |   0
 .../migrated_0001/output.json                 |  70 +++
 .../migrated_0002/input.js}                   |   0
 .../migrated_0002/output.json                 |  70 +++
 .../migrated_0003/input.js}                   |   0
 .../migrated_0003/output.json                 |  70 +++
 .../migrated_0004/input.js}                   |   0
 .../migrated_0004/output.json                 |  70 +++
 .../migrated_0005/input.js}                   |   0
 .../migrated_0005/output.json                 |  70 +++
 .../migrated_0006/input.js}                   |   0
 .../migrated_0006/output.json                 |  70 +++
 .../migrated_0007/input.js}                   |   0
 .../migrated_0007/output.json                 |  70 +++
 .../migrated_0008/input.js}                   |   0
 .../migrated_0008/output.json                 |  70 +++
 .../migrated_0009/input.js}                   |   0
 .../migrated_0009/output.json                 |  70 +++
 .../migrated_0010/input.js}                   |   0
 .../migrated_0010/output.json                 |  70 +++
 .../migrated_0011/input.js}                   |   0
 .../migrated_0011/output.json                 |  70 +++
 .../migrated_0012/input.js}                   |   0
 .../migrated_0012/output.json                 |  70 +++
 .../migrated_0013/input.js}                   |   0
 .../migrated_0013/output.json                 |  70 +++
 .../migrated_0014/input.js}                   |   0
 .../migrated_0014/output.json                 |  70 +++
 .../migrated_0015/input.js}                   |   0
 .../migrated_0015/output.json                 |  70 +++
 .../migrated_0016/input.js}                   |   0
 .../migrated_0016/output.json                 |  70 +++
 .../migrated_0017/input.js}                   |   0
 .../migrated_0017/output.json                 |  70 +++
 .../migrated_0018/input.js}                   |   0
 .../migrated_0018/output.json                 |  70 +++
 .../migrated_0019/input.js}                   |   0
 .../migrated_0019/output.json                 |  70 +++
 .../migrated_0020/input.js}                   |   0
 .../migrated_0020/output.json                 |  70 +++
 .../migrated_0021/input.js}                   |   0
 .../migrated_0021/output.json                 |  70 +++
 .../migrated_0022/input.js}                   |   0
 .../migrated_0022/output.json                 |  70 +++
 .../migrated_0023/input.js}                   |   0
 .../migrated_0023/output.json                 |  70 +++
 .../.migrated_0005/input.js                   |   1 +
 .../.migrated_0006/input.js                   |   1 +
 .../.u-flag-invalid-range-4-hex/input.js}     |   0
 .../.u-flag-invalid-range-var-hex/input.js}   |   0
 .../migrated_0000/input.js}                   |   0
 .../migrated_0000/output.json                 |  70 +++
 .../migrated_0001/input.js}                   |   0
 .../migrated_0001/output.json                 |  87 +++
 .../migrated_0002/input.js}                   |   0
 .../migrated_0002/output.json                 |  40 +-
 .../migrated_0003/input.js}                   |   0
 .../migrated_0003/output.json                 |  40 +-
 .../migrated_0004/input.js}                   |   0
 .../migrated_0004/output.json                 |  40 +-
 .../migrated_0007/input.js}                   |   0
 .../migrated_0007}/output.json                |  40 +-
 .../migrated_0008/input.js}                   |   0
 .../migrated_0008/output.json                 | 105 ++++
 .../migrated_0009/input.js}                   |   0
 .../migrated_0009/output.json                 | 105 ++++
 .../migrated_0010/input.js}                   |   0
 .../migrated_0010/output.json                 | 105 ++++
 .../migrated_0011/input.js}                   |   0
 .../migrated_0011/output.json                 | 105 ++++
 .../migrated_0012/input.js}                   |   0
 .../migrated_0012/output.json                 | 105 ++++
 .../migrated_0013/input.js}                   |   0
 .../migrated_0013/output.json                 | 138 +++++
 .../u-flag-surrogate-pair/input.js}           |   0
 .../u-flag-surrogate-pair/output.json         | 105 ++++
 .../u-flag-valid-range/input.js}              |   0
 .../u-flag-valid-range/output.json            | 105 ++++
 .../migrated_0000/input.js}                   |   0
 .../migrated_0000/output.json                 |  70 +++
 .../migrated_0001/input.js}                   |   0
 .../migrated_0001/output.json                 |  70 +++
 .../migrated_0002/input.js                    |   1 +
 .../migrated_0002/output.json                 |  70 +++
 .../migrated_0003/input.js}                   |   0
 .../migrated_0003/output.json                 |  70 +++
 .../migrated_0006/input.js}                   |   0
 .../migrated_0006/output.json                 |  70 +++
 .../migrated_0007/input.js}                   |   0
 .../migrated_0007/output.json                 |  70 +++
 .../migrated_0008/input.js}                   |   0
 .../migrated_0008/output.json                 |  70 +++
 .../migrated_0009/input.js}                   |   0
 .../migrated_0009/output.json                 |  70 +++
 .../migrated_0010/input.js}                   |   0
 .../migrated_0010/output.json                 |  70 +++
 .../migrated_0011/input.js}                   |   0
 .../migrated_0011/output.json                 |  70 +++
 .../migrated_0012/input.js}                   |   0
 .../migrated_0012/output.json                 |  70 +++
 .../migrated_0013/input.js}                   |   0
 .../migrated_0013/output.json                 |  70 +++
 .../migrated_0015/input.js}                   |   0
 .../migrated_0015/output.json                 |  70 +++
 .../migrated_0016/input.js}                   |   0
 .../migrated_0016/output.json                 |  70 +++
 .../migrated_0017/input.js}                   |   0
 .../migrated_0017/output.json                 |  70 +++
 .../migrated_0018/input.js}                   |   0
 .../migrated_0018/output.json                 |  70 +++
 .../migrated_0000/input.js}                   |   0
 .../migrated_0000/output.json                 |  99 ++++
 .../migrated_0001/input.js}                   |   0
 .../migrated_0001/output.json                 |  99 ++++
 .../migrated_0002/input.js}                   |   0
 .../migrated_0002/output.json                 | 155 +++++
 .../migrated_0003/input.js}                   |   0
 .../migrated_0003/output.json                 | 155 +++++
 .../migrated_0004/input.js}                   |   0
 .../migrated_0004/output.json                 | 155 +++++
 .../migrated_0005/input.js}                   |   0
 .../migrated_0005/output.json                 | 155 +++++
 .../migrated_0006/input.js}                   |   0
 .../migrated_0006/output.json                 | 155 +++++
 .../migrated_0007/input.js}                   |   0
 .../migrated_0007/output.json                 | 158 ++++++
 .../migrated_0008/input.js}                   |   0
 .../migrated_0008/output.json                 | 210 +++++++
 .../migrated_0009/input.js}                   |   0
 .../migrated_0009/output.json                 | 189 +++++++
 .../migrated_0010/input.js}                   |   0
 .../migrated_0010/output.json                 | 156 +++++
 .../migrated_0011/input.js}                   |   0
 .../migrated_0011/output.json                 | 156 +++++
 .../migrated_0012/input.js}                   |   0
 .../migrated_0012/output.json                 | 156 +++++
 .../migrated_0013/input.js}                   |   0
 .../migrated_0013/output.json                 | 156 +++++
 .../migrated_0014/input.js}                   |   0
 .../migrated_0014/output.json                 | 156 +++++
 .../migrated_0015/input.js}                   |   0
 .../migrated_0015/output.json                 | 159 ++++++
 .../migrated_0016/input.js}                   |   0
 .../migrated_0016/output.json                 | 159 ++++++
 .../migrated_0017/input.js}                   |   0
 .../migrated_0017/output.json                 | 240 ++++++++
 .../migrated_0018/input.js}                   |   0
 .../migrated_0018/output.json                 | 240 ++++++++
 .../migrated_0019/input.js}                   |   0
 .../migrated_0019/output.json                 | 240 ++++++++
 .../migrated_0020/input.js}                   |   0
 .../migrated_0020/output.json                 | 240 ++++++++
 .../migrated_0021/input.js}                   |   0
 .../migrated_0021/output.json                 | 240 ++++++++
 .../migrated_0022/input.js}                   |   0
 .../migrated_0022/output.json                 | 243 ++++++++
 .../migrated_0023/input.js}                   |   0
 .../migrated_0023/output.json                 | 243 ++++++++
 .../migrated_0024/input.js}                   |   0
 .../migrated_0024/output.json                 | 155 +++++
 .../migrated_0025/input.js}                   |   0
 .../migrated_0025/output.json                 | 155 +++++
 .../migrated_0026/input.js}                   |   0
 .../migrated_0026/output.json                 | 155 +++++
 .../migrated_0027/input.js}                   |   0
 .../migrated_0027/output.json                 | 158 ++++++
 .../migrated_0028/input.js}                   |   0
 .../migrated_0028/output.json                 | 329 +++++++++++
 .../migrated_0029/input.js}                   |   0
 .../migrated_0029/output.json                 | 182 ++++++
 .../migrated_0030/input.js}                   |   0
 .../migrated_0030/output.json                 | 246 ++++++++
 .../migrated_0031/input.js}                   |   0
 .../migrated_0031/output.json                 | 250 ++++++++
 .../migrated_0032/input.js}                   |   0
 .../migrated_0032/output.json                 | 249 ++++++++
 .../migrated_0033/input.js}                   |   0
 .../migrated_0033/output.json                 | 267 +++++++++
 .../migrated_0034/input.js}                   |   0
 .../migrated_0034/output.json                 | 127 +++++
 .../migrated_0035/input.js}                   |   0
 .../migrated_0035/output.json                 | 142 +++++
 .../migrated_0036/input.js}                   |   0
 .../migrated_0036/output.json                 | 187 ++++++
 .../migrated_0037/input.js}                   |   0
 .../migrated_0037/output.json                 | 129 +++++
 .../migrated_0038/input.js}                   |   0
 .../migrated_0038/output.json                 | 180 ++++++
 .../migrated_0000/input.js}                   |   0
 .../migrated_0000/output.json                 |  65 +++
 .../migrated_0001/input.js}                   |   0
 .../migrated_0001/output.json                 |  65 +++
 .../migrated_0002/input.js}                   |   0
 .../migrated_0002/output.json                 |  70 +++
 .../migrated_0003/input.js}                   |   0
 .../migrated_0003/output.json                 | 146 +++++
 .../array/migrated_0008.source.js             |   1 -
 .../array/migrated_0009.source.js             |   1 -
 .../array/migrated_0010.source.js             |   1 -
 .../array/migrated_0011.source.js             |   1 -
 .../array/migrated_0012.source.js             |   1 -
 .../expression-primary/array/output.json      |  34 --
 .../expression-primary/literal/output.json    |  34 --
 .../migrated_0005.source.js                   |   1 -
 .../migrated_0006.failure.json                |   6 -
 .../migrated_0006.source.js                   |   1 -
 .../u-flag-invalid-range-4-hex.failure.json   |   6 -
 .../u-flag-invalid-range-var-hex.failure.json |   6 -
 .../literal/string/migrated_0002.source.js    |   1 -
 .../expression-primary/object/output.json     |  34 --
 .../expression-primary/other/output.json      |  34 --
 .../invalid-syntax/.migrated_0033/input.js    |   1 -
 .../.migrated_0033/options.json               |   3 -
 .../invalid-syntax/.migrated_0034/input.js    |   1 -
 .../.migrated_0034/options.json               |   3 -
 .../invalid-syntax/.migrated_0036/input.js    |   1 -
 .../.migrated_0036/options.json               |   3 -
 .../invalid-syntax/.migrated_0037/input.js    |   1 -
 .../.migrated_0037/options.json               |   3 -
 .../invalid-syntax/.migrated_0041/input.js    |   1 -
 .../.migrated_0041/options.json               |   3 -
 .../invalid-syntax/.migrated_0042/input.js    |   1 -
 .../.migrated_0042/options.json               |   3 -
 .../invalid-syntax/.migrated_0043/input.js    |   1 -
 .../.migrated_0043/options.json               |   3 -
 .../invalid-syntax/.migrated_0044/input.js    |   1 -
 .../.migrated_0044/options.json               |   3 -
 .../invalid-syntax/.migrated_0048/input.js    |   1 -
 .../.migrated_0048/options.json               |   3 -
 .../invalid-syntax/.migrated_0049/input.js    |   1 -
 .../.migrated_0049/options.json               |   3 -
 .../invalid-syntax/.migrated_0050/input.js    |   1 -
 .../.migrated_0050/options.json               |   3 -
 .../invalid-syntax/.migrated_0051/input.js    |   1 -
 .../.migrated_0051/options.json               |   3 -
 .../.migrated_0075/options.json               |   3 -
 .../invalid-syntax/.migrated_0137/input.js    |   1 -
 .../.migrated_0137/options.json               |   3 -
 .../invalid-syntax/.migrated_0163/input.js    |   1 -
 .../.migrated_0163/options.json               |   3 -
 .../invalid-syntax/.migrated_0165/input.js    |   1 -
 .../.migrated_0165/options.json               |   3 -
 .../invalid-syntax/.migrated_0166/input.js    |   1 -
 .../.migrated_0166/options.json               |   3 -
 .../invalid-syntax/.migrated_0167/input.js    |   1 -
 .../.migrated_0167/options.json               |   3 -
 .../invalid-syntax/.migrated_0169/input.js    |   1 -
 .../.migrated_0169/options.json               |   3 -
 .../.migrated_0277/options.json               |   3 -
 .../invalid-syntax/migrated_0033/input.js     |   1 +
 .../invalid-syntax/migrated_0033/options.json |   3 +
 .../invalid-syntax/migrated_0034/input.js     |   1 +
 .../invalid-syntax/migrated_0034/options.json |   3 +
 .../invalid-syntax/migrated_0036/input.js     |   1 +
 .../invalid-syntax/migrated_0036/options.json |   3 +
 .../invalid-syntax/migrated_0037/input.js     |   1 +
 .../invalid-syntax/migrated_0037/options.json |   3 +
 .../invalid-syntax/migrated_0041/input.js     |   1 +
 .../invalid-syntax/migrated_0041/options.json |   3 +
 .../invalid-syntax/migrated_0042/input.js     |   1 +
 .../invalid-syntax/migrated_0042/options.json |   3 +
 .../invalid-syntax/migrated_0043/input.js     |   1 +
 .../invalid-syntax/migrated_0043/options.json |   3 +
 .../invalid-syntax/migrated_0044/input.js     |   1 +
 .../invalid-syntax/migrated_0044/options.json |   3 +
 .../invalid-syntax/migrated_0048/input.js     |   1 +
 .../invalid-syntax/migrated_0048/options.json |   3 +
 .../invalid-syntax/migrated_0049/input.js     |   1 +
 .../invalid-syntax/migrated_0049/options.json |   3 +
 .../invalid-syntax/migrated_0050/input.js     |   1 +
 .../invalid-syntax/migrated_0050/options.json |   3 +
 .../invalid-syntax/migrated_0051/input.js     |   1 +
 .../invalid-syntax/migrated_0051/options.json |   3 +
 .../input.js                                  |   0
 .../invalid-syntax/migrated_0075/options.json |   3 +
 .../invalid-syntax/migrated_0137/input.js     |   1 +
 .../invalid-syntax/migrated_0137/options.json |   3 +
 .../invalid-syntax/migrated_0163/input.js     |   1 +
 .../invalid-syntax/migrated_0163/options.json |   3 +
 .../invalid-syntax/migrated_0165/input.js     |   1 +
 .../invalid-syntax/migrated_0165/options.json |   3 +
 .../invalid-syntax/migrated_0166/input.js     |   1 +
 .../invalid-syntax/migrated_0166/options.json |   3 +
 .../invalid-syntax/migrated_0167/input.js     |   1 +
 .../invalid-syntax/migrated_0167/options.json |   3 +
 .../invalid-syntax/migrated_0169/input.js     |   1 +
 .../invalid-syntax/migrated_0169/options.json |   3 +
 .../input.js                                  |   0
 .../invalid-syntax/migrated_0277/options.json |   3 +
 .../migrated_0002/input.js                    |   2 +-
 .../migrated_0002/options.json                |   3 +
 .../migrated_0003/input.js                    |   2 +-
 .../migrated_0003/options.json                |   3 +
 .../migrated_0004/input.js                    |   2 +-
 .../migrated_0004/options.json                |   3 +
 .../migrated_0005/input.js                    |   2 +-
 .../migrated_0005/options.json                |   3 +
 .../invalid-named-static/output.json          |  34 --
 .../flow/type-alias/5/{5.js => input.js}      |   0
 .../fixtures/flow/type-alias/5/output.json    | 533 ++++++++++++++++-
 365 files changed, 14964 insertions(+), 750 deletions(-)
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/object-binding-pattern-01.js => object-binding-pattern-01/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/output.json
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/object-binding-pattern-empty.js => object-binding-pattern-empty/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/output.json
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/invalid-member-expr.js => object-binding-pattern-invalid-member-expr/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/options.json
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/invalid-method-in-pattern.js => object-binding-pattern-invalid-method-in-pattern/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/options.json
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/invalid-nested-param.js => object-binding-pattern-invalid-nested-param/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/options.json
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/invalid-pattern-without-parenthesis.js => object-binding-pattern-invalid-pattern-without-parenthesis/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/options.json
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/invalid-rest-in-object-pattern.js => object-binding-pattern-invalid-rest-in-object-pattern/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/output.json
 rename packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/{object-binding-pattern/nested-cover-grammar.js => object-binding-pattern-nested-cover-grammar/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/output.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.failure.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.failure.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.failure.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.failure.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.failure.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0000.js => expression-primary-array/migrated_0000/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0001.js => expression-primary-array/migrated_0001/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0002.js => expression-primary-array/migrated_0002/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0003.js => expression-primary-array/migrated_0003/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0004.js => expression-primary-array/migrated_0004/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0005.js => expression-primary-array/migrated_0005/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0006.js => expression-primary-array/migrated_0006/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/array/migrated_0007.js => expression-primary-array/migrated_0007/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/output.json
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/output.json
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/output.json
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/output.json
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/output.json
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/options.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0024.js => expression-primary-literal-numeric/.migrated_0024/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/.migrated_0024/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0000.js => expression-primary-literal-numeric/migrated_0000/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0001.js => expression-primary-literal-numeric/migrated_0001/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0002.js => expression-primary-literal-numeric/migrated_0002/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0003.js => expression-primary-literal-numeric/migrated_0003/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0004.js => expression-primary-literal-numeric/migrated_0004/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0005.js => expression-primary-literal-numeric/migrated_0005/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0006.js => expression-primary-literal-numeric/migrated_0006/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0007.js => expression-primary-literal-numeric/migrated_0007/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0008.js => expression-primary-literal-numeric/migrated_0008/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0009.js => expression-primary-literal-numeric/migrated_0009/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0010.js => expression-primary-literal-numeric/migrated_0010/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0011.js => expression-primary-literal-numeric/migrated_0011/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0012.js => expression-primary-literal-numeric/migrated_0012/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0013.js => expression-primary-literal-numeric/migrated_0013/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0014.js => expression-primary-literal-numeric/migrated_0014/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0015.js => expression-primary-literal-numeric/migrated_0015/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0016.js => expression-primary-literal-numeric/migrated_0016/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0017.js => expression-primary-literal-numeric/migrated_0017/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0018.js => expression-primary-literal-numeric/migrated_0018/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0019.js => expression-primary-literal-numeric/migrated_0019/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0020.js => expression-primary-literal-numeric/migrated_0020/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0021.js => expression-primary-literal-numeric/migrated_0021/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0022.js => expression-primary-literal-numeric/migrated_0022/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/numeric/migrated_0023.js => expression-primary-literal-numeric/migrated_0023/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/output.json
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0005/input.js
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0006/input.js
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.js => expression-primary-literal-regular-expression/.u-flag-invalid-range-4-hex/input.js} (100%)
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.js => expression-primary-literal-regular-expression/.u-flag-invalid-range-var-hex/input.js} (100%)
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0000.js => expression-primary-literal-regular-expression/migrated_0000/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0001.js => expression-primary-literal-regular-expression/migrated_0001/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0002.js => expression-primary-literal-regular-expression/migrated_0002/input.js} (100%)
 rename packages/babel-parser/test/fixtures/esprima/{statement-expression => expression-primary-literal-regular-expression}/migrated_0002/output.json (74%)
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0003.js => expression-primary-literal-regular-expression/migrated_0003/input.js} (100%)
 rename packages/babel-parser/test/fixtures/esprima/{statement-expression => expression-primary-literal-regular-expression}/migrated_0003/output.json (73%)
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0004.js => expression-primary-literal-regular-expression/migrated_0004/input.js} (100%)
 rename packages/babel-parser/test/fixtures/esprima/{statement-expression => expression-primary-literal-regular-expression}/migrated_0004/output.json (73%)
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0007.js => expression-primary-literal-regular-expression/migrated_0007/input.js} (100%)
 rename packages/babel-parser/test/fixtures/esprima/{statement-expression/migrated_0005 => expression-primary-literal-regular-expression/migrated_0007}/output.json (73%)
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0008.js => expression-primary-literal-regular-expression/migrated_0008/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0009.js => expression-primary-literal-regular-expression/migrated_0009/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0010.js => expression-primary-literal-regular-expression/migrated_0010/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0011.js => expression-primary-literal-regular-expression/migrated_0011/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0012.js => expression-primary-literal-regular-expression/migrated_0012/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/migrated_0013.js => expression-primary-literal-regular-expression/migrated_0013/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/u-flag-surrogate-pair.js => expression-primary-literal-regular-expression/u-flag-surrogate-pair/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/regular-expression/u-flag-valid-range.js => expression-primary-literal-regular-expression/u-flag-valid-range/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0000.js => expression-primary-literal-string/migrated_0000/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0001.js => expression-primary-literal-string/migrated_0001/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/output.json
 create mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0003.js => expression-primary-literal-string/migrated_0003/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0006.js => expression-primary-literal-string/migrated_0006/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0007.js => expression-primary-literal-string/migrated_0007/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0008.js => expression-primary-literal-string/migrated_0008/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0009.js => expression-primary-literal-string/migrated_0009/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0010.js => expression-primary-literal-string/migrated_0010/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0011.js => expression-primary-literal-string/migrated_0011/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0012.js => expression-primary-literal-string/migrated_0012/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0013.js => expression-primary-literal-string/migrated_0013/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0015.js => expression-primary-literal-string/migrated_0015/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0016.js => expression-primary-literal-string/migrated_0016/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0017.js => expression-primary-literal-string/migrated_0017/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/literal/string/migrated_0018.js => expression-primary-literal-string/migrated_0018/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0000.js => expression-primary-object/migrated_0000/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0001.js => expression-primary-object/migrated_0001/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0002.js => expression-primary-object/migrated_0002/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0003.js => expression-primary-object/migrated_0003/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0004.js => expression-primary-object/migrated_0004/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0005.js => expression-primary-object/migrated_0005/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0006.js => expression-primary-object/migrated_0006/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0007.js => expression-primary-object/migrated_0007/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0008.js => expression-primary-object/migrated_0008/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0009.js => expression-primary-object/migrated_0009/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0010.js => expression-primary-object/migrated_0010/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0011.js => expression-primary-object/migrated_0011/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0012.js => expression-primary-object/migrated_0012/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0013.js => expression-primary-object/migrated_0013/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0014.js => expression-primary-object/migrated_0014/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0015.js => expression-primary-object/migrated_0015/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0016.js => expression-primary-object/migrated_0016/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0017.js => expression-primary-object/migrated_0017/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0018.js => expression-primary-object/migrated_0018/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0019.js => expression-primary-object/migrated_0019/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0020.js => expression-primary-object/migrated_0020/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0021.js => expression-primary-object/migrated_0021/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0022.js => expression-primary-object/migrated_0022/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0023.js => expression-primary-object/migrated_0023/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0024.js => expression-primary-object/migrated_0024/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0025.js => expression-primary-object/migrated_0025/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0026.js => expression-primary-object/migrated_0026/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0027.js => expression-primary-object/migrated_0027/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0028.js => expression-primary-object/migrated_0028/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0029.js => expression-primary-object/migrated_0029/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0030.js => expression-primary-object/migrated_0030/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0031.js => expression-primary-object/migrated_0031/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0032.js => expression-primary-object/migrated_0032/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0033.js => expression-primary-object/migrated_0033/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0034.js => expression-primary-object/migrated_0034/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0035.js => expression-primary-object/migrated_0035/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0036.js => expression-primary-object/migrated_0036/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0037.js => expression-primary-object/migrated_0037/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/object/migrated_0038.js => expression-primary-object/migrated_0038/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/other/migrated_0000.js => expression-primary-other/migrated_0000/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/other/migrated_0001.js => expression-primary-other/migrated_0001/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/other/migrated_0002.js => expression-primary-other/migrated_0002/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/output.json
 rename packages/babel-parser/test/fixtures/esprima/{expression-primary/other/migrated_0003.js => expression-primary-other/migrated_0003/input.js} (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/output.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0008.source.js
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0009.source.js
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0010.source.js
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0011.source.js
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0012.source.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary/array/output.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary/literal/output.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0005.source.js
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.failure.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.source.js
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.failure.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.failure.json
 delete mode 100755 packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0002.source.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary/object/output.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/expression-primary/other/output.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/input.js
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/options.json
 rename packages/babel-parser/test/fixtures/esprima/invalid-syntax/{.migrated_0075 => migrated_0075}/input.js (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/input.js
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/options.json
 rename packages/babel-parser/test/fixtures/esprima/invalid-syntax/{.migrated_0277 => migrated_0277}/input.js (100%)
 create mode 100644 packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/options.json
 create mode 100644 packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/options.json
 delete mode 100644 packages/babel-parser/test/fixtures/flow/class-properties/invalid-named-static/output.json
 rename packages/babel-parser/test/fixtures/flow/type-alias/5/{5.js => input.js} (100%)

diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-01.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-01.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/output.json
new file mode 100644
index 000000000000..04622ffb5ea7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/output.json
@@ -0,0 +1,370 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 25
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 25
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 25
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 1,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 2,
+                  "end": 3,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 3
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 4,
+                  "end": 7,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 7
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 4,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      },
+                      "identifierName": "b"
+                    },
+                    "name": "b"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "AssignmentPattern",
+                    "start": 4,
+                    "end": 7,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 7
+                      }
+                    },
+                    "left": {
+                      "type": "Identifier",
+                      "start": 4,
+                      "end": 5,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 5
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b"
+                    },
+                    "right": {
+                      "type": "Identifier",
+                      "start": 6,
+                      "end": 7,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 7
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b"
+                    }
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 8,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 9,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 9
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "identifierName": "c"
+                    },
+                    "name": "c"
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 12,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "method": false,
+                  "computed": true,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 13,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "shorthand": false,
+                  "value": {
+                    "type": "ArrayPattern",
+                    "start": 16,
+                    "end": 19,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 19
+                      }
+                    },
+                    "elements": [
+                      {
+                        "type": "Identifier",
+                        "start": 17,
+                        "end": 18,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 17
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "identifierName": "d"
+                        },
+                        "name": "d"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 23,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 23
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-empty.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-empty.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/output.json
new file mode 100644
index 000000000000..6a745736a149
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/output.json
@@ -0,0 +1,106 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 8,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 8,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 1,
+              "end": 3,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 3
+                }
+              },
+              "properties": []
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 6,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/options.json
new file mode 100644
index 000000000000..552c89da58a5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid left-hand side in object destructuring pattern (1:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/options.json
new file mode 100644
index 000000000000..359d73aba0c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Object pattern can't contain getter or setter (1:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/options.json
new file mode 100644
index 000000000000..958c9174a7b4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid left-hand side in object destructuring pattern (1:24)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/options.json
new file mode 100644
index 000000000000..bbbe2f5dd5c4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:3)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/output.json
new file mode 100644
index 000000000000..7061f23c0fb3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/output.json
@@ -0,0 +1,194 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 1,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 2,
+                  "end": 3,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 3
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                },
+                {
+                  "type": "RestElement",
+                  "start": 4,
+                  "end": 8,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 8
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 7,
+                    "end": 8,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 7
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "identifierName": "b"
+                    },
+                    "name": "b"
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 14,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 14
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/nested-cover-grammar.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/nested-cover-grammar.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/output.json
new file mode 100644
index 000000000000..81e10cda57c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/output.json
@@ -0,0 +1,534 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 51,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 51
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 51,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 51
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 51,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 51
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 50,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 50
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ArrayPattern",
+              "start": 1,
+              "end": 46,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 46
+                }
+              },
+              "elements": [
+                {
+                  "type": "ArrayPattern",
+                  "start": 2,
+                  "end": 45,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 45
+                    }
+                  },
+                  "elements": [
+                    {
+                      "type": "ArrayPattern",
+                      "start": 3,
+                      "end": 44,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 3
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 44
+                        }
+                      },
+                      "elements": [
+                        {
+                          "type": "ArrayPattern",
+                          "start": 4,
+                          "end": 43,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 4
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 43
+                            }
+                          },
+                          "elements": [
+                            {
+                              "type": "ArrayPattern",
+                              "start": 5,
+                              "end": 42,
+                              "loc": {
+                                "start": {
+                                  "line": 1,
+                                  "column": 5
+                                },
+                                "end": {
+                                  "line": 1,
+                                  "column": 42
+                                }
+                              },
+                              "elements": [
+                                {
+                                  "type": "ArrayPattern",
+                                  "start": 6,
+                                  "end": 41,
+                                  "loc": {
+                                    "start": {
+                                      "line": 1,
+                                      "column": 6
+                                    },
+                                    "end": {
+                                      "line": 1,
+                                      "column": 41
+                                    }
+                                  },
+                                  "elements": [
+                                    {
+                                      "type": "ArrayPattern",
+                                      "start": 7,
+                                      "end": 40,
+                                      "loc": {
+                                        "start": {
+                                          "line": 1,
+                                          "column": 7
+                                        },
+                                        "end": {
+                                          "line": 1,
+                                          "column": 40
+                                        }
+                                      },
+                                      "elements": [
+                                        {
+                                          "type": "ArrayPattern",
+                                          "start": 8,
+                                          "end": 39,
+                                          "loc": {
+                                            "start": {
+                                              "line": 1,
+                                              "column": 8
+                                            },
+                                            "end": {
+                                              "line": 1,
+                                              "column": 39
+                                            }
+                                          },
+                                          "elements": [
+                                            {
+                                              "type": "ArrayPattern",
+                                              "start": 9,
+                                              "end": 38,
+                                              "loc": {
+                                                "start": {
+                                                  "line": 1,
+                                                  "column": 9
+                                                },
+                                                "end": {
+                                                  "line": 1,
+                                                  "column": 38
+                                                }
+                                              },
+                                              "elements": [
+                                                {
+                                                  "type": "ArrayPattern",
+                                                  "start": 10,
+                                                  "end": 37,
+                                                  "loc": {
+                                                    "start": {
+                                                      "line": 1,
+                                                      "column": 10
+                                                    },
+                                                    "end": {
+                                                      "line": 1,
+                                                      "column": 37
+                                                    }
+                                                  },
+                                                  "elements": [
+                                                    {
+                                                      "type": "ArrayPattern",
+                                                      "start": 11,
+                                                      "end": 36,
+                                                      "loc": {
+                                                        "start": {
+                                                          "line": 1,
+                                                          "column": 11
+                                                        },
+                                                        "end": {
+                                                          "line": 1,
+                                                          "column": 36
+                                                        }
+                                                      },
+                                                      "elements": [
+                                                        {
+                                                          "type": "ArrayPattern",
+                                                          "start": 12,
+                                                          "end": 35,
+                                                          "loc": {
+                                                            "start": {
+                                                              "line": 1,
+                                                              "column": 12
+                                                            },
+                                                            "end": {
+                                                              "line": 1,
+                                                              "column": 35
+                                                            }
+                                                          },
+                                                          "elements": [
+                                                            {
+                                                              "type": "ArrayPattern",
+                                                              "start": 13,
+                                                              "end": 34,
+                                                              "loc": {
+                                                                "start": {
+                                                                  "line": 1,
+                                                                  "column": 13
+                                                                },
+                                                                "end": {
+                                                                  "line": 1,
+                                                                  "column": 34
+                                                                }
+                                                              },
+                                                              "elements": [
+                                                                {
+                                                                  "type": "ArrayPattern",
+                                                                  "start": 14,
+                                                                  "end": 33,
+                                                                  "loc": {
+                                                                    "start": {
+                                                                      "line": 1,
+                                                                      "column": 14
+                                                                    },
+                                                                    "end": {
+                                                                      "line": 1,
+                                                                      "column": 33
+                                                                    }
+                                                                  },
+                                                                  "elements": [
+                                                                    {
+                                                                      "type": "ArrayPattern",
+                                                                      "start": 15,
+                                                                      "end": 32,
+                                                                      "loc": {
+                                                                        "start": {
+                                                                          "line": 1,
+                                                                          "column": 15
+                                                                        },
+                                                                        "end": {
+                                                                          "line": 1,
+                                                                          "column": 32
+                                                                        }
+                                                                      },
+                                                                      "elements": [
+                                                                        {
+                                                                          "type": "ArrayPattern",
+                                                                          "start": 16,
+                                                                          "end": 31,
+                                                                          "loc": {
+                                                                            "start": {
+                                                                              "line": 1,
+                                                                              "column": 16
+                                                                            },
+                                                                            "end": {
+                                                                              "line": 1,
+                                                                              "column": 31
+                                                                            }
+                                                                          },
+                                                                          "elements": [
+                                                                            {
+                                                                              "type": "ArrayPattern",
+                                                                              "start": 17,
+                                                                              "end": 30,
+                                                                              "loc": {
+                                                                                "start": {
+                                                                                  "line": 1,
+                                                                                  "column": 17
+                                                                                },
+                                                                                "end": {
+                                                                                  "line": 1,
+                                                                                  "column": 30
+                                                                                }
+                                                                              },
+                                                                              "elements": [
+                                                                                {
+                                                                                  "type": "ArrayPattern",
+                                                                                  "start": 18,
+                                                                                  "end": 29,
+                                                                                  "loc": {
+                                                                                    "start": {
+                                                                                      "line": 1,
+                                                                                      "column": 18
+                                                                                    },
+                                                                                    "end": {
+                                                                                      "line": 1,
+                                                                                      "column": 29
+                                                                                    }
+                                                                                  },
+                                                                                  "elements": [
+                                                                                    {
+                                                                                      "type": "ArrayPattern",
+                                                                                      "start": 19,
+                                                                                      "end": 28,
+                                                                                      "loc": {
+                                                                                        "start": {
+                                                                                          "line": 1,
+                                                                                          "column": 19
+                                                                                        },
+                                                                                        "end": {
+                                                                                          "line": 1,
+                                                                                          "column": 28
+                                                                                        }
+                                                                                      },
+                                                                                      "elements": [
+                                                                                        {
+                                                                                          "type": "ArrayPattern",
+                                                                                          "start": 20,
+                                                                                          "end": 27,
+                                                                                          "loc": {
+                                                                                            "start": {
+                                                                                              "line": 1,
+                                                                                              "column": 20
+                                                                                            },
+                                                                                            "end": {
+                                                                                              "line": 1,
+                                                                                              "column": 27
+                                                                                            }
+                                                                                          },
+                                                                                          "elements": [
+                                                                                            {
+                                                                                              "type": "ObjectPattern",
+                                                                                              "start": 21,
+                                                                                              "end": 26,
+                                                                                              "loc": {
+                                                                                                "start": {
+                                                                                                  "line": 1,
+                                                                                                  "column": 21
+                                                                                                },
+                                                                                                "end": {
+                                                                                                  "line": 1,
+                                                                                                  "column": 26
+                                                                                                }
+                                                                                              },
+                                                                                              "properties": [
+                                                                                                {
+                                                                                                  "type": "ObjectProperty",
+                                                                                                  "start": 22,
+                                                                                                  "end": 25,
+                                                                                                  "loc": {
+                                                                                                    "start": {
+                                                                                                      "line": 1,
+                                                                                                      "column": 22
+                                                                                                    },
+                                                                                                    "end": {
+                                                                                                      "line": 1,
+                                                                                                      "column": 25
+                                                                                                    }
+                                                                                                  },
+                                                                                                  "method": false,
+                                                                                                  "key": {
+                                                                                                    "type": "Identifier",
+                                                                                                    "start": 22,
+                                                                                                    "end": 23,
+                                                                                                    "loc": {
+                                                                                                      "start": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 22
+                                                                                                      },
+                                                                                                      "end": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 23
+                                                                                                      },
+                                                                                                      "identifierName": "a"
+                                                                                                    },
+                                                                                                    "name": "a"
+                                                                                                  },
+                                                                                                  "computed": false,
+                                                                                                  "shorthand": true,
+                                                                                                  "value": {
+                                                                                                    "type": "AssignmentPattern",
+                                                                                                    "start": 22,
+                                                                                                    "end": 25,
+                                                                                                    "loc": {
+                                                                                                      "start": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 22
+                                                                                                      },
+                                                                                                      "end": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 25
+                                                                                                      }
+                                                                                                    },
+                                                                                                    "left": {
+                                                                                                      "type": "Identifier",
+                                                                                                      "start": 22,
+                                                                                                      "end": 23,
+                                                                                                      "loc": {
+                                                                                                        "start": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 22
+                                                                                                        },
+                                                                                                        "end": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 23
+                                                                                                        },
+                                                                                                        "identifierName": "a"
+                                                                                                      },
+                                                                                                      "name": "a"
+                                                                                                    },
+                                                                                                    "right": {
+                                                                                                      "type": "Identifier",
+                                                                                                      "start": 24,
+                                                                                                      "end": 25,
+                                                                                                      "loc": {
+                                                                                                        "start": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 24
+                                                                                                        },
+                                                                                                        "end": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 25
+                                                                                                        },
+                                                                                                        "identifierName": "b"
+                                                                                                      },
+                                                                                                      "name": "b"
+                                                                                                    }
+                                                                                                  },
+                                                                                                  "extra": {
+                                                                                                    "shorthand": true
+                                                                                                  }
+                                                                                                }
+                                                                                              ]
+                                                                                            }
+                                                                                          ]
+                                                                                        }
+                                                                                      ]
+                                                                                    }
+                                                                                  ]
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              ]
+                                                            }
+                                                          ]
+                                                        }
+                                                      ]
+                                                    }
+                                                  ]
+                                                }
+                                              ]
+                                            }
+                                          ]
+                                        }
+                                      ]
+                                    }
+                                  ]
+                                }
+                              ]
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 49,
+            "end": 50,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 49
+              },
+              "end": {
+                "line": 1,
+                "column": 50
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.failure.json
deleted file mode 100755
index 8245542d3dc4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":10,"lineNumber":1,"column":11,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.failure.json
deleted file mode 100755
index 030f8f3752df..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":14,"lineNumber":1,"column":15,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.failure.json
deleted file mode 100755
index 08ba5aca74a1..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":50,"lineNumber":1,"column":51,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.failure.json
deleted file mode 100755
index b0c1b45f778c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":3,"lineNumber":1,"column":4,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.failure.json
deleted file mode 100755
index 6551a4757991..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":4,"lineNumber":1,"column":5,"message":"Error: Line 1: Unexpected token ...","description":"Unexpected token ..."}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js
index e66fe1911ad6..2c0ed701dcf9 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js
@@ -1 +1 @@
-var source = '\uD800!';
+\uD800!
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js
index 2f6bc5fc687d..c0cf1cd90706 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js
@@ -1 +1 @@
-var source = '`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`';
+`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json
index c18d75ba278e..27c7864d3380 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 46,
+  "end": 30,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 46
+      "column": 30
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 46,
+    "end": 30,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,16 @@
       },
       "end": {
         "line": 1,
-        "column": 46
+        "column": 30
       }
     },
     "sourceType": "script",
     "interpreter": null,
     "body": [
       {
-        "type": "VariableDeclaration",
+        "type": "ExpressionStatement",
         "start": 0,
-        "end": 46,
+        "end": 30,
         "loc": {
           "start": {
             "line": 1,
@@ -40,64 +40,47 @@
           },
           "end": {
             "line": 1,
-            "column": 46
+            "column": 30
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 45,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 45
-              }
+        "expression": {
+          "type": "TemplateLiteral",
+          "start": 0,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 45,
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "expressions": [],
+          "quasis": [
+            {
+              "type": "TemplateElement",
+              "start": 1,
+              "end": 29,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 1
                 },
                 "end": {
                   "line": 1,
-                  "column": 45
+                  "column": 29
                 }
               },
-              "extra": {
-                "rawValue": "`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`",
-                "raw": "'`\\\\n\\\\r\\\\b\\\\v\\\\t\\\\f\\\\\\n\\\\\\r\\n`'"
+              "value": {
+                "raw": "\\\\n\\\\r\\\\b\\\\v\\\\t\\\\f\\\\\\n\\\\\\r\\n",
+                "cooked": "\\n\\r\\b\\v\\t\\f\\\n\\\r\n"
               },
-              "value": "`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`"
+              "tail": true
             }
-          }
-        ],
-        "kind": "var"
+          ]
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js
index c5468af67d5c..b4cd5b9e3fe3 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js
@@ -1 +1 @@
-var source = '`\n\r\n`';
+`\n\r\n`
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json
index 14e7c4f0b58a..3987e50bf77c 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 24,
+  "end": 8,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 24
+      "column": 8
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 24,
+    "end": 8,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,16 @@
       },
       "end": {
         "line": 1,
-        "column": 24
+        "column": 8
       }
     },
     "sourceType": "script",
     "interpreter": null,
     "body": [
       {
-        "type": "VariableDeclaration",
+        "type": "ExpressionStatement",
         "start": 0,
-        "end": 24,
+        "end": 8,
         "loc": {
           "start": {
             "line": 1,
@@ -40,64 +40,47 @@
           },
           "end": {
             "line": 1,
-            "column": 24
+            "column": 8
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 23,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 23
-              }
+        "expression": {
+          "type": "TemplateLiteral",
+          "start": 0,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 23,
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "expressions": [],
+          "quasis": [
+            {
+              "type": "TemplateElement",
+              "start": 1,
+              "end": 7,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 1
                 },
                 "end": {
                   "line": 1,
-                  "column": 23
+                  "column": 7
                 }
               },
-              "extra": {
-                "rawValue": "`\n\r\n`",
-                "raw": "'`\\n\\r\\n`'"
+              "value": {
+                "raw": "\\n\\r\\n",
+                "cooked": "\n\r\n"
               },
-              "value": "`\n\r\n`"
+              "tail": true
             }
-          }
-        ],
-        "kind": "var"
+          ]
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js
index f8f6e9a34efd..5e0285e4f5ef 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js
@@ -1 +1 @@
-var source = '`\\u{000042}\\u0042\\x42\\u0\\A\\0`';
+`\\u{000042}\\u0042\\x42\\u0\\A\\0`
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json
index 05b8880ba5c8..5aa224c4dff5 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 51,
+  "end": 35,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 51
+      "column": 35
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 51,
+    "end": 35,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,16 @@
       },
       "end": {
         "line": 1,
-        "column": 51
+        "column": 35
       }
     },
     "sourceType": "script",
     "interpreter": null,
     "body": [
       {
-        "type": "VariableDeclaration",
+        "type": "ExpressionStatement",
         "start": 0,
-        "end": 51,
+        "end": 35,
         "loc": {
           "start": {
             "line": 1,
@@ -40,64 +40,47 @@
           },
           "end": {
             "line": 1,
-            "column": 51
+            "column": 35
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 50,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 50
-              }
+        "expression": {
+          "type": "TemplateLiteral",
+          "start": 0,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 50,
+            "end": {
+              "line": 1,
+              "column": 35
+            }
+          },
+          "expressions": [],
+          "quasis": [
+            {
+              "type": "TemplateElement",
+              "start": 1,
+              "end": 34,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 1
                 },
                 "end": {
                   "line": 1,
-                  "column": 50
+                  "column": 34
                 }
               },
-              "extra": {
-                "rawValue": "`\\u{000042}\\u0042\\x42\\u0\\A\\0`",
-                "raw": "'`\\\\u{000042}\\\\u0042\\\\x42\\\\u0\\\\A\\\\0`'"
+              "value": {
+                "raw": "\\\\u{000042}\\\\u0042\\\\x42\\\\u0\\\\A\\\\0",
+                "cooked": "\\u{000042}\\u0042\\x42\\u0\\A\\0"
               },
-              "value": "`\\u{000042}\\u0042\\x42\\u0\\A\\0`"
+              "tail": true
             }
-          }
-        ],
-        "kind": "var"
+          ]
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js
index 1d5ecf6f7c79..73c930d32dd2 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js
@@ -1 +1 @@
-var source = '"\\u{714E}\\u{8336}"';
+"\\u{714E}\\u{8336}"
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json
index 65a14f7cbe7b..6cf40d966283 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 36,
+  "end": 20,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 36
+      "column": 20
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 36,
+    "end": 20,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,17 @@
       },
       "end": {
         "line": 1,
-        "column": 36
+        "column": 20
       }
     },
     "sourceType": "script",
     "interpreter": null,
-    "body": [
+    "body": [],
+    "directives": [
       {
-        "type": "VariableDeclaration",
+        "type": "Directive",
         "start": 0,
-        "end": 36,
+        "end": 20,
         "loc": {
           "start": {
             "line": 1,
@@ -40,66 +41,30 @@
           },
           "end": {
             "line": 1,
-            "column": 36
+            "column": 20
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 35,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 35
-              }
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 35,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 35
-                }
-              },
-              "extra": {
-                "rawValue": "\"\\u{714E}\\u{8336}\"",
-                "raw": "'\"\\\\u{714E}\\\\u{8336}\"'"
-              },
-              "value": "\"\\u{714E}\\u{8336}\""
+            "end": {
+              "line": 1,
+              "column": 20
             }
+          },
+          "value": "\\\\u{714E}\\\\u{8336}",
+          "extra": {
+            "raw": "\"\\\\u{714E}\\\\u{8336}\"",
+            "rawValue": "\\\\u{714E}\\\\u{8336}"
           }
-        ],
-        "kind": "var"
+        }
       }
-    ],
-    "directives": []
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js
index fd2a94179aac..38330ee5cadd 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js
@@ -1 +1 @@
-var source = '"\\u{20BB7}\\u{91CE}\\u{5BB6}"';
+"\\u{20BB7}\\u{91CE}\\u{5BB6}"
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json
index 66ef7c611364..3f3b3439082c 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 46,
+  "end": 30,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 46
+      "column": 30
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 46,
+    "end": 30,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,17 @@
       },
       "end": {
         "line": 1,
-        "column": 46
+        "column": 30
       }
     },
     "sourceType": "script",
     "interpreter": null,
-    "body": [
+    "body": [],
+    "directives": [
       {
-        "type": "VariableDeclaration",
+        "type": "Directive",
         "start": 0,
-        "end": 46,
+        "end": 30,
         "loc": {
           "start": {
             "line": 1,
@@ -40,66 +41,30 @@
           },
           "end": {
             "line": 1,
-            "column": 46
+            "column": 30
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 45,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 45
-              }
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 45,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 45
-                }
-              },
-              "extra": {
-                "rawValue": "\"\\u{20BB7}\\u{91CE}\\u{5BB6}\"",
-                "raw": "'\"\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}\"'"
-              },
-              "value": "\"\\u{20BB7}\\u{91CE}\\u{5BB6}\""
+            "end": {
+              "line": 1,
+              "column": 30
             }
+          },
+          "value": "\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}",
+          "extra": {
+            "raw": "\"\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}\"",
+            "rawValue": "\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}"
           }
-        ],
-        "kind": "var"
+        }
       }
-    ],
-    "directives": []
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js
index 582b9f3ab9a0..a7d9d668ad2d 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js
@@ -1 +1 @@
-var source = '"\\u{00000000034}"';
+"\\u{00000000034}"
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json
index 9f9f834e880b..4331e2b8c367 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 34,
+  "end": 18,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 34
+      "column": 18
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 34,
+    "end": 18,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,17 @@
       },
       "end": {
         "line": 1,
-        "column": 34
+        "column": 18
       }
     },
     "sourceType": "script",
     "interpreter": null,
-    "body": [
+    "body": [],
+    "directives": [
       {
-        "type": "VariableDeclaration",
+        "type": "Directive",
         "start": 0,
-        "end": 34,
+        "end": 18,
         "loc": {
           "start": {
             "line": 1,
@@ -40,66 +41,30 @@
           },
           "end": {
             "line": 1,
-            "column": 34
+            "column": 18
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 33,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 33
-              }
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 33,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 33
-                }
-              },
-              "extra": {
-                "rawValue": "\"\\u{00000000034}\"",
-                "raw": "'\"\\\\u{00000000034}\"'"
-              },
-              "value": "\"\\u{00000000034}\""
+            "end": {
+              "line": 1,
+              "column": 18
             }
+          },
+          "value": "\\\\u{00000000034}",
+          "extra": {
+            "raw": "\"\\\\u{00000000034}\"",
+            "rawValue": "\\\\u{00000000034}"
           }
-        ],
-        "kind": "var"
+        }
       }
-    ],
-    "directives": []
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/output.json
new file mode 100644
index 000000000000..9446cbbae1c5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/output.json
new file mode 100644
index 000000000000..138fcb2e6263
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/output.json
new file mode 100644
index 000000000000..ef826212c27b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/output.json
@@ -0,0 +1,120 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/output.json
new file mode 100644
index 000000000000..3f7e070ca3ac
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/output.json
@@ -0,0 +1,120 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/output.json
new file mode 100644
index 000000000000..b0025ea3388c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/output.json
@@ -0,0 +1,122 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 13
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "elements": [
+              null,
+              null,
+              {
+                "type": "NumericLiteral",
+                "start": 9,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0005.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0005.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/output.json
new file mode 100644
index 000000000000..573eda5bfa9f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/output.json
@@ -0,0 +1,160 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  }
+                },
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              },
+              {
+                "type": "NumericLiteral",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "extra": {
+                  "rawValue": 2,
+                  "raw": "2"
+                },
+                "value": 2
+              },
+              {
+                "type": "NumericLiteral",
+                "start": 12,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "extra": {
+                  "rawValue": 3,
+                  "raw": "3"
+                },
+                "value": 3
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/output.json
new file mode 100644
index 000000000000..34c8d7e15c8e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/output.json
@@ -0,0 +1,161 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  }
+                },
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              },
+              {
+                "type": "NumericLiteral",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "extra": {
+                  "rawValue": 2,
+                  "raw": "2"
+                },
+                "value": 2
+              },
+              null,
+              {
+                "type": "NumericLiteral",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": 3,
+                  "raw": "3"
+                },
+                "value": 3
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/output.json
new file mode 100644
index 000000000000..4a76c9ff3935
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 8,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 8,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "日本語"
+            },
+            "name": "日本語"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 6,
+            "end": 8,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 8
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/input.js
new file mode 100755
index 000000000000..9d3bfbcfb224
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/input.js
@@ -0,0 +1 @@
+T\u203F = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/output.json
new file mode 100644
index 000000000000..5aa9eb08425a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              },
+              "identifierName": "T‿"
+            },
+            "name": "T‿"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 10,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/input.js
new file mode 100755
index 000000000000..ff386945cd53
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/input.js
@@ -0,0 +1 @@
+T\u200C = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/output.json
new file mode 100644
index 000000000000..d6c768be8953
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              },
+              "identifierName": "T‌"
+            },
+            "name": "T‌"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 10,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/input.js
new file mode 100755
index 000000000000..49b79b4d531b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/input.js
@@ -0,0 +1 @@
+T\u200D = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/output.json
new file mode 100644
index 000000000000..ff1dbdcfacbe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              },
+              "identifierName": "T‍"
+            },
+            "name": "T‍"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 10,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/input.js
new file mode 100755
index 000000000000..ae334de44745
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/input.js
@@ -0,0 +1 @@
+\u2163\u2161 = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/output.json
new file mode 100644
index 000000000000..d48fa35f8a00
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              },
+              "identifierName": "ⅣⅡ"
+            },
+            "name": "ⅣⅡ"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 15,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/input.js
new file mode 100755
index 000000000000..79581f8529b7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/input.js
@@ -0,0 +1 @@
+\u2163\u2161\u200A=\u2009[]
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/options.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/options.json
new file mode 100644
index 000000000000..29d61fe2ba13
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0024.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/.migrated_0024/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0024.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/.migrated_0024/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/.migrated_0024/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/.migrated_0024/output.json
new file mode 100644
index 000000000000..f48f7a786775
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/.migrated_0024/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 9.5,
+            "raw": "09.5"
+          },
+          "value": 9.5
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/output.json
new file mode 100644
index 000000000000..3b0df6852fce
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/output.json
new file mode 100644
index 000000000000..20849b383b65
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 42,
+            "raw": "42"
+          },
+          "value": 42
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/output.json
new file mode 100644
index 000000000000..b21e99bf2e8a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          },
+          "extra": {
+            "rawValue": 3,
+            "raw": "3"
+          },
+          "value": 3
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/output.json
new file mode 100644
index 000000000000..a10e4151e34b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          },
+          "extra": {
+            "rawValue": 5,
+            "raw": "5"
+          },
+          "value": 5
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/output.json
new file mode 100644
index 000000000000..a5255d5fce90
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 3,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 3,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 3,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 0.14,
+            "raw": ".14"
+          },
+          "value": 0.14
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0005.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0005.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/output.json
new file mode 100644
index 000000000000..bcb0e150eda3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "extra": {
+            "rawValue": 3.14159,
+            "raw": "3.14159"
+          },
+          "value": 3.14159
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/output.json
new file mode 100644
index 000000000000..85fdb9eb27f1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "extra": {
+            "rawValue": 6.02214179e+23,
+            "raw": "6.02214179e+23"
+          },
+          "value": 6.02214179e+23
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/output.json
new file mode 100644
index 000000000000..570feb3f99a8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "extra": {
+            "rawValue": 1.49241783e-10,
+            "raw": "1.492417830e-10"
+          },
+          "value": 1.49241783e-10
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/output.json
new file mode 100644
index 000000000000..5dab1af37b3e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 3,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 3,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 3,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0x0"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/output.json
new file mode 100644
index 000000000000..2c80770e1150
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0x0"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/output.json
new file mode 100644
index 000000000000..4d36c6d5cebb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0e+100"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/output.json
new file mode 100644
index 000000000000..4d36c6d5cebb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0e+100"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/output.json
new file mode 100644
index 000000000000..ffa4e3f03d34
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 2748,
+            "raw": "0xabc"
+          },
+          "value": 2748
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/output.json
new file mode 100644
index 000000000000..ca378cfb321e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 3567,
+            "raw": "0xdef"
+          },
+          "value": 3567
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0014.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0014.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/output.json
new file mode 100644
index 000000000000..e88d6a6431f2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 26,
+            "raw": "0X1A"
+          },
+          "value": 26
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0015.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0015.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/output.json
new file mode 100644
index 000000000000..da0f5a5a077e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 16,
+            "raw": "0x10"
+          },
+          "value": 16
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0016.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0016.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/output.json
new file mode 100644
index 000000000000..3aeb059890fd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 256,
+            "raw": "0x100"
+          },
+          "value": 256
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0017.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0017.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/output.json
new file mode 100644
index 000000000000..508faca10fbb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 4,
+            "raw": "0X04"
+          },
+          "value": 4
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0018.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0018.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/output.json
new file mode 100644
index 000000000000..32add9ef9dc3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 2,
+            "raw": "02"
+          },
+          "value": 2
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0019.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0019.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/output.json
new file mode 100644
index 000000000000..25cd08d3e7e6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 3,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 3,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 3,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 10,
+            "raw": "012"
+          },
+          "value": 10
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0020.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0020.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/output.json
new file mode 100644
index 000000000000..3c9b2c223f85
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 10,
+            "raw": "0012"
+          },
+          "value": 10
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0021.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0021.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/output.json
new file mode 100644
index 000000000000..877e589c1492
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 8,
+            "raw": "08"
+          },
+          "value": 8
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0022.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0022.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/output.json
new file mode 100644
index 000000000000..cb6c2286193c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 8,
+            "raw": "0008"
+          },
+          "value": 8
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0023.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0023.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/output.json
new file mode 100644
index 000000000000..22fa47db887b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 9,
+            "raw": "09"
+          },
+          "value": 9
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0005/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0005/input.js
new file mode 100755
index 000000000000..ceaf3d176e0d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0005/input.js
@@ -0,0 +1 @@
+var x = /[\\u{0000000000000061}-\\u{7A}]/u
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0006/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0006/input.js
new file mode 100755
index 000000000000..8bd61e18921e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0006/input.js
@@ -0,0 +1 @@
+var x = /\\u{110000}/u
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-4-hex/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-4-hex/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-var-hex/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-var-hex/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/output.json
new file mode 100644
index 000000000000..a6d0d7facf75
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "RegExpLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "raw": "/p/"
+          },
+          "pattern": "p",
+          "flags": ""
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/output.json
new file mode 100644
index 000000000000..118076195367
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/output.json
@@ -0,0 +1,87 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "ArrayExpression",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "elements": [
+            {
+              "type": "RegExpLiteral",
+              "start": 1,
+              "end": 4,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 4
+                }
+              },
+              "extra": {
+                "raw": "/q/"
+              },
+              "pattern": "q",
+              "flags": ""
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/output.json
similarity index 74%
rename from packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/output.json
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/output.json
index 0fb9d2b43217..edf979f658a8 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 23,
+  "end": 16,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 23
+      "column": 16
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 23,
+    "end": 16,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 1,
-        "column": 23
+        "column": 16
       }
     },
     "sourceType": "script",
@@ -32,7 +32,7 @@
       {
         "type": "VariableDeclaration",
         "start": 0,
-        "end": 23,
+        "end": 16,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 23
+            "column": 16
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 4,
-            "end": 22,
+            "end": 16,
             "loc": {
               "start": {
                 "line": 1,
@@ -55,13 +55,13 @@
               },
               "end": {
                 "line": 1,
-                "column": 22
+                "column": 16
               }
             },
             "id": {
               "type": "Identifier",
               "start": 4,
-              "end": 10,
+              "end": 5,
               "loc": {
                 "start": {
                   "line": 1,
@@ -69,31 +69,31 @@
                 },
                 "end": {
                   "line": 1,
-                  "column": 10
+                  "column": 5
                 },
-                "identifierName": "source"
+                "identifierName": "x"
               },
-              "name": "source"
+              "name": "x"
             },
             "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 22,
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 8
                 },
                 "end": {
                   "line": 1,
-                  "column": 22
+                  "column": 16
                 }
               },
               "extra": {
-                "rawValue": "\\u0061",
-                "raw": "'\\\\u0061'"
+                "raw": "/[a-z]/i"
               },
-              "value": "\\u0061"
+              "pattern": "[a-z]",
+              "flags": "i"
             }
           }
         ],
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/output.json
similarity index 73%
rename from packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/output.json
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/output.json
index cc312ab67a75..06f89a41d6c9 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 24,
+  "end": 16,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 24
+      "column": 16
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 24,
+    "end": 16,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 1,
-        "column": 24
+        "column": 16
       }
     },
     "sourceType": "script",
@@ -32,7 +32,7 @@
       {
         "type": "VariableDeclaration",
         "start": 0,
-        "end": 24,
+        "end": 16,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 24
+            "column": 16
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 4,
-            "end": 23,
+            "end": 16,
             "loc": {
               "start": {
                 "line": 1,
@@ -55,13 +55,13 @@
               },
               "end": {
                 "line": 1,
-                "column": 23
+                "column": 16
               }
             },
             "id": {
               "type": "Identifier",
               "start": 4,
-              "end": 10,
+              "end": 5,
               "loc": {
                 "start": {
                   "line": 1,
@@ -69,31 +69,31 @@
                 },
                 "end": {
                   "line": 1,
-                  "column": 10
+                  "column": 5
                 },
-                "identifierName": "source"
+                "identifierName": "x"
               },
-              "name": "source"
+              "name": "x"
             },
             "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 23,
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 8
                 },
                 "end": {
                   "line": 1,
-                  "column": 23
+                  "column": 16
                 }
               },
               "extra": {
-                "rawValue": "a\\u0061",
-                "raw": "'a\\\\u0061'"
+                "raw": "/[a-z]/y"
               },
-              "value": "a\\u0061"
+              "pattern": "[a-z]",
+              "flags": "y"
             }
           }
         ],
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/output.json
similarity index 73%
rename from packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/output.json
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/output.json
index 01650ee4aa69..8c5d9482f12d 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 24,
+  "end": 16,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 24
+      "column": 16
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 24,
+    "end": 16,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 1,
-        "column": 24
+        "column": 16
       }
     },
     "sourceType": "script",
@@ -32,7 +32,7 @@
       {
         "type": "VariableDeclaration",
         "start": 0,
-        "end": 24,
+        "end": 16,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 24
+            "column": 16
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 4,
-            "end": 23,
+            "end": 16,
             "loc": {
               "start": {
                 "line": 1,
@@ -55,13 +55,13 @@
               },
               "end": {
                 "line": 1,
-                "column": 23
+                "column": 16
               }
             },
             "id": {
               "type": "Identifier",
               "start": 4,
-              "end": 10,
+              "end": 5,
               "loc": {
                 "start": {
                   "line": 1,
@@ -69,31 +69,31 @@
                 },
                 "end": {
                   "line": 1,
-                  "column": 10
+                  "column": 5
                 },
-                "identifierName": "source"
+                "identifierName": "x"
               },
-              "name": "source"
+              "name": "x"
             },
             "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 23,
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 8
                 },
                 "end": {
                   "line": 1,
-                  "column": 23
+                  "column": 16
                 }
               },
               "extra": {
-                "rawValue": "\\u0061a",
-                "raw": "'\\\\u0061a'"
+                "raw": "/[a-z]/u"
               },
-              "value": "\\u0061a"
+              "pattern": "[a-z]",
+              "flags": "u"
             }
           }
         ],
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/output.json
similarity index 73%
rename from packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/output.json
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/output.json
index 5c72b8a79068..4ec3778aaff6 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 25,
+  "end": 16,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 25
+      "column": 16
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 25,
+    "end": 16,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 1,
-        "column": 25
+        "column": 16
       }
     },
     "sourceType": "script",
@@ -32,7 +32,7 @@
       {
         "type": "VariableDeclaration",
         "start": 0,
-        "end": 25,
+        "end": 16,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 25
+            "column": 16
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 4,
-            "end": 24,
+            "end": 16,
             "loc": {
               "start": {
                 "line": 1,
@@ -55,13 +55,13 @@
               },
               "end": {
                 "line": 1,
-                "column": 24
+                "column": 16
               }
             },
             "id": {
               "type": "Identifier",
               "start": 4,
-              "end": 10,
+              "end": 5,
               "loc": {
                 "start": {
                   "line": 1,
@@ -69,31 +69,31 @@
                 },
                 "end": {
                   "line": 1,
-                  "column": 10
+                  "column": 5
                 },
-                "identifierName": "source"
+                "identifierName": "x"
               },
-              "name": "source"
+              "name": "x"
             },
             "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 24,
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 8
                 },
                 "end": {
                   "line": 1,
-                  "column": 24
+                  "column": 16
                 }
               },
               "extra": {
-                "rawValue": "\\u0061a ",
-                "raw": "'\\\\u0061a '"
+                "raw": "/[x-z]/i"
               },
-              "value": "\\u0061a "
+              "pattern": "[x-z]",
+              "flags": "i"
             }
           }
         ],
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/output.json
new file mode 100644
index 000000000000..7c5bfd0d7d4b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "extra": {
+                "raw": "/[a-c]/i"
+              },
+              "pattern": "[a-c]",
+              "flags": "i"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/output.json
new file mode 100644
index 000000000000..c79985fcb2bb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "extra": {
+                "raw": "/[P QR]/i"
+              },
+              "pattern": "[P QR]",
+              "flags": "i"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/output.json
new file mode 100644
index 000000000000..bc5ceb3e0e4b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                }
+              },
+              "extra": {
+                "raw": "/[\\]/]/"
+              },
+              "pattern": "[\\]/]",
+              "flags": ""
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/output.json
new file mode 100644
index 000000000000..abec94d30ee3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "extra": {
+                "raw": "/foo\\/bar/"
+              },
+              "pattern": "foo\\/bar",
+              "flags": ""
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/output.json
new file mode 100644
index 000000000000..311090fd6ab9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                }
+              },
+              "extra": {
+                "raw": "/=([^=\\s])+/g"
+              },
+              "pattern": "=([^=\\s])+",
+              "flags": "g"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/output.json
new file mode 100644
index 000000000000..1dc2cf3956e3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/output.json
@@ -0,0 +1,138 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "MemberExpression",
+              "start": 8,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "object": {
+                "type": "RegExpLiteral",
+                "start": 8,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "extra": {
+                  "raw": "/42/g"
+                },
+                "pattern": "42",
+                "flags": "g"
+              },
+              "property": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "identifierName": "test"
+                },
+                "name": "test"
+              },
+              "computed": false
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-surrogate-pair.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-surrogate-pair.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/output.json
new file mode 100644
index 000000000000..b94b022ea7c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 41,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 41
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 41,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 41
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 41
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 41,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 41
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 41,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 41
+                }
+              },
+              "extra": {
+                "raw": "/[\\uD834\\uDF06-\\uD834\\uDF08a-z]/u"
+              },
+              "pattern": "[\\uD834\\uDF06-\\uD834\\uDF08a-z]",
+              "flags": "u"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-valid-range.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-valid-range.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/output.json
new file mode 100644
index 000000000000..20d499776ad9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 61,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 61
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 61,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 61
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 61,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 61
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 60,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 60
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 60,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 60
+                }
+              },
+              "extra": {
+                "raw": "/[\\u{61}-b][\\u0061-b][a-\\u{62}][a-\\u0062]\\u{1ffff}/u"
+              },
+              "pattern": "[\\u{61}-b][\\u0061-b][a-\\u{62}][a-\\u0062]\\u{1ffff}",
+              "flags": "u"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/output.json
new file mode 100644
index 000000000000..decc68148f95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "value": "Hello",
+          "extra": {
+            "raw": "\"Hello\"",
+            "rawValue": "Hello"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/output.json
new file mode 100644
index 000000000000..13ba3c4eb97c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 22
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "value": "\\n\\r\\t\\v\\b\\f\\\\\\'\\\"\\0",
+          "extra": {
+            "raw": "\"\\n\\r\\t\\v\\b\\f\\\\\\'\\\"\\0\"",
+            "rawValue": "\\n\\r\\t\\v\\b\\f\\\\\\'\\\"\\0"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/input.js
new file mode 100755
index 000000000000..3acde555b1ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/input.js
@@ -0,0 +1 @@
+"\\u0061"
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/output.json
new file mode 100644
index 000000000000..d9fbb2b999e5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 9,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 9
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 9,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 9
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 9,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 9
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            }
+          },
+          "value": "\\\\u0061",
+          "extra": {
+            "raw": "\"\\\\u0061\"",
+            "rawValue": "\\\\u0061"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/output.json
new file mode 100644
index 000000000000..2b81d94ea76b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "value": "\\x61",
+          "extra": {
+            "raw": "\"\\x61\"",
+            "rawValue": "\\x61"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/output.json
new file mode 100644
index 000000000000..166849449336
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "value": "Hello\\nworld",
+          "extra": {
+            "raw": "\"Hello\\nworld\"",
+            "rawValue": "Hello\\nworld"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/output.json
new file mode 100644
index 000000000000..69ff486c62d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            }
+          },
+          "value": "Hello\\\nworld",
+          "extra": {
+            "raw": "\"Hello\\\nworld\"",
+            "rawValue": "Hello\\\nworld"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/output.json
new file mode 100644
index 000000000000..f3046102c20f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "value": "Hello\\02World",
+          "extra": {
+            "raw": "\"Hello\\02World\"",
+            "rawValue": "Hello\\02World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/output.json
new file mode 100644
index 000000000000..5f31b1a576f3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\012World",
+          "extra": {
+            "raw": "\"Hello\\012World\"",
+            "rawValue": "Hello\\012World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/output.json
new file mode 100644
index 000000000000..9656f26c45a8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\122World",
+          "extra": {
+            "raw": "\"Hello\\122World\"",
+            "rawValue": "Hello\\122World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/output.json
new file mode 100644
index 000000000000..5a8ab1f21115
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "value": "Hello\\0122World",
+          "extra": {
+            "raw": "\"Hello\\0122World\"",
+            "rawValue": "Hello\\0122World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/output.json
new file mode 100644
index 000000000000..e3470fcb4ec5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\312World",
+          "extra": {
+            "raw": "\"Hello\\312World\"",
+            "rawValue": "Hello\\312World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/output.json
new file mode 100644
index 000000000000..04f8c8c1df7b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\412World",
+          "extra": {
+            "raw": "\"Hello\\412World\"",
+            "rawValue": "Hello\\412World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0015.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0015.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/output.json
new file mode 100644
index 000000000000..88a3f339c132
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\712World",
+          "extra": {
+            "raw": "\"Hello\\712World\"",
+            "rawValue": "Hello\\712World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0016.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0016.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/output.json
new file mode 100644
index 000000000000..d73cfa2bd010
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "value": "Hello\\0World",
+          "extra": {
+            "raw": "\"Hello\\0World\"",
+            "rawValue": "Hello\\0World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0017.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0017.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/output.json
new file mode 100644
index 000000000000..69ff486c62d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            }
+          },
+          "value": "Hello\\\nworld",
+          "extra": {
+            "raw": "\"Hello\\\nworld\"",
+            "rawValue": "Hello\\\nworld"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0018.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0018.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/output.json
new file mode 100644
index 000000000000..e95ac9779c07
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "value": "Hello\\1World",
+          "extra": {
+            "raw": "\"Hello\\1World\"",
+            "rawValue": "Hello\\1World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/output.json
new file mode 100644
index 000000000000..ace60cd560f2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              }
+            },
+            "properties": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/output.json
new file mode 100644
index 000000000000..475c1afc13f2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "properties": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/output.json
new file mode 100644
index 000000000000..245feff142cc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "answer"
+                  },
+                  "name": "answer"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 14,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/output.json
new file mode 100644
index 000000000000..87c6c0164063
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 8,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "identifierName": "if"
+                  },
+                  "name": "if"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/output.json
new file mode 100644
index 000000000000..3a19ed468dc6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "identifierName": "true"
+                  },
+                  "name": "true"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 12,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0005.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0005.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/output.json
new file mode 100644
index 000000000000..dbb1747c7888
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "identifierName": "false"
+                  },
+                  "name": "false"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 13,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/output.json
new file mode 100644
index 000000000000..2918b16e85cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "identifierName": "null"
+                  },
+                  "name": "null"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 12,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/output.json
new file mode 100644
index 000000000000..367eac531099
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/output.json
@@ -0,0 +1,158 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 6,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "answer",
+                    "raw": "\"answer\""
+                  },
+                  "value": "answer"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 16,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/output.json
new file mode 100644
index 000000000000..81194dadc77a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/output.json
@@ -0,0 +1,210 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 7,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 9,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              },
+              {
+                "type": "ObjectProperty",
+                "start": 12,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 12,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 15,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/output.json
new file mode 100644
index 000000000000..ea4245152521
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/output.json
@@ -0,0 +1,189 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 38,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 38
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 38,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 38
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 38
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 38
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 38
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 36
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 36
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ReturnStatement",
+                      "start": 20,
+                      "end": 34,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 34
+                        }
+                      },
+                      "argument": {
+                        "type": "Identifier",
+                        "start": 27,
+                        "end": 34,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 27
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 34
+                          },
+                          "identifierName": "m_width"
+                        },
+                        "name": "m_width"
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/output.json
new file mode 100644
index 000000000000..9392a4586df7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 22
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 22
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "undef"
+                  },
+                  "name": "undef"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/output.json
new file mode 100644
index 000000000000..96fd3b7e93cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "if"
+                  },
+                  "name": "if"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 15,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/output.json
new file mode 100644
index 000000000000..b3ef7da7cabf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "true"
+                  },
+                  "name": "true"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 17,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/output.json
new file mode 100644
index 000000000000..e055a31d0008
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 22
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 22
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "false"
+                  },
+                  "name": "false"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0014.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0014.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/output.json
new file mode 100644
index 000000000000..2ba79ca36077
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "null"
+                  },
+                  "name": "null"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 17,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0015.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0015.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/output.json
new file mode 100644
index 000000000000..ea3146a858b9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/output.json
@@ -0,0 +1,159 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 22
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 10,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "undef",
+                    "raw": "\"undef\""
+                  },
+                  "value": "undef"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 20,
+                  "end": 22,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 22
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0016.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0016.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/output.json
new file mode 100644
index 000000000000..c02bf897d3a7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/output.json
@@ -0,0 +1,159 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "NumericLiteral",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 15,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0017.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0017.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/output.json
new file mode 100644
index 000000000000..a15882b52dae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 16,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 19,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 19
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 21,
+                      "end": 32,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 32
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 21,
+                        "end": 32,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 32
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 21,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "m_width"
+                          },
+                          "name": "m_width"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 31,
+                          "end": 32,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 31
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 32
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0018.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0018.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/output.json
new file mode 100644
index 000000000000..d672770fbcdf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 30
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 30
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 30
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 28
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "if"
+                  },
+                  "name": "if"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 13,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 16,
+                  "end": 28,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 28
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 18,
+                      "end": 26,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 26
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 18,
+                        "end": 26,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 26
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 18,
+                          "end": 22,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 18
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 22
+                            },
+                            "identifierName": "m_if"
+                          },
+                          "name": "m_if"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 25,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 25
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0019.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0019.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/output.json
new file mode 100644
index 000000000000..3322d7a98a38
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 34
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 32
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "true"
+                  },
+                  "name": "true"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 32
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 20,
+                      "end": 30,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 30
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 20,
+                        "end": 30,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 30
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 20,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 20
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "m_true"
+                          },
+                          "name": "m_true"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 29,
+                          "end": 30,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 30
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0020.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0020.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/output.json
new file mode 100644
index 000000000000..a26b8b4009e1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "false"
+                  },
+                  "name": "false"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 16,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 19,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 19
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 21,
+                      "end": 32,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 32
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 21,
+                        "end": 32,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 32
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 21,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "m_false"
+                          },
+                          "name": "m_false"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 31,
+                          "end": 32,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 31
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 32
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0021.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0021.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/output.json
new file mode 100644
index 000000000000..96e1bccd5184
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 34
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 32
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "null"
+                  },
+                  "name": "null"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 32
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 20,
+                      "end": 30,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 30
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 20,
+                        "end": 30,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 30
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 20,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 20
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "m_null"
+                          },
+                          "name": "m_null"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 29,
+                          "end": 30,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 30
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0022.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0022.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/output.json
new file mode 100644
index 000000000000..2fa4b803dd1d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/output.json
@@ -0,0 +1,243 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 10,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "null",
+                    "raw": "\"null\""
+                  },
+                  "value": "null"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 17,
+                    "end": 18,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 18
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 20,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 22,
+                      "end": 32,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 22
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 32
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 22,
+                        "end": 32,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 22
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 32
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 22,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 22
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "m_null"
+                          },
+                          "name": "m_null"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 31,
+                          "end": 32,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 31
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 32
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0023.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0023.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/output.json
new file mode 100644
index 000000000000..21dd434a7ad0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/output.json
@@ -0,0 +1,243 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 32
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 32,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 32
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 30,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 30
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "NumericLiteral",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 13,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 16,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 30
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 18,
+                      "end": 28,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 28
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 18,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 28
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 18,
+                          "end": 24,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 18
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 24
+                            },
+                            "identifierName": "m_null"
+                          },
+                          "name": "m_null"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 27,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 27
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0024.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0024.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/output.json
new file mode 100644
index 000000000000..1a0a1b954720
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    },
+                    "identifierName": "get"
+                  },
+                  "name": "get"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 11,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0025.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0025.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/output.json
new file mode 100644
index 000000000000..8caddf6f2a1e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    },
+                    "identifierName": "set"
+                  },
+                  "name": "set"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 11,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 43,
+                    "raw": "43"
+                  },
+                  "value": 43
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0026.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0026.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/output.json
new file mode 100644
index 000000000000..52ea78d41c51
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "__proto__"
+                  },
+                  "name": "__proto__"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 17,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0027.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0027.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/output.json
new file mode 100644
index 000000000000..bf57bae53f88
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/output.json
@@ -0,0 +1,158 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 5,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 5,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "__proto__",
+                    "raw": "\"__proto__\""
+                  },
+                  "value": "__proto__"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 18,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0028.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0028.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/output.json
new file mode 100644
index 000000000000..e68e602741d1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/output.json
@@ -0,0 +1,329 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 77,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 77
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 77,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 77
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 77,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 77
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 77,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 77
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 77,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 77
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 36
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 36
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ReturnStatement",
+                      "start": 20,
+                      "end": 34,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 34
+                        }
+                      },
+                      "argument": {
+                        "type": "Identifier",
+                        "start": 27,
+                        "end": 34,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 27
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 34
+                          },
+                          "identifierName": "m_width"
+                        },
+                        "name": "m_width"
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              },
+              {
+                "type": "ObjectMethod",
+                "start": 38,
+                "end": 75,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 38
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 75
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 42,
+                  "end": 47,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 42
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 47
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 48,
+                    "end": 53,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 48
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 53
+                      },
+                      "identifierName": "width"
+                    },
+                    "name": "width"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 55,
+                  "end": 75,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 55
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 75
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 57,
+                      "end": 73,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 57
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 73
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 57,
+                        "end": 72,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 57
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 72
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 57,
+                          "end": 64,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 57
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 64
+                            },
+                            "identifierName": "m_width"
+                          },
+                          "name": "m_width"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 67,
+                          "end": 72,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 67
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 72
+                            },
+                            "identifierName": "width"
+                          },
+                          "name": "width"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0029.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0029.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/output.json
new file mode 100644
index 000000000000..157cf63a8362
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/output.json
@@ -0,0 +1,182 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectMethod",
+              "start": 3,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 7,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "identifierName": "i"
+                },
+                "name": "i"
+              },
+              "computed": false,
+              "kind": "get",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 11,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 16,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 16
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 16,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "identifierName": "i"
+                },
+                "name": "i"
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 19,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 19
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 21
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0030.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0030.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/output.json
new file mode 100644
index 000000000000..9000ad963094
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/output.json
@@ -0,0 +1,246 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 13,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 13
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 13,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 13,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 15,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 16,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 16,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "identifierName": "y"
+                  },
+                  "name": "y"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 18,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              },
+              {
+                "type": "ObjectProperty",
+                "start": 20,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 23
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 20,
+                  "end": 21,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 21
+                    },
+                    "identifierName": "y"
+                  },
+                  "name": "y"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 22,
+                  "end": 23,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 22
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 23
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0031.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0031.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/output.json
new file mode 100644
index 000000000000..7754e9f31d1b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/output.json
@@ -0,0 +1,250 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 48,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 48
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 48,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 48
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 14,
+        "end": 48,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 14
+          },
+          "end": {
+            "line": 1,
+            "column": 48
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 18,
+            "end": 48,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 48
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 22,
+              "end": 48,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 48
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectMethod",
+                  "start": 24,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 28,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "get",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 32,
+                    "end": 34,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 32
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 34
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                },
+                {
+                  "type": "ObjectMethod",
+                  "start": 36,
+                  "end": 46,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 36
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 46
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 40,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 40
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 41
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "get",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 44,
+                    "end": 46,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 44
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 46
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0032.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0032.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/output.json
new file mode 100644
index 000000000000..d6a2610514cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/output.json
@@ -0,0 +1,249 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 43,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 43
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 43,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 43
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 14,
+        "end": 43,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 14
+          },
+          "end": {
+            "line": 1,
+            "column": 43
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 18,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 43
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 22,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 43
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 24,
+                  "end": 29,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 29
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 24,
+                    "end": 25,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 24
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 25
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "NumericLiteral",
+                    "start": 27,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 27
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 42,
+                      "raw": "42"
+                    },
+                    "value": 42
+                  }
+                },
+                {
+                  "type": "ObjectMethod",
+                  "start": 31,
+                  "end": 41,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 31
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 41
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 35,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 35
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 36
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "get",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 39,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 39
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 41
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0033.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0033.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/output.json
new file mode 100644
index 000000000000..93bb4ad6958e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/output.json
@@ -0,0 +1,267 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 44,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 44
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 44,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 44
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 14,
+        "end": 44,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 14
+          },
+          "end": {
+            "line": 1,
+            "column": 44
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 18,
+            "end": 44,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 44
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 22,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 44
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectMethod",
+                  "start": 24,
+                  "end": 35,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 35
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 28,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "set",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 30,
+                      "end": 31,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 31
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    }
+                  ],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 33,
+                    "end": 35,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 33
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 35
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 37,
+                  "end": 42,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 37
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 42
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 37,
+                    "end": 38,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 37
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 38
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "NumericLiteral",
+                    "start": 40,
+                    "end": 42,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 40
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 42
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 42,
+                      "raw": "42"
+                    },
+                    "value": 42
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0034.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0034.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/output.json
new file mode 100644
index 000000000000..1dc5a28897fa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/output.json
@@ -0,0 +1,127 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectMethod",
+              "start": 2,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "method": true,
+              "computed": true,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 4,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              },
+              "kind": "method",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 7,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0035.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0035.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/output.json
new file mode 100644
index 000000000000..2b50d0f0aea2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/output.json
@@ -0,0 +1,142 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 2,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "method": false,
+              "computed": true,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 4,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              },
+              "shorthand": false,
+              "value": {
+                "type": "ArrowFunctionExpression",
+                "start": 6,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0036.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0036.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/output.json
new file mode 100644
index 000000000000..8ecd159198d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/output.json
@@ -0,0 +1,187 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 35
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 2,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "method": false,
+              "computed": true,
+              "key": {
+                "type": "StringLiteral",
+                "start": 3,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": "__proto__",
+                  "raw": "\"__proto__\""
+                },
+                "value": "__proto__"
+              },
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 16,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "extra": {
+                  "rawValue": 0,
+                  "raw": "0"
+                },
+                "value": 0
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 19,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 19
+                },
+                "end": {
+                  "line": 1,
+                  "column": 34
+                }
+              },
+              "method": false,
+              "computed": true,
+              "key": {
+                "type": "StringLiteral",
+                "start": 20,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  }
+                },
+                "extra": {
+                  "rawValue": "__proto__",
+                  "raw": "\"__proto__\""
+                },
+                "value": "__proto__"
+              },
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 33,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 33
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "extra": {
+                  "rawValue": 0,
+                  "raw": "0"
+                },
+                "value": 0
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0037.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0037.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/output.json
new file mode 100644
index 000000000000..5fcc5ff585f6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/output.json
@@ -0,0 +1,129 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 2,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "StringLiteral",
+                "start": 2,
+                "end": 5,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 5
+                  }
+                },
+                "extra": {
+                  "rawValue": "[",
+                  "raw": "\"[\""
+                },
+                "value": "["
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 7,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0038.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0038.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/output.json
new file mode 100644
index 000000000000..925deed2a00b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/output.json
@@ -0,0 +1,180 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectMethod",
+              "start": 2,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "computed": false,
+              "kind": "set",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "AssignmentPattern",
+                  "start": 8,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 9,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 9
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 0,
+                      "raw": "0"
+                    },
+                    "value": 0
+                  }
+                }
+              ],
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/output.json
new file mode 100644
index 000000000000..1cf6441fffc6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/output.json
@@ -0,0 +1,65 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "ThisExpression",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/output.json
new file mode 100644
index 000000000000..3d18314470cd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/output.json
@@ -0,0 +1,65 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NullLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/output.json
new file mode 100644
index 000000000000..bf57e074ccea
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 5,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 4
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 5,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 4
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            }
+          },
+          "extra": {
+            "rawValue": 42,
+            "raw": "42"
+          },
+          "value": 42
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/output.json
new file mode 100644
index 000000000000..e05c37f12629
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/output.json
@@ -0,0 +1,146 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "left": {
+            "type": "BinaryExpression",
+            "start": 1,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              }
+            },
+            "left": {
+              "type": "NumericLiteral",
+              "start": 1,
+              "end": 2,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 2
+                }
+              },
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            },
+            "operator": "+",
+            "right": {
+              "type": "NumericLiteral",
+              "start": 5,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                }
+              },
+              "extra": {
+                "rawValue": 2,
+                "raw": "2"
+              },
+              "value": 2
+            },
+            "extra": {
+              "parenthesized": true,
+              "parenStart": 0
+            }
+          },
+          "operator": "*",
+          "right": {
+            "type": "NumericLiteral",
+            "start": 11,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "extra": {
+              "rawValue": 3,
+              "raw": "3"
+            },
+            "value": 3
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0008.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0008.source.js
deleted file mode 100755
index f0f44705bf8d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0008.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'T\u203F = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0009.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0009.source.js
deleted file mode 100755
index e2eb52f9c7df..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0009.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'T\u200C = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0010.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0010.source.js
deleted file mode 100755
index bafe63b052e8..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0010.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'T\u200D = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0011.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0011.source.js
deleted file mode 100755
index 307b0667e7c1..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0011.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u2163\u2161 = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0012.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0012.source.js
deleted file mode 100755
index b24f8e1c8272..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0012.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u2163\u2161\u200A=\u2009[]';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0005.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0005.source.js
deleted file mode 100755
index b2b646e23ee3..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0005.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[\\u{0000000000000061}-\\u{7A}]/u';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.failure.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.failure.json
deleted file mode 100755
index 55cbc7a399d2..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.failure.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "index": 21,
-    "lineNumber": 1,
-    "column": 22,
-    "message": "Error: Line 1: Invalid regular expression"
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.source.js
deleted file mode 100755
index 964850a64ee6..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /\\u{110000}/u';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.failure.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.failure.json
deleted file mode 100755
index 9bfbe69a020a..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.failure.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "index": 21,
-    "lineNumber": 1,
-    "column": 22,
-    "message": "Error: Line 1: Invalid regular expression"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.failure.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.failure.json
deleted file mode 100755
index 9bfbe69a020a..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.failure.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "index": 21,
-    "lineNumber": 1,
-    "column": 22,
-    "message": "Error: Line 1: Invalid regular expression"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0002.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0002.source.js
deleted file mode 100755
index 0447afbd6fde..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0002.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u0061"';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/object/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/other/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/input.js
deleted file mode 100644
index 0faf8dc92a46..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'x\\u005c';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/options.json
deleted file mode 100644
index 9ce9658f7dfa..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/input.js
deleted file mode 100644
index ac96b7835455..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'x\\u002a';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/options.json
deleted file mode 100644
index 9ce9658f7dfa..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/input.js
deleted file mode 100644
index e7f145a8d03c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'a\\u';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/options.json
deleted file mode 100644
index 27a7b64d71d4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/input.js
deleted file mode 100644
index 5ced27a43a4e..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\\ua';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/options.json
deleted file mode 100644
index 27a7b64d71d4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/input.js
deleted file mode 100644
index 21543eba12eb..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[a-z]/\\ux';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/options.json
deleted file mode 100644
index b8b06c3a03ba..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:18)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/input.js
deleted file mode 100644
index a7b0d9a4656d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[a-z\n]/\\ux';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/options.json
deleted file mode 100644
index 98d712379010..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:15)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/input.js
deleted file mode 100644
index 42552d48074d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[a-z]/\\\\ux';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/options.json
deleted file mode 100644
index e806dd7b3a52..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:17)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/input.js
deleted file mode 100644
index eabe2cb40a69..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[P QR]/\\\\u0067';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/options.json
deleted file mode 100644
index b8b06c3a03ba..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:18)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/input.js
deleted file mode 100644
index 32714507554e..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{110000}"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/options.json
deleted file mode 100644
index 9e093bfdcd96..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:12)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/input.js
deleted file mode 100644
index 1a2de200fe42..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{}"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/options.json
deleted file mode 100644
index 91b308200e05..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:5)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/input.js
deleted file mode 100644
index eac5bf2ce6e9..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{FFFF"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/options.json
deleted file mode 100644
index 89bfc2d73f8a..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:10)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/input.js
deleted file mode 100644
index b190f73e12b9..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{FFZ}"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/options.json
deleted file mode 100644
index 9ce9658f7dfa..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/options.json
deleted file mode 100644
index e3a1ba7e8296..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "setter should have exactly one param (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/input.js
deleted file mode 100644
index 93e2a300f15d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u203F = 10';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/options.json
deleted file mode 100644
index b5b75f41875c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:1)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/input.js
deleted file mode 100644
index cd1103629db1..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\\u005c';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/options.json
deleted file mode 100644
index c958665c03e2..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:7)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/input.js
deleted file mode 100644
index aa31feb7eccb..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\\u0000';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/options.json
deleted file mode 100644
index c958665c03e2..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:7)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/input.js
deleted file mode 100644
index 29a288bee4bb..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u200C = []';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/options.json
deleted file mode 100644
index b5b75f41875c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:1)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/input.js
deleted file mode 100644
index ec9a56e78cf0..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u200D = []';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/options.json
deleted file mode 100644
index b5b75f41875c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:1)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/input.js
deleted file mode 100644
index 481ef9c80833..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/options.json
deleted file mode 100644
index 27a7b64d71d4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/options.json
deleted file mode 100644
index 9e093bfdcd96..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:12)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/input.js
new file mode 100644
index 000000000000..fff580f2044f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/input.js
@@ -0,0 +1 @@
+x\\u005c
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/options.json
new file mode 100644
index 000000000000..d08f66903cbf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/input.js
new file mode 100644
index 000000000000..17112246786b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/input.js
@@ -0,0 +1 @@
+x\\u002a
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/options.json
new file mode 100644
index 000000000000..d08f66903cbf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/input.js
new file mode 100644
index 000000000000..3177052a225a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/input.js
@@ -0,0 +1 @@
+a\\u
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/options.json
new file mode 100644
index 000000000000..d08f66903cbf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/input.js
new file mode 100644
index 000000000000..d56d7c190d02
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/input.js
@@ -0,0 +1 @@
+\\ua
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/input.js
new file mode 100644
index 000000000000..9a2dc1767685
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/input.js
@@ -0,0 +1 @@
+var x = /[a-z]/\\ux
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/options.json
new file mode 100644
index 000000000000..7b44c68a56ba
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:16)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/input.js
new file mode 100644
index 000000000000..fdbf86f1d023
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/input.js
@@ -0,0 +1 @@
+var x = /[a-z\n]/\\ux
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/options.json
new file mode 100644
index 000000000000..7ee699160181
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:18)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/input.js
new file mode 100644
index 000000000000..e2a2d371e229
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/input.js
@@ -0,0 +1 @@
+var x = /[a-z]/\\\\ux
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/options.json
new file mode 100644
index 000000000000..7b44c68a56ba
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:16)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/input.js
new file mode 100644
index 000000000000..fc48dffd74dc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/input.js
@@ -0,0 +1 @@
+var x = /[P QR]/\\\\u0067
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/options.json
new file mode 100644
index 000000000000..5a8646213298
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:17)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/input.js
new file mode 100644
index 000000000000..2bbf7ac4d47c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/input.js
@@ -0,0 +1 @@
+\\u{110000}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/input.js
new file mode 100644
index 000000000000..9943cc7906a5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/input.js
@@ -0,0 +1 @@
+\\u{}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/input.js
new file mode 100644
index 000000000000..5d4f24cb8271
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/input.js
@@ -0,0 +1 @@
+\\u{FFFF
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/input.js
new file mode 100644
index 000000000000..11e05c81c1e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/input.js
@@ -0,0 +1 @@
+\\u{FFZ}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/input.js
rename to packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/options.json
new file mode 100644
index 000000000000..15db70153669
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "setter must have exactly one formal parameter (1:3)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/input.js
new file mode 100644
index 000000000000..a63b2d2bdd7e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/input.js
@@ -0,0 +1 @@
+\u203F = 10
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/options.json
new file mode 100644
index 000000000000..b813254a6566
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/input.js
new file mode 100644
index 000000000000..b9e12b2eff54
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/input.js
@@ -0,0 +1 @@
+\\u005c
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/input.js
new file mode 100644
index 000000000000..a6e819ccd18b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/input.js
@@ -0,0 +1 @@
+\\u0000
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/input.js
new file mode 100644
index 000000000000..7884927364d5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/input.js
@@ -0,0 +1 @@
+\u200C = []
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/options.json
new file mode 100644
index 000000000000..b813254a6566
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/input.js
new file mode 100644
index 000000000000..ade8012e1e92
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/input.js
@@ -0,0 +1 @@
+\u200D = []
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/options.json
new file mode 100644
index 000000000000..b813254a6566
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/input.js
new file mode 100644
index 000000000000..2775e915bb92
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/input.js
@@ -0,0 +1 @@
+"\\u
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/options.json
new file mode 100644
index 000000000000..a760565b1bd2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unterminated string constant (1:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/input.js
rename to packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/options.json
new file mode 100644
index 000000000000..9b47cf200ee2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "enum is a reserved word (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js
index 389d74582517..acd373a4ae35 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js
@@ -1 +1 @@
-var source = '\\u0061';
+\\u0061
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js
index 6524a1c4cfd2..97f921cd1e29 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js
@@ -1 +1 @@
-var source = 'a\\u0061';
+a\\u0061
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/options.json
new file mode 100644
index 000000000000..d08f66903cbf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js
index d4941e9313e9..b57febcb64d5 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js
@@ -1 +1 @@
-var source = '\\u0061a';
+\\u0061a
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js
index 8e5a088c93c2..bf2962a6a9ec 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js
@@ -1 +1 @@
-var source = '\\u0061a ';
+\\u0061a 
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/options.json
new file mode 100644
index 000000000000..c5a8baf2b8ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/class-properties/invalid-named-static/output.json b/packages/babel-parser/test/fixtures/flow/class-properties/invalid-named-static/output.json
deleted file mode 100644
index 3a2bf08816ad..000000000000
--- a/packages/babel-parser/test/fixtures/flow/class-properties/invalid-named-static/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "module",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-alias/5/5.js b/packages/babel-parser/test/fixtures/flow/type-alias/5/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/flow/type-alias/5/5.js
rename to packages/babel-parser/test/fixtures/flow/type-alias/5/input.js
diff --git a/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json b/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json
index 3a2bf08816ad..75a8bc8b79e1 100644
--- a/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json
@@ -1,34 +1,553 @@
 {
   "type": "File",
   "start": 0,
-  "end": 0,
+  "end": 98,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 0
+      "line": 9,
+      "column": 2
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 0,
+    "end": 98,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 0
+        "line": 9,
+        "column": 2
       }
     },
     "sourceType": "module",
     "interpreter": null,
-    "body": [],
+    "body": [
+      {
+        "type": "TypeAlias",
+        "start": 0,
+        "end": 48,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 2
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "GenericTypeAnnotation",
+          "start": 9,
+          "end": 47,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "typeParameters": {
+            "type": "TypeParameterInstantiation",
+            "start": 12,
+            "end": 47,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 12
+              },
+              "end": {
+                "line": 4,
+                "column": 1
+              }
+            },
+            "params": [
+              {
+                "type": "UnionTypeAnnotation",
+                "start": 16,
+                "end": 45,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 15
+                  }
+                },
+                "types": [
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 18,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 19,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 19,
+                          "end": 23,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 25,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "A",
+                            "raw": "\"A\""
+                          },
+                          "value": "A"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  },
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 34,
+                    "end": 45,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 35,
+                        "end": 44,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 35,
+                          "end": 39,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 41,
+                          "end": 44,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "B",
+                            "raw": "\"B\""
+                          },
+                          "value": "B"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  }
+                ]
+              }
+            ]
+          },
+          "id": {
+            "type": "Identifier",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              },
+              "identifierName": "Foo"
+            },
+            "name": "Foo"
+          }
+        }
+      },
+      {
+        "type": "TypeAlias",
+        "start": 50,
+        "end": 98,
+        "loc": {
+          "start": {
+            "line": 6,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 2
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 55,
+          "end": 56,
+          "loc": {
+            "start": {
+              "line": 6,
+              "column": 5
+            },
+            "end": {
+              "line": 6,
+              "column": 6
+            },
+            "identifierName": "B"
+          },
+          "name": "B"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "GenericTypeAnnotation",
+          "start": 59,
+          "end": 97,
+          "loc": {
+            "start": {
+              "line": 6,
+              "column": 9
+            },
+            "end": {
+              "line": 9,
+              "column": 1
+            }
+          },
+          "typeParameters": {
+            "type": "TypeParameterInstantiation",
+            "start": 62,
+            "end": 97,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 12
+              },
+              "end": {
+                "line": 9,
+                "column": 1
+              }
+            },
+            "params": [
+              {
+                "type": "IntersectionTypeAnnotation",
+                "start": 66,
+                "end": 95,
+                "loc": {
+                  "start": {
+                    "line": 7,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 15
+                  }
+                },
+                "types": [
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 68,
+                    "end": 79,
+                    "loc": {
+                      "start": {
+                        "line": 7,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 7,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 69,
+                        "end": 78,
+                        "loc": {
+                          "start": {
+                            "line": 7,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 7,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 69,
+                          "end": 73,
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 75,
+                          "end": 78,
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "A",
+                            "raw": "\"A\""
+                          },
+                          "value": "A"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  },
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 84,
+                    "end": 95,
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 85,
+                        "end": 94,
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 85,
+                          "end": 89,
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 91,
+                          "end": 94,
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "B",
+                            "raw": "\"B\""
+                          },
+                          "value": "B"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  }
+                ]
+              }
+            ]
+          },
+          "id": {
+            "type": "Identifier",
+            "start": 59,
+            "end": 62,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 9
+              },
+              "end": {
+                "line": 6,
+                "column": 12
+              },
+              "identifierName": "Foo"
+            },
+            "name": "Foo"
+          }
+        }
+      }
+    ],
     "directives": []
   }
 }
\ No newline at end of file

From 6b3cf3e3c6eb5e71438871f9f3cb14d1327e5bbc Mon Sep 17 00:00:00 2001
From: Daniel Tschinder <daniel@tschinder.de>
Date: Sun, 2 Dec 2018 12:10:42 -0800
Subject: [PATCH 3/3] Warn on test folders that are not empty and do not
 contain testfiles

---
 packages/babel-helper-fixtures/src/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/babel-helper-fixtures/src/index.js b/packages/babel-helper-fixtures/src/index.js
index 687d642105c9..7fc0cf21a3c7 100644
--- a/packages/babel-helper-fixtures/src/index.js
+++ b/packages/babel-helper-fixtures/src/index.js
@@ -107,6 +107,9 @@ export default function get(entryLoc): Array<Suite> {
 
       // If neither input nor exec is present it is not a real testcase
       if (taskDirStats.isDirectory() && !actualLoc && !execLoc) {
+        if (fs.readdirSync(taskDir).length > 0) {
+          console.warn(`Skipped test folder with invalid layout: ${taskDir}`);
+        }
         return;
       } else if (!actualLoc) {
         actualLoc = taskDir + "/input.js";