Dependencies update (javascript-obfuscator#1148)

sanex3339 · web-flow · commit 2f1b2904a4de · 2023-02-12T22:40:54.000+04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,16 +16,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest,
-            node-version: 12.x
           - os: ubuntu-latest,
             node-version: 14.x
           - os: ubuntu-latest,
             node-version: 16.x
           - os: ubuntu-latest,
-            node-version: 17.x
+            node-version: 18.x
           - os: windows-latest,
             node-version: 16.x
+          - os: windows-latest,
+            node-version: 18.x
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.mocharc.json b/.mocharc.json
@@ -0,0 +1,3 @@
+{
+  "node-option": ["experimental-specifier-resolution=node", "loader=ts-node/esm"]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 Change Log
 
+v4.0.2
+---
+* Add support for `node@18`
+* Update dependencies
+
 v4.0.1
 ---
 * Update `class-validator` dependency https://github.com/javascript-obfuscator/javascript-obfuscator/pull/1146
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "javascript-obfuscator",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "JavaScript obfuscator",
   "keywords": [
     "obfuscator",
@@ -12,7 +12,7 @@
     "js obfuscator"
   ],
   "engines": {
-    "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+    "node": "^12.22.0 || ^14.0.0 || ^16.0.0 || ^17.0.0 || >=18.0.0"
   },
   "main": "dist/index.js",
   "browser": "dist/index.browser.js",
@@ -23,77 +23,77 @@
   "dependencies": {
     "@javascript-obfuscator/escodegen": "2.3.0",
     "@javascript-obfuscator/estraverse": "5.4.0",
-    "acorn": "8.7.0",
+    "acorn": "8.8.2",
     "assert": "2.0.0",
     "chalk": "4.1.2",
-    "chance": "1.1.8",
+    "chance": "1.1.9",
     "class-validator": "0.14.0",
-    "commander": "9.0.0",
-    "eslint-scope": "7.1.0",
-    "eslint-visitor-keys": "3.2.0",
+    "commander": "10.0.0",
+    "eslint-scope": "7.1.1",
+    "eslint-visitor-keys": "3.3.0",
     "fast-deep-equal": "3.1.3",
     "inversify": "6.0.1",
     "js-string-escape": "1.0.1",
     "md5": "2.3.0",
-    "mkdirp": "1.0.4",
+    "mkdirp": "2.1.3",
     "multimatch": "5.0.0",
     "opencollective-postinstall": "2.0.3",
     "process": "0.11.10",
     "reflect-metadata": "0.1.13",
     "source-map-support": "0.5.21",
     "string-template": "1.0.0",
     "stringz": "2.1.0",
-    "tslib": "2.3.1"
+    "tslib": "2.5.0"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "1.0.2",
-    "@types/chai": "4.3.0",
+    "@types/chai": "4.3.4",
     "@types/chance": "1.1.3",
     "@types/escodegen": "0.0.7",
-    "@types/eslint-scope": "3.7.3",
+    "@types/eslint-scope": "3.7.4",
     "@types/eslint-visitor-keys": "1.0.0",
-    "@types/estraverse": "5.1.1",
+    "@types/estraverse": "5.1.2",
     "@types/estree": "0.0.51",
     "@types/js-beautify": "1.13.3",
     "@types/js-string-escape": "1.0.1",
-    "@types/md5": "2.3.1",
+    "@types/md5": "2.3.2",
     "@types/mkdirp": "1.0.2",
-    "@types/mocha": "9.1.0",
+    "@types/mocha": "10.0.1",
     "@types/multimatch": "4.0.0",
-    "@types/node": "17.0.15",
+    "@types/node": "18.13.0",
     "@types/rimraf": "3.0.2",
-    "@types/sinon": "10.0.10",
+    "@types/sinon": "10.0.13",
     "@types/string-template": "1.0.2",
-    "@types/webpack-env": "1.16.3",
-    "@typescript-eslint/eslint-plugin": "5.10.2",
-    "@typescript-eslint/parser": "5.10.2",
-    "chai": "4.3.6",
+    "@types/webpack-env": "1.18.0",
+    "@typescript-eslint/eslint-plugin": "5.51.0",
+    "@typescript-eslint/parser": "5.51.0",
+    "chai": "4.3.7",
     "chai-exclude": "2.1.0",
     "cross-env": "7.0.3",
-    "eslint": "8.8.0",
-    "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-jsdoc": "37.7.1",
+    "eslint": "8.34.0",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-jsdoc": "40.0.0",
     "eslint-plugin-no-null": "1.0.2",
     "eslint-plugin-prefer-arrow": "1.2.3",
-    "eslint-plugin-unicorn": "40.1.0",
-    "eslint-webpack-plugin": "3.1.1",
-    "fork-ts-checker-notifier-webpack-plugin": "4.0.0",
-    "fork-ts-checker-webpack-plugin": "7.0.0",
-    "husky": "7.0.4",
-    "js-beautify": "1.14.0",
-    "mocha": "9.2.0",
+    "eslint-plugin-unicorn": "45.0.2",
+    "eslint-webpack-plugin": "4.0.0",
+    "fork-ts-checker-notifier-webpack-plugin": "6.0.0",
+    "fork-ts-checker-webpack-plugin": "7.3.0",
+    "husky": "8.0.3",
+    "js-beautify": "1.14.7",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
     "pjson": "1.0.9",
-    "rimraf": "3.0.2",
-    "sinon": "13.0.1",
+    "rimraf": "4.1.2",
+    "sinon": "15.0.1",
     "source-map-resolve": "0.6.0",
-    "terser": "5.10.0",
+    "terser": "5.16.3",
     "threads": "1.7.0",
-    "ts-loader": "9.2.6",
-    "ts-node": "10.4.0",
-    "typescript": "4.5.5",
-    "webpack": "5.68.0",
-    "webpack-cli": "4.9.2",
+    "ts-loader": "9.4.2",
+    "ts-node": "10.9.1",
+    "typescript": "4.9.5",
+    "webpack": "5.75.0",
+    "webpack-cli": "5.0.1",
     "webpack-node-externals": "3.0.0"
   },
   "repository": {
@@ -111,10 +111,10 @@
     "test:devCompilePerformance": "ts-node test/dev/dev-compile-performance.ts",
     "test:devRuntimePerformance": "ts-node test/dev/dev-runtime-performance.ts",
     "test:full": "yarn run test:dev && yarn run test:mocha-coverage && yarn run test:mocha-memory-performance",
-    "test:mocha": "mocha --require ts-node/register --require source-map-support/register test/index.spec.ts --exit",
+    "test:mocha": "mocha --require source-map-support/register test/index.spec.ts --exit",
     "test:mocha-coverage": "NODE_OPTIONS=--max-old-space-size=4096 nyc --reporter text-summary --no-clean yarn run test:mocha",
     "test:mocha-coverage:report": "nyc report --reporter=lcov",
-    "test:mocha-memory-performance": "cross-env NODE_OPTIONS=--max-old-space-size=240 mocha --require ts-node/register test/performance-tests/JavaScriptObfuscatorMemory.spec.ts",
+    "test:mocha-memory-performance": "cross-env NODE_OPTIONS=--max-old-space-size=280 mocha test/performance-tests/JavaScriptObfuscatorMemory.spec.ts",
     "test": "yarn run test:full",
     "eslint": "eslint src/**/*.ts",
     "git:addFiles": "git add .",
diff --git a/src/ASTParserFacade.ts b/src/ASTParserFacade.ts
@@ -91,7 +91,7 @@ export class ASTParserFacade {
         errorMessage: string,
         position: ESTree.Position | null
     ): never {
-        const isMissingLocationData = !position || !position.line || !position.column;
+        const isMissingLocationData = !position?.line || !position.column;
 
         if (isMissingLocationData) {
             throw new Error(errorMessage);
diff --git a/src/node-transformers/initializing-transformers/CommentsTransformer.ts b/src/node-transformers/initializing-transformers/CommentsTransformer.ts
@@ -70,7 +70,7 @@ export class CommentsTransformer extends AbstractNodeTransformer {
     public transformNode (rootNode: ESTree.Program): ESTree.Node {
         rootNode = this.filterCommentsOnPrimaryTraverse(rootNode);
 
-        if (!rootNode.comments || !rootNode.comments.length) {
+        if (!rootNode.comments?.length) {
             return rootNode;
         }
 
diff --git a/src/node/NodeFactory.ts b/src/node/NodeFactory.ts
@@ -410,6 +410,7 @@ export class NodeFactory {
             type: NodeType.Literal,
             value,
             raw,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
             'x-verbatim-property': {
                 content: raw,
                 precedence: escodegen.Precedence.Primary
diff --git a/src/node/NodeUtils.ts b/src/node/NodeUtils.ts
@@ -117,7 +117,7 @@ export class NodeUtils {
      * @param {T} node
      * @returns {T}
      */
-    private static cloneRecursive <T> (node: T): T {
+    private static cloneRecursive <T> (node: NonNullable<T>): T {
         if (node === null) {
             return node;
         }
diff --git a/src/utils/AbstractTransformerNamesGroupsBuilder.ts b/src/utils/AbstractTransformerNamesGroupsBuilder.ts
@@ -80,7 +80,7 @@ export abstract class AbstractTransformerNamesGroupsBuilder <
             const transformer: TTransformer = normalizedTransformers[transformerName];
 
             const runAfterRelations: TTransformerName[] | undefined = transformer.runAfter;
-            const areRunAfterRelationsEmpty = !runAfterRelations || !runAfterRelations.length;
+            const areRunAfterRelationsEmpty = !runAfterRelations?.length;
 
             if (areRunAfterRelationsEmpty) {
                 relationEdges.push([transformerName, null]);
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "node-option": ["experimental-specifier-resolution=node", "loader=ts-node/esm"]`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class CommentsTransformer extends AbstractNodeTransformer {`
`70`	`70`	`public transformNode (rootNode: ESTree.Program): ESTree.Node {`
`71`	`71`	`rootNode = this.filterCommentsOnPrimaryTraverse(rootNode);`
`72`	`72`
`73`		`- if (!rootNode.comments \|\| !rootNode.comments.length) {`
	`73`	`+ if (!rootNode.comments?.length) {`
`74`	`74`	`return rootNode;`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ export class NodeUtils {`
`117`	`117`	`* @param {T} node`
`118`	`118`	`* @returns {T}`
`119`	`119`	`*/`
`120`		`- private static cloneRecursive <T> (node: T): T {`
	`120`	`+ private static cloneRecursive <T> (node: NonNullable<T>): T {`
`121`	`121`	`if (node === null) {`
`122`	`122`	`return node;`
`123`	`123`	`}`