From dfdfeeacdaf25291b92f329428545bb7f4a4adb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nicolo.ribaudo@gmail.com>
Date: Wed, 1 Sep 2021 12:46:02 +0200
Subject: [PATCH] Misc CJS vs ESM

---
 jest.config.js                                                  | 1 +
 .../test/load-browserslist-package-json/package.json            | 1 +
 .../test/fixtures/imports/elide-injected/options.json           | 2 +-
 .../fixtures/imports/elide-injected/{plugin.js => plugin.cjs}   | 0
 .../test/fixtures/imports/parameter-decorators/options.json     | 2 +-
 .../imports/parameter-decorators/{plugin.js => plugin.cjs}      | 0
 6 files changed, 4 insertions(+), 2 deletions(-)
 rename packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/{plugin.js => plugin.cjs} (100%)
 rename packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/{plugin.js => plugin.cjs} (100%)

diff --git a/jest.config.js b/jest.config.js
index 66425c7c7913..2c2b1fa9db56 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -50,6 +50,7 @@ module.exports = {
     "<rootDir>/build/",
   ],
   resolver: supportsESM ? "./test/jestExportsMapResolver.cjs" : null,
+  extensionsToTreatAsEsm: supportsESM ? [".ts"] : null,
   // We don't need module name mappers here as depedencies of workspace
   // package should be declared explicitly in the package.json
   // Yarn will generate correct file links so that Jest can resolve correctly
diff --git a/packages/babel-helper-compilation-targets/test/load-browserslist-package-json/package.json b/packages/babel-helper-compilation-targets/test/load-browserslist-package-json/package.json
index 6cb011cbaae3..07bb61752931 100644
--- a/packages/babel-helper-compilation-targets/test/load-browserslist-package-json/package.json
+++ b/packages/babel-helper-compilation-targets/test/load-browserslist-package-json/package.json
@@ -1,3 +1,4 @@
 {
+  "type": "module",
   "browserslist": "chrome 4"
 }
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/options.json
index be7a52a5c5c6..0ff82d9c69f4 100644
--- a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/options.json
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["transform-typescript", "./plugin"]
+  "plugins": ["transform-typescript", "./plugin.cjs"]
 }
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/plugin.js b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/plugin.cjs
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/plugin.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/plugin.cjs
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/options.json
index dcdc6eed36c0..366ea0749248 100644
--- a/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/options.json
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/options.json
@@ -7,6 +7,6 @@
         "legacy": true
       }
     ],
-    "./plugin"
+    "./plugin.cjs"
   ]
 }
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/plugin.js b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/plugin.cjs
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/plugin.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/plugin.cjs