Skip to content
Open
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017
ecmaVersion: 2019
},
env: {
node: true,
Expand Down
27 changes: 26 additions & 1 deletion lib/utils/get-module-path-for.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,37 @@ for (let packagePath of packagePaths) {
let packageDir = path.dirname(path.resolve(cwd, packagePath));

if (pkg.keywords && pkg.keywords.includes('ember-addon')) {
ADDON_PATHS[packageDir] = pkg.name;
// build addon instance
ADDON_PATHS[packageDir] = getAddonPackageName(packagePath);
Copy link

@tehhowch tehhowch Jan 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be packageDir and not packagePath?

(If it is packagePath, this function dies attempting to require('package.json') on my team's addon, but if it is packageDir, then the native-class codemod is able to transform classes. Our setup is a multi-app monorepo that also contains a shared ember addon with reused components and services.)

} else if (isEmberCliProject(pkg)) {
APP_PATHS[packageDir] = pkg.name;
}
}

/**
* takes a package path and returns the runtime name of the addon.
*
* @param {String} packagePath the path on disk (from current working directory)
* @returns {String} The runtime name of the addon
*/
function getAddonPackageName(packagePath) {
const pkg = require(packagePath);
const entryPoint =
pkg['ember-addon'] && pkg['ember-addon'].main ? pkg['ember-addon'].main : 'index.js';

let moduleName = pkg.name;
try {
let entryModule = require(path.join(packagePath, entryPoint));
if (typeof entryModule.moduleName === 'function') {
moduleName = entryModule.moduleName();
}
} catch {
// do nothing, this falls back to using package name
}

return moduleName;
}

function isEmberCliProject(pkg) {
return (
pkg &&
Expand Down