From 8798fb3a20dd2242541f28a78772d0354f3dcb1e Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 25 Mar 2021 09:42:47 +0100
Subject: [PATCH] fixup! module: clarify CJS global-like variables not defined
 error message

---
 ...esm-undefined-cjs-global-like-variables.js | 34 +++++++++----------
 .../nested-inherited-type/cjs.js              |  2 --
 2 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 test/fixtures/es-modules/package-type-module/nested-inherited-type/cjs.js

diff --git a/test/es-module/test-esm-undefined-cjs-global-like-variables.js b/test/es-module/test-esm-undefined-cjs-global-like-variables.js
index cc90694317d7ff..10867919f6f036 100644
--- a/test/es-module/test-esm-undefined-cjs-global-like-variables.js
+++ b/test/es-module/test-esm-undefined-cjs-global-like-variables.js
@@ -6,37 +6,37 @@ const { pathToFileURL } = require('url');
 
 assert.rejects(
   import('data:text/javascript,require;'),
-  /require is not defined in ES module scope, you can use import instead/
-).then(common.mustCall());
-
-assert.rejects(
-  import('data:text/javascript,require_custom;'),
-  /^(?!use import instead).*$/
+  /require is not defined in ES module scope, you can use import instead$/
 ).then(common.mustCall());
 assert.rejects(
   import('data:text/javascript,exports={};'),
-  /^(?!use import instead).*$/
+  /exports is not defined in ES module scope$/
 ).then(common.mustCall());
 
 assert.rejects(
-  import('data:text/javascript,require;//.js'),
-  // eslint-disable-next-line node-core/no-unescaped-regexp-dot
-  /^(?!use the .\.cjs. file extension).*$/
+  import('data:text/javascript,require_custom;'),
+  /^(?!in ES module scope)(?!use import instead).*$/
 ).then(common.mustCall());
 
 const pkgUrl = pathToFileURL(fixtures.path('/es-modules/package-type-module/'));
 assert.rejects(
   import(new URL('./cjs.js', pkgUrl)),
-  // eslint-disable-next-line node-core/no-unescaped-regexp-dot
-  /use the .\.cjs. file extension/
+  /use the '\.cjs' file extension/
 ).then(common.mustCall());
 assert.rejects(
-  import(new URL('./nested-inherited-type/cjs.js', pkgUrl)),
-  // eslint-disable-next-line node-core/no-unescaped-regexp-dot
-  /use the .\.cjs. file extension/
+  import(new URL('./cjs.js#target', pkgUrl)),
+  /use the '\.cjs' file extension/
+).then(common.mustCall());
+assert.rejects(
+  import(new URL('./cjs.js?foo=bar', pkgUrl)),
+  /use the '\.cjs' file extension/
 ).then(common.mustCall());
 assert.rejects(
   import(new URL('./cjs.js?foo=bar#target', pkgUrl)),
-  // eslint-disable-next-line node-core/no-unescaped-regexp-dot
-  /use the .\.cjs. file extension/
+  /use the '\.cjs' file extension/
+).then(common.mustCall());
+
+assert.rejects(
+  import('data:text/javascript,require;//.js'),
+  /^(?!use the '\.cjs' file extension).*$/
 ).then(common.mustCall());
diff --git a/test/fixtures/es-modules/package-type-module/nested-inherited-type/cjs.js b/test/fixtures/es-modules/package-type-module/nested-inherited-type/cjs.js
deleted file mode 100644
index aa7c4d90539154..00000000000000
--- a/test/fixtures/es-modules/package-type-module/nested-inherited-type/cjs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-'use strict';
-require('../');