From 08a1bc00da664bb7da5d23c2227ba56127e774b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20Leuth=C3=A4user?= <1417198+max-leuthaeuser@users.noreply.github.com> Date: Wed, 17 Jun 2026 10:05:05 +0200 Subject: [PATCH 1/2] Enable fixed transpilation dependencies as default --- .../io/shiftleft/js2cpg/core/Config.scala | 2 +- .../TranspilingEnvironment.scala | 27 +++++++++---------- src/test/resources/babel/package.json | 1 - src/test/resources/multisimple/a/package.json | 1 - src/test/resources/multisimple/b/package.json | 1 - src/test/resources/multisimple/package.json | 1 - .../multisolutionconfig/a/package.json | 1 - .../multisolutionconfig/b/package.json | 1 - .../multisolutionconfig/package.json | 1 - src/test/resources/typescript/package.json | 1 - src/test/resources/typescriptsub/package.json | 1 - 11 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/main/scala/io/shiftleft/js2cpg/core/Config.scala b/src/main/scala/io/shiftleft/js2cpg/core/Config.scala index 46b8fa933..518b9eed8 100644 --- a/src/main/scala/io/shiftleft/js2cpg/core/Config.scala +++ b/src/main/scala/io/shiftleft/js2cpg/core/Config.scala @@ -33,7 +33,7 @@ object Config { val DEFAULT_MODULE_MODE: Option[String] = None val DEFAULT_WITH_NODE_MODULES_FOLDER: Boolean = false val DEFAULT_OPTIMIZE_DEPENDENCIES: Boolean = true - val DEFAULT_FIXED_TRANSPILATION_DEPENDENCIES: Boolean = false + val DEFAULT_FIXED_TRANSPILATION_DEPENDENCIES: Boolean = true val DEFAULT_SERVER_MODE: Boolean = false } diff --git a/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala b/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala index 8f6a31dc0..2ae542d7a 100644 --- a/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala +++ b/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala @@ -45,23 +45,22 @@ trait TranspilingEnvironment { object Versions { val babelVersions: Map[String, String] = Map( - "@babel/core" -> "7.20.2", - "@babel/cli" -> "7.19.3", - "@babel/preset-env" -> "7.20.2", - "@babel/preset-flow" -> "7.18.6", - "@babel/preset-react" -> "7.18.6", - "@babel/preset-typescript" -> "7.18.6", - "@babel/plugin-transform-class-properties" -> "6.24.1", - "@babel/plugin-transform-private-methods" -> "7.27.1", - "@babel/plugin-transform-private-property-in-object" -> "7.27.1", - "@babel/plugin-transform-object-rest-spread" -> "7.28.0", - "@babel/plugin-transform-nullish-coalescing-operator" -> "7.27.1", - "@babel/plugin-transform-runtime" -> "7.19.6", - "@babel/plugin-transform-property-mutators" -> "7.18.6" + "@babel/core" -> "8.0.0", + "@babel/cli" -> "8.0.0", + "@babel/preset-env" -> "8.0.0", + "@babel/preset-flow" -> "8.0.0", + "@babel/preset-react" -> "8.0.0", + "@babel/preset-typescript" -> "8.0.0", + "@babel/plugin-transform-class-properties" -> "8.0.0", + "@babel/plugin-transform-private-methods" -> "8.0.0", + "@babel/plugin-transform-private-property-in-object" -> "8.0.0", + "@babel/plugin-transform-object-rest-spread" -> "8.0.0", + "@babel/plugin-transform-nullish-coalescing-operator" -> "8.0.0", + "@babel/plugin-transform-runtime" -> "8.0.0" ) private val versions: Map[String, String] = - babelVersions ++ Map("pug-cli" -> "1.0.0-alpha6", "typescript" -> "4.8.4", "@vue/cli-service-global" -> "4.5.19") + babelVersions ++ Map("pug-cli" -> "1.0.0-alpha6", "typescript" -> "6.0.3", "@vue/cli-service-global" -> "4.5.19") def nameAndVersion(dependencyName: String): String = { if (config.fixedTranspilationDependencies) { diff --git a/src/test/resources/babel/package.json b/src/test/resources/babel/package.json index ac889391f..501d8115b 100644 --- a/src/test/resources/babel/package.json +++ b/src/test/resources/babel/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisimple/a/package.json b/src/test/resources/multisimple/a/package.json index 4d02eb5f4..31d1d765e 100644 --- a/src/test/resources/multisimple/a/package.json +++ b/src/test/resources/multisimple/a/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisimple/b/package.json b/src/test/resources/multisimple/b/package.json index 54d2bee0a..ccc7ab43b 100644 --- a/src/test/resources/multisimple/b/package.json +++ b/src/test/resources/multisimple/b/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisimple/package.json b/src/test/resources/multisimple/package.json index 4d02eb5f4..31d1d765e 100644 --- a/src/test/resources/multisimple/package.json +++ b/src/test/resources/multisimple/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisolutionconfig/a/package.json b/src/test/resources/multisolutionconfig/a/package.json index 4d02eb5f4..31d1d765e 100644 --- a/src/test/resources/multisolutionconfig/a/package.json +++ b/src/test/resources/multisolutionconfig/a/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisolutionconfig/b/package.json b/src/test/resources/multisolutionconfig/b/package.json index 54d2bee0a..ccc7ab43b 100644 --- a/src/test/resources/multisolutionconfig/b/package.json +++ b/src/test/resources/multisolutionconfig/b/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisolutionconfig/package.json b/src/test/resources/multisolutionconfig/package.json index 4d02eb5f4..31d1d765e 100644 --- a/src/test/resources/multisolutionconfig/package.json +++ b/src/test/resources/multisolutionconfig/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/typescript/package.json b/src/test/resources/typescript/package.json index 9e9b1579d..7772e34bf 100644 --- a/src/test/resources/typescript/package.json +++ b/src/test/resources/typescript/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/typescriptsub/package.json b/src/test/resources/typescriptsub/package.json index 9e9b1579d..7772e34bf 100644 --- a/src/test/resources/typescriptsub/package.json +++ b/src/test/resources/typescriptsub/package.json @@ -6,7 +6,6 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", - "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", From a4aaf64cc0bc1fb53d4f76e5fd33cbc6628258c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20Leuth=C3=A4user?= <1417198+max-leuthaeuser@users.noreply.github.com> Date: Wed, 17 Jun 2026 11:18:53 +0200 Subject: [PATCH 2/2] Pin to 7.29.7 --- .../TranspilingEnvironment.scala | 25 ++++++++++--------- src/test/resources/babel/package.json | 1 + src/test/resources/multisimple/a/package.json | 1 + src/test/resources/multisimple/b/package.json | 1 + src/test/resources/multisimple/package.json | 1 + .../multisolutionconfig/a/package.json | 1 + .../multisolutionconfig/b/package.json | 1 + .../multisolutionconfig/package.json | 1 + src/test/resources/typescript/package.json | 1 + src/test/resources/typescriptsub/package.json | 1 + 10 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala b/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala index 2ae542d7a..b62053c24 100644 --- a/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala +++ b/src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala @@ -45,18 +45,19 @@ trait TranspilingEnvironment { object Versions { val babelVersions: Map[String, String] = Map( - "@babel/core" -> "8.0.0", - "@babel/cli" -> "8.0.0", - "@babel/preset-env" -> "8.0.0", - "@babel/preset-flow" -> "8.0.0", - "@babel/preset-react" -> "8.0.0", - "@babel/preset-typescript" -> "8.0.0", - "@babel/plugin-transform-class-properties" -> "8.0.0", - "@babel/plugin-transform-private-methods" -> "8.0.0", - "@babel/plugin-transform-private-property-in-object" -> "8.0.0", - "@babel/plugin-transform-object-rest-spread" -> "8.0.0", - "@babel/plugin-transform-nullish-coalescing-operator" -> "8.0.0", - "@babel/plugin-transform-runtime" -> "8.0.0" + "@babel/core" -> "7.29.7", + "@babel/cli" -> "7.29.7", + "@babel/preset-env" -> "7.29.7", + "@babel/preset-flow" -> "7.29.7", + "@babel/preset-react" -> "7.29.7", + "@babel/preset-typescript" -> "7.29.7", + "@babel/plugin-transform-class-properties" -> "7.29.7", + "@babel/plugin-transform-private-methods" -> "7.29.7", + "@babel/plugin-transform-private-property-in-object" -> "7.29.7", + "@babel/plugin-transform-object-rest-spread" -> "7.29.7", + "@babel/plugin-transform-nullish-coalescing-operator" -> "7.29.7", + "@babel/plugin-transform-runtime" -> "7.29.7", + "@babel/plugin-transform-property-mutators" -> "7.29.7" ) private val versions: Map[String, String] = diff --git a/src/test/resources/babel/package.json b/src/test/resources/babel/package.json index 501d8115b..ac889391f 100644 --- a/src/test/resources/babel/package.json +++ b/src/test/resources/babel/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisimple/a/package.json b/src/test/resources/multisimple/a/package.json index 31d1d765e..4d02eb5f4 100644 --- a/src/test/resources/multisimple/a/package.json +++ b/src/test/resources/multisimple/a/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisimple/b/package.json b/src/test/resources/multisimple/b/package.json index ccc7ab43b..54d2bee0a 100644 --- a/src/test/resources/multisimple/b/package.json +++ b/src/test/resources/multisimple/b/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisimple/package.json b/src/test/resources/multisimple/package.json index 31d1d765e..4d02eb5f4 100644 --- a/src/test/resources/multisimple/package.json +++ b/src/test/resources/multisimple/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisolutionconfig/a/package.json b/src/test/resources/multisolutionconfig/a/package.json index 31d1d765e..4d02eb5f4 100644 --- a/src/test/resources/multisolutionconfig/a/package.json +++ b/src/test/resources/multisolutionconfig/a/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisolutionconfig/b/package.json b/src/test/resources/multisolutionconfig/b/package.json index ccc7ab43b..54d2bee0a 100644 --- a/src/test/resources/multisolutionconfig/b/package.json +++ b/src/test/resources/multisolutionconfig/b/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/multisolutionconfig/package.json b/src/test/resources/multisolutionconfig/package.json index 31d1d765e..4d02eb5f4 100644 --- a/src/test/resources/multisolutionconfig/package.json +++ b/src/test/resources/multisolutionconfig/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/typescript/package.json b/src/test/resources/typescript/package.json index 7772e34bf..9e9b1579d 100644 --- a/src/test/resources/typescript/package.json +++ b/src/test/resources/typescript/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5", diff --git a/src/test/resources/typescriptsub/package.json b/src/test/resources/typescriptsub/package.json index 7772e34bf..9e9b1579d 100644 --- a/src/test/resources/typescriptsub/package.json +++ b/src/test/resources/typescriptsub/package.json @@ -6,6 +6,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7", "@babel/plugin-proposal-object-rest-spread": "^7.16.7", "@babel/plugin-proposal-private-methods": "^7.16.7", + "@babel/plugin-transform-property-mutators": "^7.16.5", "@babel/preset-env": "^7.16.7", "@babel/preset-flow": "^7.16.5", "@babel/preset-react": "^7.16.5",