fix rebase

babel · May 2, 2024 · 2dbadd4 · 2dbadd4
1 parent 520b5bb
commit 2dbadd4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/packages/babel-parser/src/plugin-utils.ts b/packages/babel-parser/src/plugin-utils.ts
@@ -60,7 +60,7 @@ export function validatePlugins(pluginsMap: Map<string, any>) {
  }
 
  const tupleSyntaxIsHash = process.env.BABEL_8_BREAKING
- ? true
+ ? pluginsMap.has("recordAndTuple")
  : pluginsMap.get("recordAndTuple")?.syntaxType === "hash";
 
  if (proposal === "hack") {
@@ -88,12 +88,12 @@ export function validatePlugins(pluginsMap: Map<string, any>) {
 
  if (topicToken === "#" && tupleSyntaxIsHash) {
  throw new Error(
- `Plugin conflict between \`["pipelineOperator", { proposal: "hack", topicToken: "#" }]\` and \`${JSON.stringify(recordAndTupleConfigItem)}\`.`,
+ `Plugin conflict between \`["pipelineOperator", { proposal: "hack", topicToken: "#" }]\` and \`${JSON.stringify(["recordAndTuple", pluginsMap.get("recordAndTuple")])}\`.`,
  );
  }
  } else if (proposal === "smart" && tupleSyntaxIsHash) {
  throw new Error(
- `Plugin conflict between \`["pipelineOperator", { proposal: "smart" }]\` and \`${JSON.stringify(recordAndTupleConfigItem)}\`.`,
+ `Plugin conflict between \`["pipelineOperator", { proposal: "smart" }]\` and \`${JSON.stringify(["recordAndTuple", pluginsMap.get("recordAndTuple")])}\`.`,
  );
  }
  }

diff --git a/...r/test/fixtures/experimental/pipeline-operator/hack-hash-proposal-hash-tuple/options.json b/...r/test/fixtures/experimental/pipeline-operator/hack-hash-proposal-hash-tuple/options.json
@@ -12,5 +12,5 @@
  "recordAndTuple"
  ]
  ],
- "throws": "Plugin conflict between `[\"pipelineOperator\", { proposal: \"hack\", topicToken: \"#\" }]` and `\"recordAndTuple\"`."
+ "throws": "Plugin conflict between `[\"pipelineOperator\", { proposal: \"hack\", topicToken: \"#\" }]` and `[\"recordAndTuple\",{}]`."
 }
diff --git a/...arser/test/fixtures/experimental/pipeline-operator/smart-proposal-hash-tuple/options.json b/...arser/test/fixtures/experimental/pipeline-operator/smart-proposal-hash-tuple/options.json
@@ -7,7 +7,9 @@
  "proposal": "smart"
  }
  ],
- ["recordAndTuple"]
+ [
+ "recordAndTuple"
+ ]
  ],
- "throws": "Plugin conflict between `[\"pipelineOperator\", { proposal: \"smart\" }]` and `\"recordAndTuple\"`."
+ "throws": "Plugin conflict between `[\"pipelineOperator\", { proposal: \"smart\" }]` and `[\"recordAndTuple\",{}]`."
 }