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

use flag EMBER_CLI_MODULE_UNIFICATION #238

Merged
merged 1 commit into from
Jun 13, 2018
Merged

use flag EMBER_CLI_MODULE_UNIFICATION #238

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = function() {
scenarios: [
{
name: 'module-unification',
command: 'EMBER_RESOLVER_MODULE_UNIFICATION=true ember test'
command: 'EMBER_CLI_MODULE_UNIFICATION=true ember test'
},
{
name: 'ember-default',
Expand Down
5 changes: 2 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ module.exports = {
name: 'ember-resolver',

emberResolverFeatureFlags() {
var config = this.project.config();
var resolverConfig = config['ember-resolver'] || {};
var resolverConfig = {}; //TODO: load from ember-cli-build.js

return Object.assign({
/* Add default feature flags here, for now there is none */
Expand All @@ -19,7 +18,7 @@ module.exports = {
init: function() {
this._super.init.apply(this, arguments);
this.options = this.options || {};
if (process.env.EMBER_RESOLVER_MODULE_UNIFICATION) {
if (process.env.EMBER_CLI_MODULE_UNIFICATION) {
this.project.isModuleUnification = function () {
return true;
}
Expand Down