Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12451 from Snuffleupagus/acorn-8

Browse Source 
Upgrade `acorn` to version 8
This commit is contained in:
Tim van der Meij 2020-10-06 22:03:03 +02:00 committed by GitHub
commit fd1d9cc85f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
external/builder/preprocessor2.js vendored
View File

@ -8,6 +8,7 @@ var path = require("path");
var PDFJS_PREPROCESSOR_NAME = "PDFJSDev"; var PDFJS_PREPROCESSOR_NAME = "PDFJSDev";
var ROOT_PREFIX = "$ROOT/"; var ROOT_PREFIX = "$ROOT/";
const ACORN_ECMA_VERSION = 2020;
function isLiteral(obj, value) { function isLiteral(obj, value) {
return obj.type === "Literal" && obj.value === value; return obj.type === "Literal" && obj.value === value;
@ -49,7 +50,9 @@ function handlePreprocessorAction(ctx, actionName, args, loc) {
return { type: "Literal", value: result, loc: loc }; return { type: "Literal", value: result, loc: loc };
} }
if (typeof result === "object") { if (typeof result === "object") {
var parsedObj = acorn.parse("(" + JSON.stringify(result) + ")"); const parsedObj = acorn.parse("(" + JSON.stringify(result) + ")", {
ecmaVersion: ACORN_ECMA_VERSION,
});
parsedObj.body[0].expression.loc = loc; parsedObj.body[0].expression.loc = loc;
return parsedObj.body[0].expression; return parsedObj.body[0].expression;
} }
@ -67,7 +70,9 @@ function handlePreprocessorAction(ctx, actionName, args, loc) {
); );
} }
var jsonContent = fs.readFileSync(jsonPath).toString(); var jsonContent = fs.readFileSync(jsonPath).toString();
var parsedJSON = acorn.parse("(" + jsonContent + ")"); const parsedJSON = acorn.parse("(" + jsonContent + ")", {
ecmaVersion: ACORN_ECMA_VERSION,
});
parsedJSON.body[0].expression.loc = loc; parsedJSON.body[0].expression.loc = loc;
return parsedJSON.body[0].expression; return parsedJSON.body[0].expression;
} }
@ -322,14 +327,16 @@ function preprocessPDFJSCode(ctx, code) {
}, },
}; };
var parseOptions = { var parseOptions = {
ecmaVersion: 2020, ecmaVersion: ACORN_ECMA_VERSION,
locations: true, locations: true,
sourceFile: ctx.sourceFile, sourceFile: ctx.sourceFile,
sourceType: "module", sourceType: "module",
}; };
var codegenOptions = { var codegenOptions = {
format: format, format: format,
parse: acorn.parse, parse: function (input) {
return acorn.parse(input, { ecmaVersion: ACORN_ECMA_VERSION });
},
sourceMap: ctx.sourceMap, sourceMap: ctx.sourceMap,
sourceMapWithCode: ctx.sourceMap, sourceMapWithCode: ctx.sourceMap,
}; };

6
package-lock.json generated
View File

@ -2104,9 +2104,9 @@
"dev": true "dev": true
}, },
"acorn": { "acorn": {
"version": "7.4.0", "version": "8.0.4",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz",
"integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "integrity": "sha512-XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ==",
"dev": true "dev": true
}, },
"acorn-globals": { "acorn-globals": {

2
package.json
View File

@ -9,7 +9,7 @@
"@babel/plugin-transform-runtime": "^7.11.5", "@babel/plugin-transform-runtime": "^7.11.5",
"@babel/preset-env": "^7.11.5", "@babel/preset-env": "^7.11.5",
"@babel/runtime": "^7.11.2", "@babel/runtime": "^7.11.2",
"acorn": "^7.4.0", "acorn": "^8.0.4",
"autoprefixer": "^10.0.1", "autoprefixer": "^10.0.1",
"babel-loader": "^8.1.0", "babel-loader": "^8.1.0",
"canvas": "^2.6.1", "canvas": "^2.6.1",