1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib,test: fix error message check after V8 update

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/28918
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Michaël Zasso 2019-06-17 10:00:31 +02:00
parent c206e7490c
commit 5746769d68
No known key found for this signature in database
GPG Key ID: 770F7A9A5AE15600
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/internal/modules/cjs/loader.js
View File

@ -96,7 +96,7 @@ function enrichCJSError(err) {
usage. However, some cases are not matching, cases like import statement usage. However, some cases are not matching, cases like import statement
after a comment block and/or after a variable definition. after a comment block and/or after a variable definition.
*/ */
if (err.message.startsWith('Unexpected token export') || if (err.message.startsWith('Unexpected token \'export\'') ||
(/^\s*import(?=[ {'"*])\s*(?![ (])/).test(lineWithErr)) { (/^\s*import(?=[ {'"*])\s*(?![ (])/).test(lineWithErr)) {
process.emitWarning( process.emitWarning(
'To load an ES module, set "type": "module" in the package.json or use ' + 'To load an ES module, set "type": "module" in the package.json or use ' +

4
test/parallel/test-v8-flags.js
View File

@ -13,6 +13,6 @@ assert(vm.runInThisContext('%_IsSmi(43)'));
v8.setFlagsFromString('--noallow_natives_syntax'); v8.setFlagsFromString('--noallow_natives_syntax');
assert.throws(function() { eval('%_IsSmi(44)'); }, assert.throws(function() { eval('%_IsSmi(44)'); },
/^SyntaxError: Unexpected token %$/); /^SyntaxError: Unexpected token '%'$/);
assert.throws(function() { vm.runInThisContext('%_IsSmi(45)'); }, assert.throws(function() { vm.runInThisContext('%_IsSmi(45)'); },
/^SyntaxError: Unexpected token %$/); /^SyntaxError: Unexpected token '%'$/);

2
test/parallel/test-vm-basic.js
View File

@ -152,7 +152,7 @@ const vm = require('vm');
); );
}, { }, {
type: SyntaxError, type: SyntaxError,
message: 'Unexpected token }' message: "Unexpected token '}'"
}); });
// Tests for failed argument validation // Tests for failed argument validation