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
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
},
"pnpm": {
"patchedDependencies": {
"fastboot": "patches/fastboot.patch",
"ember-source@6.11.0": "patches/ember-source@6.11.0.patch"
"fastboot": "patches/fastboot.patch"
}
}
}
18 changes: 16 additions & 2 deletions packages/ember-auto-import/ts/package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,22 @@ export default class Package {
'<3.27.0',
{ includePrerelease: true }
);
let templateCompilerPath: string = (emberSource as any).absolutePaths
.templateCompiler;
let templateCompilerPath: string;
if ((emberSource as any).absolutePaths) {
templateCompilerPath = (emberSource as any).absolutePaths
.templateCompiler;
} else {
// v7+ ember-source no longer provides absolutePaths; resolve from
// the host app's directory through the package exports map
// eslint-disable-next-line @typescript-eslint/no-var-requires
let { createRequire } = require('module') as {
createRequire: (filename: string) => NodeRequire;
};
let appRequire = createRequire(join(this.root, 'package.json'));
templateCompilerPath = appRequire.resolve(
'ember-source/ember-template-compiler/index.js'
);
}

const babelPluginPrecompile = ensureModuleApiPolyfill
? [
Expand Down
201 changes: 0 additions & 201 deletions patches/ember-source@6.11.0.patch

This file was deleted.

20 changes: 15 additions & 5 deletions pnpm-lock.yaml

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

Loading