From 672902e43c2112e8ea760dd9523aa7cd5b2ab743 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 21 Aug 2026 00:11:16 +0100 Subject: [PATCH 1/2] update @babel/runtime to not be a pinned specific version --- index.js | 14 +++++++++++++- package.json | 3 ++- pnpm-lock.yaml | 44 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/index.js b/index.js index 9bbac981..af97d1c4 100644 --- a/index.js +++ b/index.js @@ -14,6 +14,7 @@ const getBabelOptions = require('./lib/get-babel-options'); const findApp = require('./lib/find-app'); const emberPlugins = require('./lib/ember-plugins'); const cacheKeyForTree = require('calculate-cache-key-for-tree'); +const replace = require('broccoli-string-replace'); const APP_BABEL_RUNTIME_VERSION = new WeakMap(); const PROJECTS_WITH_VALID_EMBER_CLI = new WeakSet(); @@ -268,7 +269,18 @@ module.exports = { } }); - return new Funnel(transpiledHelpers, { + return new Funnel(replace( + transpiledHelpers, + { + files: [ + '@babel/runtime/helpers/esm/*.js', + ], + pattern: { + match: /"@babel\/runtime\/helpers\/esm\/([^."]+)\.js"/g, + replacement: '"@babel/runtime/helpers/esm/$1"' + } + } + ), { destDir: this.moduleName(), }); }, diff --git a/package.json b/package.json index d0c7a2b5..3e361ccc 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@babel/plugin-transform-runtime": "^7.13.9", "@babel/plugin-transform-typescript": "^7.20.13", "@babel/preset-env": "^7.20.2", - "@babel/runtime": "7.12.18", + "@babel/runtime": "^7.12.18", "amd-name-resolver": "^1.3.1", "babel-plugin-debug-macros": "^0.3.4", "babel-plugin-ember-data-packages-polyfill": "^0.1.2", @@ -60,6 +60,7 @@ "broccoli-debug": "^0.6.4", "broccoli-funnel": "^3.0.8", "broccoli-source": "^3.0.1", + "broccoli-string-replace": "^0.1.2", "calculate-cache-key-for-tree": "^2.0.0", "clone": "^2.1.2", "ember-cli-babel-plugin-helpers": "^1.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 25dea015..b2489007 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ dependencies: specifier: ^7.20.2 version: 7.29.0(@babel/core@7.29.0) '@babel/runtime': - specifier: 7.12.18 - version: 7.12.18 + specifier: ^7.12.18 + version: 7.28.6 amd-name-resolver: specifier: ^1.3.1 version: 1.3.1 @@ -65,6 +65,9 @@ dependencies: broccoli-source: specifier: ^3.0.1 version: 3.0.1 + broccoli-string-replace: + specifier: ^0.1.2 + version: 0.1.2 calculate-cache-key-for-tree: specifier: ^2.0.0 version: 2.0.0 @@ -1308,11 +1311,11 @@ packages: resolution: {integrity: sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==} dependencies: regenerator-runtime: 0.13.11 + dev: true /@babel/runtime@7.28.6: resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==} engines: {node: '>=6.9.0'} - dev: true /@babel/template@7.28.6: resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==} @@ -2294,7 +2297,7 @@ packages: resolution: {integrity: sha512-zmPitbQ8+6zNutpwgcQuLcsEpn/Cj54Kbn7L5pX0Os5kdWplB7xPgEh/g+SWOB/qmows2gpuCaPyduq8ZZRnxA==} deprecated: This is a stub types definition. minimatch provides its own type definitions, so you do not need this installed. dependencies: - minimatch: 7.4.6 + minimatch: 10.1.1 dev: true /@types/node@25.2.0: @@ -2797,7 +2800,6 @@ packages: username-sync: 1.0.3 transitivePeerDependencies: - supports-color - dev: true /async-disk-cache@2.1.0: resolution: {integrity: sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==} @@ -3414,6 +3416,26 @@ packages: transitivePeerDependencies: - supports-color + /broccoli-persistent-filter@1.4.6: + resolution: {integrity: sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==} + dependencies: + async-disk-cache: 1.3.5 + async-promise-queue: 1.0.5 + broccoli-plugin: 1.3.1 + fs-tree-diff: 0.5.9 + hash-for-dep: 1.5.1 + heimdalljs: 0.2.6 + heimdalljs-logger: 0.1.10 + mkdirp: 0.5.6 + promise-map-series: 0.2.3 + rimraf: 2.7.1 + rsvp: 3.6.2 + symlink-or-copy: 1.3.1 + walk-sync: 0.3.4 + transitivePeerDependencies: + - supports-color + dev: false + /broccoli-persistent-filter@2.3.1: resolution: {integrity: sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==} engines: {node: 6.* || >= 8.*} @@ -3529,6 +3551,15 @@ packages: - supports-color dev: true + /broccoli-string-replace@0.1.2: + resolution: {integrity: sha512-QHESTrrrPlKuXQNWsvXawSQbV2g34wCZ5oKgd6bntdOuN8VHxbg1BCBHqVY5HxXJhWelimgGxj3vI7ECkyij8g==} + dependencies: + broccoli-persistent-filter: 1.4.6 + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + dev: false + /broccoli-test-helper@2.0.0: resolution: {integrity: sha512-TKwh8dBT+RcxKEG+vAoaRRhZsCMwZIHPZbCzBNCA0nUi1aoFB/LVosqwMC6H9Ipe06FxY5hpQxDLFbnBMdUPsA==} engines: {node: 6.* || 8.* || >= 10.*} @@ -4636,7 +4667,6 @@ packages: /editions@1.3.4: resolution: {integrity: sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==} engines: {node: '>=0.8'} - dev: true /editions@2.3.1: resolution: {integrity: sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==} @@ -7577,7 +7607,6 @@ packages: binaryextensions: 2.3.0 editions: 1.3.4 textextensions: 2.6.0 - dev: true /istextorbinary@2.6.0: resolution: {integrity: sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==} @@ -9432,6 +9461,7 @@ packages: /regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} + dev: true /regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} From c38f84a33e2486efe045bfd3b1641240f5cb2f50 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 21 Aug 2026 00:14:24 +0100 Subject: [PATCH 2/2] update minimum runtime version to match other babel deps --- package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3e361ccc..99e45c10 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@babel/plugin-transform-runtime": "^7.13.9", "@babel/plugin-transform-typescript": "^7.20.13", "@babel/preset-env": "^7.20.2", - "@babel/runtime": "^7.12.18", + "@babel/runtime": "^7.20.0", "amd-name-resolver": "^1.3.1", "babel-plugin-debug-macros": "^0.3.4", "babel-plugin-ember-data-packages-polyfill": "^0.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2489007..e042e962 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,7 +36,7 @@ dependencies: specifier: ^7.20.2 version: 7.29.0(@babel/core@7.29.0) '@babel/runtime': - specifier: ^7.12.18 + specifier: ^7.20.0 version: 7.28.6 amd-name-resolver: specifier: ^1.3.1