nodejs
diff --git a/‎lib/repl.js‎
Lines changed: 9 additions & 0 deletions b/‎lib/repl.js‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎test/parallel/test-repl.js‎
Lines changed: 10 additions & 0 deletions b/‎test/parallel/test-repl.js‎
Lines changed: 10 additions & 0 deletions
@@ -58,6 +58,7 @@ const {
   PromiseRace,
   RegExp,
   Set,
+  StringPrototypeIncludes,
   Symbol,
   WeakSet,
 } = primordials;
@@ -549,6 +550,14 @@ function REPLServer(prompt,
             e.stack = e.stack
               .replace(/^REPL\d+:\d+\r?\n/, '')
               .replace(/^\s+at\s.*\n?/gm, '');
+            const importErrorStr = 'Cannot use import statement outside a ' +
+              'module';
+            if (StringPrototypeIncludes(e.message, importErrorStr)) {
+              e.message = 'Cannot use import statement inside the Node.js ' +
+                'repl, alternatively use dynamic import';
+              e.stack = e.stack.replace(/SyntaxError:.*\n/,
+                                        `SyntaxError: ${e.message}\n`);
+            }
           } else if (self.replMode === exports.REPL_MODE_STRICT) {
             e.stack = e.stack.replace(/(\s+at\s+REPL\d+:)(\d+)/,
                                       (_, pre, line) => pre + (line - 1));
 
@@ -805,6 +805,16 @@ const tcpTests = [
   {
     send: `require(${JSON.stringify(moduleFilename)}).number`,
     expect: '42'
+  },
+  {
+    send: 'import comeOn from \'fhqwhgads\'',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      'Uncaught:',
+      /^SyntaxError: .* dynamic import/
+    ]
   }
 ];