update babel core to revert old behavior of babel merge

torusresearch · Oct 11, 2024 · 2f910be · 2f910be
1 parent e8294c3
commit 2f910be
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/torus-scripts/helpers/babelMerge.js b/packages/torus-scripts/helpers/babelMerge.js
@@ -8,15 +8,15 @@ function arrayMerge(source = [], overrides = []) {
 
 function mergeArray(source = [], overrides = [], resolve, deepmergeOpts) {
   return [...source, ...overrides].reduce((reduction, override) => {
-    const overrideName = resolve(Array.isArray(override) ? override[0] : override).filepath;
+    const overrideName = resolve(Array.isArray(override) ? override[0] : override);
     const overrideOptions = Array.isArray(override) ? override[1] : {};
     const base = reduction.find((base) => {
-      const baseName = resolve(Array.isArray(base) ? base[0] : base).filepath;
+      const baseName = resolve(Array.isArray(base) ? base[0] : base);
       return baseName === overrideName || baseName.includes(overrideName);
     });
 
     const index = reduction.includes(base) ? reduction.indexOf(base) : reduction.length;
-    const baseName = base ? resolve(Array.isArray(base) ? base[0] : base).filepath : overrideName;
+    const baseName = base ? resolve(Array.isArray(base) ? base[0] : base) : overrideName;
     const baseOptions = Array.isArray(base) ? base[1] : {};
     const options = merge(baseOptions, overrideOptions, {
       arrayMerge,

diff --git a/packages/torus-scripts/package.json b/packages/torus-scripts/package.json
@@ -7,7 +7,7 @@
     "torus-scripts": "./bin/torus-scripts.js"
   },
   "dependencies": {
-    "@babel/core": "^7.25.7",
+    "@babel/core": "^7.25.8",
     "@babel/plugin-syntax-bigint": "^7.8.3",
     "@babel/plugin-transform-class-properties": "^7.25.7",
     "@babel/plugin-transform-numeric-separator": "^7.25.7",