Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing some magic to make naming conventions more sane #218

Closed
wants to merge 1 commit into from
Closed

Removing some magic to make naming conventions more sane #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 app/components/pretty-color.js → app/components/pretty_color.js
View file
Open in desktop
File renamed without changes.
0 app/templates/component-test.hbs → app/templates/component_test.hbs
View file
Open in desktop
File renamed without changes.
0 app/templates/components/pretty-color.hbs → app/templates/components/pretty_color.hbs
View file
Open in desktop
File renamed without changes.
44 changes: 15 additions & 29 deletions vendor/resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,6 @@ define("resolver",
};
}

function chooseModuleName(seen, moduleName) {
var underscoredModuleName = Ember.String.underscore(moduleName);

if (moduleName !== underscoredModuleName && seen[moduleName] && seen[underscoredModuleName]) {
throw new TypeError("Ambigous module names: `" + moduleName + "` and `" + underscoredModuleName + "`");
}

if (seen[moduleName]) {
return moduleName;
} else if (seen[underscoredModuleName]) {
return underscoredModuleName;
} else {
return moduleName;
}
}

function resolveOther(parsedName) {
var prefix = this.namespace.modulePrefix;
Ember.assert('module prefix must be defined', prefix);
Expand All @@ -74,31 +58,33 @@ define("resolver",

// allow treat all dashed and all underscored as the same thing
// supports components with dashes and other stuff with underscores.
var normalizedModuleName = chooseModuleName(requirejs._eak_seen, moduleName);
var normalizedModuleName = Ember.String.underscore(moduleName);
Copy link
Contributor

Choose a reason for hiding this comment

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

This line also seems to indicate that you are moving to underscored names instead of dasherized names

Copy link
Owner

Choose a reason for hiding this comment

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

on disk underscored, in ember dasherized.


if (parsedName.fullName === 'router:main') {
// for now, lets keep the router at app/router.js
return require(prefix + '/router');
}

if (requirejs._eak_seen[normalizedModuleName]) {
try {
Copy link
Owner

Choose a reason for hiding this comment

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

would be nice if require supported has

var module = require(normalizedModuleName, null, null, true /* force sync */);

if (module === undefined) {
throw new Error(" Expected to find: '" + parsedName.fullName + "' within '" + normalizedModuleName + "' but got 'undefined'. Did you forget to `export default` within '" + normalizedModuleName + "'?");
}

if (Ember.ENV.LOG_MODULE_RESOLVER) {
Ember.Logger.info('hit', moduleName);
}

return module;
} else {
} catch (error) {
if (Ember.ENV.LOG_MODULE_RESOLVER) {
Ember.Logger.info('miss', moduleName);
}
return this._super(parsedName);
}

if (module === undefined) {
throw new Error(" Expected to find: '" + parsedName.fullName + "' within '" + normalizedModuleName + "' but got 'undefined'. Did you forget to `export default` within '" + normalizedModuleName + "'?");
}

if (Ember.ENV.LOG_MODULE_RESOLVER) {
Ember.Logger.info('hit', moduleName);
}

return module;


}
// Ember.DefaultResolver docs:
// https://github.com/emberjs/ember.js/blob/master/packages/ember-application/lib/system/resolver.js
Expand Down