❌ Enable import.meta by default in @babel/parser (babel#11364)

* move files, remove hasPlugin() & expectPlugin()
kik-o · Apr 11, 2020 · 69b0fd0 · 69b0fd0
1 parent 070ec20
commit 69b0fd0
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 90 deletions.
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -1227,8 +1227,6 @@ export default class ExpressionParser extends LValParser {
     this.expect(tt.dot);
 
     if (this.isContextual("meta")) {
-      this.expectPlugin("importMeta");
-
       if (!this.inModule) {
         this.raiseWithData(
           id.start,
@@ -1237,8 +1235,6 @@ export default class ExpressionParser extends LValParser {
         );
       }
       this.sawUnambiguousESM = true;
-    } else if (!this.hasPlugin("importMeta")) {
-      this.raise(id.start, Errors.ImportCallArityLtOne);
     }
 
     return this.parseMetaProperty(node, id, "meta");

diff --git a/packages/babel-parser/test/fixtures/core/sourcetype-unambiguous/import-meta/input.js b/packages/babel-parser/test/fixtures/core/sourcetype-unambiguous/import-meta/input.js
diff --git a/packages/babel-parser/test/fixtures/core/sourcetype-unambiguous/import-meta/options.json b/packages/babel-parser/test/fixtures/core/sourcetype-unambiguous/import-meta/options.json
diff --git a/packages/babel-parser/test/fixtures/core/sourcetype-unambiguous/import-meta/output.json b/packages/babel-parser/test/fixtures/core/sourcetype-unambiguous/import-meta/output.json
diff --git a/packages/babel-parser/test/fixtures/es2020/dynamic-import/direct-calls-only/output.json b/packages/babel-parser/test/fixtures/es2020/dynamic-import/direct-calls-only/output.json
@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":49,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: Dynamic imports require a parameter: import('a.js') (2:9)",
     "SyntaxError: The only valid meta property for import is import.meta (2:16)"
   ],
   "program": {

diff --git a/...erimental/_no-plugin/import-meta/input.js → ...2020/import-meta/error-in-script/input.js b/...erimental/_no-plugin/import-meta/input.js → ...2020/import-meta/error-in-script/input.js
diff --git a/.../import-meta/error-in-script/options.json → .../import-meta/error-in-script/options.json b/.../import-meta/error-in-script/options.json → .../import-meta/error-in-script/options.json
@@ -1,4 +1,3 @@
 {
-  "plugins": ["importMeta"],
   "sourceType": "script"
 }
diff --git a/...l/import-meta/error-in-script/output.json → ...0/import-meta/error-in-script/output.json b/...l/import-meta/error-in-script/output.json → ...0/import-meta/error-in-script/output.json
diff --git a/.../import-meta/no-other-prop-names/input.js → .../import-meta/no-other-prop-names/input.js b/.../import-meta/no-other-prop-names/input.js → .../import-meta/no-other-prop-names/input.js
diff --git a/packages/babel-parser/test/fixtures/es2020/import-meta/no-other-prop-names/options.json b/packages/babel-parser/test/fixtures/es2020/import-meta/no-other-prop-names/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "module"
+}
diff --git a/...port-meta/no-other-prop-names/output.json → ...port-meta/no-other-prop-names/output.json b/...port-meta/no-other-prop-names/output.json → ...port-meta/no-other-prop-names/output.json
diff --git a/...ental/import-meta/not-assignable/input.js → ...s2020/import-meta/not-assignable/input.js b/...ental/import-meta/not-assignable/input.js → ...s2020/import-meta/not-assignable/input.js
diff --git a/packages/babel-parser/test/fixtures/es2020/import-meta/not-assignable/options.json b/packages/babel-parser/test/fixtures/es2020/import-meta/not-assignable/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "module"
+}
diff --git a/...al/import-meta/not-assignable/output.json → ...20/import-meta/not-assignable/output.json b/...al/import-meta/not-assignable/output.json → ...20/import-meta/not-assignable/output.json
diff --git a/...ntal/import-meta/valid-in-module/input.js → ...2020/import-meta/valid-in-module/input.js b/...ntal/import-meta/valid-in-module/input.js → ...2020/import-meta/valid-in-module/input.js
diff --git a/packages/babel-parser/test/fixtures/es2020/import-meta/valid-in-module/options.json b/packages/babel-parser/test/fixtures/es2020/import-meta/valid-in-module/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "module"
+}
diff --git a/...l/import-meta/valid-in-module/output.json → ...0/import-meta/valid-in-module/output.json b/...l/import-meta/valid-in-module/output.json → ...0/import-meta/valid-in-module/output.json
diff --git a/...port-meta/without-dynamic-import/input.js → ...port-meta/without-dynamic-import/input.js b/...port-meta/without-dynamic-import/input.js → ...port-meta/without-dynamic-import/input.js
diff --git a/packages/babel-parser/test/fixtures/es2020/import-meta/without-dynamic-import/options.json b/packages/babel-parser/test/fixtures/es2020/import-meta/without-dynamic-import/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "module"
+}
diff --git a/...t-meta/without-dynamic-import/output.json → ...t-meta/without-dynamic-import/output.json b/...t-meta/without-dynamic-import/output.json → ...t-meta/without-dynamic-import/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-meta/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-meta/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/import-meta/error-in-script/input.js b/packages/babel-parser/test/fixtures/experimental/import-meta/error-in-script/input.js
diff --git a/...ages/babel-parser/test/fixtures/experimental/import-meta/no-other-prop-names/options.json b/...ages/babel-parser/test/fixtures/experimental/import-meta/no-other-prop-names/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/import-meta/not-assignable/options.json b/packages/babel-parser/test/fixtures/experimental/import-meta/not-assignable/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/import-meta/valid-in-module/options.json b/packages/babel-parser/test/fixtures/experimental/import-meta/valid-in-module/options.json
diff --git a/...s/babel-parser/test/fixtures/experimental/import-meta/without-dynamic-import/options.json b/...s/babel-parser/test/fixtures/experimental/import-meta/without-dynamic-import/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/input.js b/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/options.json