Skip to content

A platform for community discussion. Free, open, simple.

DEV: Update embroider (within current major range) (#39186)

Jarek Radoszefdf240db95e
diff --git a/frontend/discourse/package.json b/frontend/discourse/package.json
index fcd55ce84ad..06e3b957887 100644
--- a/frontend/discourse/package.json
+++ b/frontend/discourse/package.json
@@ -88,10 +88,10 @@
"@ember/string": "^4.0.1",
"@ember/test-helpers": "^5.4.1",
"@ember/test-waiters": "^4.1.1",
- "@embroider/compat": "^3.8.5",
- "@embroider/core": "^3.5.5",
+ "@embroider/compat": "^3.9.3",
+ "@embroider/core": "^3.5.9",
"@embroider/macros": "^1.16.12",
- "@embroider/router": "^2.1.8",
+ "@embroider/router": "^2.1.12",
"@embroider/webpack": "^4.1.0",
"@floating-ui/dom": "^1.7.5",
"@glimmer/component": "^2.0.0",
diff --git a/package.json b/package.json
index 9804b780299..a8a68c64050 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,8 @@
]
},
"overrides": {
- "@ember/test-waiters": "4.1.1"
+ "@ember/test-waiters": "4.1.1",
+ "babel-plugin-ember-template-compilation@~2.3.0": "2.4.1"
}
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7c7f84c4a3c..57e57a984b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,7 @@ settings:
overrides:
'@ember/test-waiters': 4.1.1
+ babel-plugin-ember-template-compilation@~2.3.0: 2.4.1
patchedDependencies:
'@ember-compat/[email protected]':
@@ -423,20 +424,20 @@ importers:
specifier: 4.1.1
version: 4.1.1(@babel/[email protected])(@glint/[email protected])
'@embroider/compat':
- specifier: ^3.8.5
- version: 3.8.5(@embroider/[email protected](@glint/[email protected]))(@glint/[email protected])
+ specifier: ^3.9.3
+ version: 3.9.3(@embroider/[email protected](@glint/[email protected]))(@glint/[email protected])
'@embroider/core':
- specifier: ^3.5.5
- version: 3.5.5(@glint/[email protected])
+ specifier: ^3.5.9
+ version: 3.5.9(@glint/[email protected])
'@embroider/macros':
specifier: ^1.16.12
version: 1.20.2(@babel/[email protected])(@glint/[email protected])
'@embroider/router':
- specifier: ^2.1.8
- version: 2.1.8(@babel/[email protected])(@embroider/[email protected](@glint/[email protected]))(@glint/[email protected])
+ specifier: ^2.1.12
+ version: 2.1.12(@babel/[email protected])(@embroider/[email protected](@glint/[email protected]))(@glint/[email protected])
'@embroider/webpack':
specifier: ^4.1.0
'@floating-ui/dom':
specifier: ^1.7.5
version: 1.7.6
@@ -728,7 +729,7 @@ importers:
version: 3.0.0(@types/[email protected])
'@embroider/test-setup':
specifier: ^4.0.0
'@glimmer/component':
specifier: ^2.0.0
version: 2.0.0
@@ -1852,15 +1853,15 @@ packages:
peerDependencies:
'@embroider/core': ^3.4.0
- '@embroider/[email protected]':
- resolution: {integrity: sha512-4EDAn86pfg4OAg655Rs1pYt6fTEiLBrRwOTsy3h9yex1B7D6pDwnYWZnd6LhZ+FL89bEiNjuVBFow+wqDMeKtg==}
+ '@embroider/[email protected]':
+ resolution: {integrity: sha512-Q/LQogLx00RNAobvah8SPqbEvQkZ0aBiyvIpKPE+ljCZOIVubcaIiq7OGtwmoH0GkhS72MsTfRzgYw+aKYYK/w==}
engines: {node: 12.* || 14.* || >= 16}
hasBin: true
peerDependencies:
- '@embroider/core': ^3.5.5
+ '@embroider/core': ^3.5.9
- '@embroider/[email protected]':
- resolution: {integrity: sha512-qIOPN/Njfw+JwanP67qGPhdVwO9mQW2EEzLK/hl/evC/nkdn4KIH+yCZrtXdJCtfS0AV1ImjHQduqbEIcg9/Ww==}
+ '@embroider/[email protected]':
+ resolution: {integrity: sha512-e6ChqCI2I4/UMnnGRS6be2pY3ssJDXfjrF1dtLt2e6l4EM2IIlT1ndtPAYUGSYSO9JB5WxNpO8Wirj88mVh97Q==}
engines: {node: 12.* || 14.* || >= 16}
'@embroider/[email protected]':
@@ -1870,15 +1871,6 @@ packages:
'@embroider/core': ^3.4.0
webpack: ^5
- '@embroider/[email protected]':
- resolution: {integrity: sha512-cgaEbzCvUOZF7Xs9FNMGknSCTgE01A1cXkkEhSTuaPbf6F/2z9pZAdQpVrBbTvo1Sg8CwMsm+piahjy43KoGuA==}
- engines: {node: 12.* || 14.* || >= 16}
- peerDependencies:
- '@glint/template': ^1.0.0
- peerDependenciesMeta:
- '@glint/template':
- optional: true
-
'@embroider/[email protected]':
resolution: {integrity: sha512-WJWSkG9vIL0s93vKwtNFqqAOCOflNkWNpqsC7VAqXeeTKNpCc7wtdOhPkNGJpb52CEt7vlQ5R/zMyCfGAB7MEA==}
engines: {node: 12.* || 14.* || >= 16}
@@ -1892,8 +1884,8 @@ packages:
resolution: {integrity: sha512-WFsw8nQpHZiWGEDYpa/A79KEFfTisqteXbY+jg9eZiww1r1G+LZvsmdszDp86TkotUSCqrMbK/ewn0jR1CJmqg==}
engines: {node: 12.* || 14.* || >= 16}
- '@embroider/[email protected]':
- resolution: {integrity: sha512-Dvp8YdqAWT6T0yzBZfUe6SyaVNH7xoXBlrxF1LbqoF/Q2buNzDy9oAQ5tTnbX1x+5KOrM0ryOjfeF0GoqkfobA==}
+ '@embroider/[email protected]':
+ resolution: {integrity: sha512-lWN4Niap3kXj7hmhYFKpSb2kiFw0PXZNVeh31AZ+rgeReYjhTgmRUReFvdHx34AfSecAfafN7S/XTuBP822bZA==}
peerDependencies:
'@embroider/core': ^2.0.0||^3.0.0
peerDependenciesMeta:
@@ -10627,16 +10619,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@babel/core': 7.29.0([email protected])
- '@embroider/core': 3.5.5(@glint/[email protected])
+ '@embroider/core': 3.5.9(@glint/[email protected])
transitivePeerDependencies:
- supports-color
- webpack
dependencies:
'@babel/code-frame': 7.29.0
'@babel/core': 7.29.0([email protected])
@@ -10647,8 +10639,8 @@ snapshots:
'@babel/preset-env': 7.29.2(@babel/[email protected])([email protected])
'@babel/runtime': 7.28.4
'@babel/traverse': 7.29.0([email protected])
- '@embroider/core': 3.5.5(@glint/[email protected])
- '@embroider/macros': 1.16.12(@glint/[email protected])
+ '@embroider/core': 3.5.9(@glint/[email protected])
+ '@embroider/macros': 1.20.2(@babel/[email protected])(@glint/[email protected])
'@types/babel__code-frame': 7.0.6
'@types/yargs': 17.0.33
assert-never: 1.4.0
@@ -10689,13 +10681,13 @@ snapshots:
- supports-color
- utf-8-validate
- '@embroider/[email protected](@glint/[email protected])':
+ '@embroider/[email protected](@glint/[email protected])':
dependencies:
'@babel/core': 7.29.0([email protected])
'@babel/parser': 7.29.0
'@babel/traverse': 7.29.0([email protected])
- '@embroider/macros': 1.16.12(@glint/[email protected])
- '@embroider/shared-internals': 2.9.0([email protected])
+ '@embroider/macros': 1.20.2(@babel/[email protected])(@glint/[email protected])
+ '@embroider/shared-internals': 2.9.2
assert-never: 1.4.0
babel-plugin-ember-template-compilation: 2.4.1
broccoli-node-api: 1.7.0
@@ -10723,26 +10715,11 @@ snapshots:
- supports-color
- utf-8-validate
dependencies:
- '@embroider/core': 3.5.5(@glint/[email protected])
+ '@embroider/core': 3.5.9(@glint/[email protected])
webpack: 5.99.9(@swc/[email protected])([email protected])
- '@embroider/[email protected](@glint/[email protected])':
- dependencies:
- '@embroider/shared-internals': 2.9.0([email protected])
- assert-never: 1.4.0
- babel-import-util: 2.1.1
- ember-cli-babel: 7.26.11
- find-up: 5.0.0
- lodash: 4.18.1
- resolve: 1.22.12
- semver: 7.7.4
- optionalDependencies:
- '@glint/template': 1.7.7
- transitivePeerDependencies:
- - supports-color
-
dependencies:
'@embroider/shared-internals': 3.0.2
@@ -10764,12 +10741,12 @@ snapshots:
mem: 8.1.1
resolve.exports: 2.0.3
dependencies:
'@ember/test-waiters': 4.1.1(@babel/[email protected])(@glint/[email protected])
'@embroider/addon-shim': 1.10.2
optionalDependencies:
- '@embroider/core': 3.5.5(@glint/[email protected])
+ '@embroider/core': 3.5.9(@glint/[email protected])
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -10827,22 +10804,22 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
lodash: 4.18.1
resolve: 1.22.12
optionalDependencies:
- '@embroider/compat': 3.8.5(@embroider/[email protected](@glint/[email protected]))(@glint/[email protected])
- '@embroider/core': 3.5.5(@glint/[email protected])
- '@embroider/webpack': 4.1.0(@embroider/[email protected](@glint/[email protected]))([email protected](@swc/[email protected])([email protected]))
+ '@embroider/compat': 3.9.3(@embroider/[email protected](@glint/[email protected]))(@glint/[email protected])
+ '@embroider/core': 3.5.9(@glint/[email protected])
+ '@embroider/webpack': 4.1.0(@embroider/[email protected](@glint/[email protected]))([email protected](@swc/[email protected])([email protected]))
dependencies:
'@babel/core': 7.29.0([email protected])
'@babel/preset-env': 7.29.2(@babel/[email protected])([email protected])
- '@embroider/core': 3.5.5(@glint/[email protected])
- '@embroider/hbs-loader': 3.0.3(@embroider/[email protected](@glint/[email protected]))([email protected](@swc/[email protected])([email protected]))
+ '@embroider/core': 3.5.9(@glint/[email protected])
+ '@embroider/hbs-loader': 3.0.3(@embroider/[email protected](@glint/[email protected]))([email protected](@swc/[email protected])([email protected]))
'@embroider/shared-internals': 2.9.0([email protected])
'@types/supports-color': 8.1.3
assert-never: 1.4.0