From 8db1df7aeab700e16359b879b9bbe89d74d87213 Mon Sep 17 00:00:00 2001 From: Stepan Kuzmin Date: Thu, 23 Feb 2023 19:11:55 +0200 Subject: [PATCH] Switch to @javascript-obfuscator/escodegen --- package-lock.json | 77 ++++++++++++++++++++++++++--------------------- package.json | 2 +- rollup.config.js | 2 +- src/unassert.js | 2 +- 4 files changed, 46 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4712a51..a142a46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,10 +9,10 @@ "version": "0.5.0", "license": "Beerware", "dependencies": { + "@javascript-obfuscator/escodegen": "^2.3.0", "@rollup/pluginutils": "^4.2.1", "acorn": "^8.8.0", "convert-source-map": "^1.8.0", - "escodegen": "^2.0.0", "multi-stage-sourcemap": "^0.3.1", "unassert": "^2.0.0" }, @@ -73,6 +73,31 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@javascript-obfuscator/escodegen": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/escodegen/-/escodegen-2.3.0.tgz", + "integrity": "sha512-QVXwMIKqYMl3KwtTirYIA6gOCiJ0ZDtptXqAv/8KWLG9uQU2fZqTVy7a/A5RvcoZhbDoFfveTxuGxJ5ibzQtkw==", + "dependencies": { + "@javascript-obfuscator/estraverse": "^5.3.0", + "esprima": "^4.0.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/@javascript-obfuscator/estraverse": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/estraverse/-/estraverse-5.4.0.tgz", + "integrity": "sha512-CZFX7UZVN9VopGbjTx4UXaXsi9ewoM1buL0kY7j1ftYdSs7p2spv9opxFjHlQ/QGTgh4UqufYqJJ0WKLml7b6w==", + "engines": { + "node": ">=4.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -536,27 +561,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, "node_modules/eslint": { "version": "8.21.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", @@ -2379,6 +2383,23 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@javascript-obfuscator/escodegen": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/escodegen/-/escodegen-2.3.0.tgz", + "integrity": "sha512-QVXwMIKqYMl3KwtTirYIA6gOCiJ0ZDtptXqAv/8KWLG9uQU2fZqTVy7a/A5RvcoZhbDoFfveTxuGxJ5ibzQtkw==", + "requires": { + "@javascript-obfuscator/estraverse": "^5.3.0", + "esprima": "^4.0.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "@javascript-obfuscator/estraverse": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@javascript-obfuscator/estraverse/-/estraverse-5.4.0.tgz", + "integrity": "sha512-CZFX7UZVN9VopGbjTx4UXaXsi9ewoM1buL0kY7j1ftYdSs7p2spv9opxFjHlQ/QGTgh4UqufYqJJ0WKLml7b6w==" + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2723,18 +2744,6 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, - "escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - } - }, "eslint": { "version": "8.21.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", diff --git a/package.json b/package.json index 075c221..57c4bb0 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "dist" ], "dependencies": { + "@javascript-obfuscator/escodegen": "^2.3.0", "@rollup/pluginutils": "^4.2.1", "acorn": "^8.8.0", "convert-source-map": "^1.8.0", - "escodegen": "^2.0.0", "multi-stage-sourcemap": "^0.3.1", "unassert": "^2.0.0" }, diff --git a/rollup.config.js b/rollup.config.js index 5e6a475..696ca60 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,7 +1,7 @@ const config = format => ({ input: 'src/unassert.js', - external: ['rollup-pluginutils', 'acorn', 'escodegen', 'unassert', 'convert-source-map', 'multi-stage-sourcemap'], + external: ['rollup-pluginutils', 'acorn', '@javascript-obfuscator/escodegen', 'unassert', 'convert-source-map', 'multi-stage-sourcemap'], output: { file: `dist/rollup-plugin-unassert.${format}.js`, format diff --git a/src/unassert.js b/src/unassert.js index ae5cde6..da1cab0 100644 --- a/src/unassert.js +++ b/src/unassert.js @@ -1,7 +1,7 @@ import {createFilter} from '@rollup/pluginutils'; import acorn from 'acorn'; -import escodegen from 'escodegen'; +import escodegen from '@javascript-obfuscator/escodegen'; import {unassertAst} from 'unassert'; import convert from 'convert-source-map'; import {transfer} from 'multi-stage-sourcemap';