Skip to content

Commit a0a3759

Browse files
NullVoxPopuliclaude
andcommitted
Use require.resolve instead of hardcoded dist path in patches
Replace hardcoded `dist/dev/packages/ember-template-compiler/index.js` with `require.resolve('ember-source/ember-template-compiler/index.js')` which resolves through the package exports map, making the patches resilient to dist layout changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 1e38422 commit a0a3759

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/js/package.js b/js/package.js
2-
index 91c757199e649b581e3064130f35f45d2af771a4..67f1aaebf0f58e51ebb04b992ae89d44f021374d 100644
2+
index 91c757199e649b581e3064130f35f45d2af771a4..26d3e8bde91cd085e7a035a8520c8485e660be24 100644
33
--- a/js/package.js
44
+++ b/js/package.js
55
@@ -413,7 +413,8 @@ class Package {
@@ -8,7 +8,7 @@ index 91c757199e649b581e3064130f35f45d2af771a4..67f1aaebf0f58e51ebb04b992ae89d44
88
let templateCompilerPath = emberSource.absolutePaths
99
- .templateCompiler;
1010
+ ? emberSource.absolutePaths.templateCompiler
11-
+ : require('path').join(emberSource.root, 'dist', 'dev', 'packages', 'ember-template-compiler', 'index.js');
11+
+ : require.resolve('ember-source/ember-template-compiler/index.js');
1212
const babelPluginPrecompile = ensureModuleApiPolyfill
1313
? [
1414
require.resolve('babel-plugin-htmlbars-inline-precompile'),
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/lib/ember-addon-main.js b/lib/ember-addon-main.js
2-
index 71c809a11baa57fcc78f10e08176e5d34eaeb62b..158fd9c7707cfe0809eb1cd2bf5ae2cece2b2fde 100644
2+
index 71c809a11baa57fcc78f10e08176e5d34eaeb62b..6f162e6c4435df6041e943b6382b42272173f206 100644
33
--- a/lib/ember-addon-main.js
44
+++ b/lib/ember-addon-main.js
55
@@ -105,7 +105,13 @@ module.exports = {
@@ -11,9 +11,9 @@ index 71c809a11baa57fcc78f10e08176e5d34eaeb62b..158fd9c7707cfe0809eb1cd2bf5ae2ce
1111
+ return ember.absolutePaths.templateCompiler;
1212
+ }
1313
+
14-
+ // v7+ ember-source no longer provides absolutePaths; the ESM template
15-
+ // compiler lives under dist/dev/packages/
16-
+ return path.join(ember.root, 'dist', 'dev', 'packages', 'ember-template-compiler', 'index.js');
14+
+ // v7+ ember-source no longer provides absolutePaths; resolve through
15+
+ // the package exports map
16+
+ return require.resolve('ember-source/ember-template-compiler/index.js');
1717
},
1818

1919
astPlugins() {

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)