Skip to content

Commit 99cb2ad

Browse files
NullVoxPopuliclaude
andcommitted
Remove pnpm patches for ember-cli-htmlbars, ember-auto-import, @embroider/compat
These patches were temporary shims for v7 compatibility. The upstream PRs have landed: - ember-cli-htmlbars: ember-cli/ember-cli-htmlbars#793 - ember-auto-import: embroider-build/ember-auto-import#708 - @embroider/compat: embroider-build/embroider#2695 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent ffca3d9 commit 99cb2ad

9 files changed

Lines changed: 35 additions & 104 deletions

File tree

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@babel/types": "^7.22.5",
8989
"@embroider/macros": "^1.20.2",
9090
"@embroider/shared-internals": "^3.0.2",
91-
"@embroider/vite": "^1.7.1",
91+
"@embroider/vite": "^1.7.2",
9292
"@eslint/js": "^9.21.0",
9393
"@glimmer/component": "workspace:*",
9494
"@rollup/plugin-babel": "^6.0.4",
@@ -157,10 +157,7 @@
157157
"esbuild"
158158
],
159159
"patchedDependencies": {
160-
"@tracerbench/core@8.0.1": "patches/@tracerbench__core@8.0.1.patch",
161-
"@embroider/compat@4.1.16": "patches/@embroider__compat@4.1.16.patch",
162-
"ember-cli-htmlbars@7.0.0": "patches/ember-cli-htmlbars@7.0.0.patch",
163-
"ember-auto-import@2.13.0": "patches/ember-auto-import@2.13.0.patch"
160+
"@tracerbench/core@8.0.1": "patches/@tracerbench__core@8.0.1.patch"
164161
}
165162
},
166163
"peerDependencies": {

patches/@embroider__compat@4.1.16.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

patches/ember-auto-import@2.13.0.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

patches/ember-cli-htmlbars@7.0.0.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

pnpm-lock.yaml

Lines changed: 27 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

smoke-tests/app-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
"@glimmer/tracking": "^1.1.2",
3939
"broccoli-asset-rev": "^3.0.0",
4040
"concurrently": "^9.2.1",
41-
"ember-auto-import": "^2.13.0",
41+
"ember-auto-import": "^2.13.1",
4242
"ember-cli": "~6.11.1",
4343
"ember-cli-app-version": "^7.0.0",
4444
"ember-cli-babel": "^8.3.1",
4545
"ember-cli-clean-css": "^3.0.0",
4646
"ember-cli-dependency-checker": "^3.3.3",
4747
"ember-cli-deprecation-workflow": "^3.4.0",
48-
"ember-cli-htmlbars": "^7.0.0",
48+
"ember-cli-htmlbars": "^7.0.1",
4949
"ember-cli-inject-live-reload": "^2.1.0",
5050
"ember-cli-sri": "^2.1.1",
5151
"ember-cli-terser": "^4.0.2",

smoke-tests/benchmark-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@embroider/core": "^4.4.7",
2626
"@embroider/macros": "^1.20.2",
2727
"@embroider/router": "^3.0.6",
28-
"@embroider/vite": "^1.7.1",
28+
"@embroider/vite": "^1.7.2",
2929
"@glimmer/component": "workspace:*",
3030
"@rollup/plugin-babel": "^6.1.0",
3131
"babel-plugin-ember-template-compilation": "^4.0.0",

smoke-tests/scenarios/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ember-source-scenarios",
33
"private": true,
44
"devDependencies": {
5-
"@embroider/compat": "^4.1.16",
5+
"@embroider/compat": "^4.1.17",
66
"@embroider/core": "^4.4.7",
77
"@embroider/webpack": "^4.1.2",
88
"@swc-node/register": "^1.6.8",

smoke-tests/v2-app-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
"@ember/string": "^4.0.1",
3939
"@ember/test-helpers": "^5.4.1",
4040
"@ember/test-waiters": "^4.1.1",
41-
"@embroider/compat": "^4.1.16",
41+
"@embroider/compat": "^4.1.17",
4242
"@embroider/config-meta-loader": "^1.0.0",
4343
"@embroider/core": "^4.4.7",
4444
"@embroider/legacy-inspector-support": "^0.1.3",
4545
"@embroider/macros": "^1.20.2",
4646
"@embroider/router": "^3.0.6",
47-
"@embroider/vite": "^1.7.1",
47+
"@embroider/vite": "^1.7.2",
4848
"@eslint/js": "^9.39.2",
4949
"@glimmer/component": "workspace:^",
5050
"@rollup/plugin-babel": "^6.1.0",

0 commit comments

Comments
 (0)