Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/ember-auto-import@2.13.0.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/js/package.js b/js/package.js
index 91c757199e649b581e3064130f35f45d2af771a4..67f1aaebf0f58e51ebb04b992ae89d44f021374d 100644
index 91c757199e649b581e3064130f35f45d2af771a4..26d3e8bde91cd085e7a035a8520c8485e660be24 100644
--- a/js/package.js
+++ b/js/package.js
@@ -413,7 +413,8 @@ class Package {
Expand All @@ -8,7 +8,7 @@ index 91c757199e649b581e3064130f35f45d2af771a4..67f1aaebf0f58e51ebb04b992ae89d44
let templateCompilerPath = emberSource.absolutePaths
- .templateCompiler;
+ ? emberSource.absolutePaths.templateCompiler
+ : require('path').join(emberSource.root, 'dist', 'dev', 'packages', 'ember-template-compiler', 'index.js');
+ : require.resolve('ember-source/ember-template-compiler/index.js');
const babelPluginPrecompile = ensureModuleApiPolyfill
? [
require.resolve('babel-plugin-htmlbars-inline-precompile'),
8 changes: 4 additions & 4 deletions patches/ember-cli-htmlbars@7.0.0.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/lib/ember-addon-main.js b/lib/ember-addon-main.js
index 71c809a11baa57fcc78f10e08176e5d34eaeb62b..158fd9c7707cfe0809eb1cd2bf5ae2cece2b2fde 100644
index 71c809a11baa57fcc78f10e08176e5d34eaeb62b..6f162e6c4435df6041e943b6382b42272173f206 100644
--- a/lib/ember-addon-main.js
+++ b/lib/ember-addon-main.js
@@ -105,7 +105,13 @@ module.exports = {
Expand All @@ -11,9 +11,9 @@ index 71c809a11baa57fcc78f10e08176e5d34eaeb62b..158fd9c7707cfe0809eb1cd2bf5ae2ce
+ return ember.absolutePaths.templateCompiler;
+ }
+
+ // v7+ ember-source no longer provides absolutePaths; the ESM template
+ // compiler lives under dist/dev/packages/
+ return path.join(ember.root, 'dist', 'dev', 'packages', 'ember-template-compiler', 'index.js');
+ // v7+ ember-source no longer provides absolutePaths; resolve through
+ // the package exports map
+ return require.resolve('ember-source/ember-template-compiler/index.js');
},

astPlugins() {
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading