Remove EMBER_RESOLVER_MODULE_UNIFICATION feature flag

README.md

@@ -15,59 +15,6 @@ This project provides the Ember resolver used by the following projects:
 ember install ember-resolver
 ```
 
-## Feature flags
-
-This resolver package supports feature flags for experimental changes. Feature
-flag settings change how `ember-resolver` compiles into an ember-cli's
-`vendor.js`, so you should think of them as an application build-time option.
-
-Feature flags are set in an application's `config/environment.js`:
-
-```js
-module.exports = function(environment) {
-  var ENV = {
-    'ember-resolver': {
-      features: {
-        EMBER_RESOLVER_MODULE_UNIFICATION: true
-      }
-    },
-    /* ... */
-```
-
-Note that you must restart your ember-cli server for changes to the `flags` to
-register.
-
-In the `ember-resolver` codebase, you can import these flags:
-
-```js
-import { EMBER_RESOLVER_MODULE_UNIFICATION } from 'ember-resolver/features';
-```
-
-### Current feature flags
-
-#### `EMBER_RESOLVER_MODULE_UNIFICATION`
-
-Ember [RFC #154](https://github.com/emberjs/rfcs/blob/master/text/0143-module-unification.md)
-describes an improved resolution strategy and filename-on-disk
-layout for Ember applications. To experiment with this feature
-it must be enabled as described above, then use the `src/`
-directory on disk. You can generate a new app that uses
-this layout by using the following commands:
-
-```
-# Create a new app with the module unification blueprint
-ember new my-app -b ember-module-unification-blueprint
-```
-
-This will create an app running a module unification layout from
-the
-[ember-module-unification-blueprint](https://github.com/emberjs/ember-module-unification-blueprint)
-package. By default, this app will be correctly configured.
-
-  * It uses the `glimmer-wrapper` resolver.
-  * It builds an glimmer resolver config and passes it to the resolver.
-  * It starts with a `src/` based layout on disk.
-
 ## Configuration
 
 To customize pluralization provide a `pluralizedTypes` object to your extended version of the Resolver in consuming app:

config/ember-try.js

@@ -14,7 +14,7 @@ module.exports = function() {
       scenarios: [
         {
           name: 'module-unification',
-          command: 'EMBER_RESOLVER_MODULE_UNIFICATION=true ember test'
+          command: 'ember test'
         },
         {
           name: 'ember-default',

ember-cli-build.js

@@ -12,7 +12,7 @@ module.exports = function(defaults) {
   let config = defaults.project.config();
   let resolverConfig = config['ember-resolver'] || {};
 
-  if (resolverConfig.features.EMBER_RESOLVER_MODULE_UNIFICATION) {
+  if (defaults.project.isModuleUnification && defaults.project.isModuleUnification()) {
     testTrees.push('mu-trees/tests');
   }
 

index.js

@@ -10,10 +10,7 @@ module.exports = {
     var config = this.project.config();
     var resolverConfig = config['ember-resolver'] || {};
 
-    return Object.assign({
-      /* Add default feature flags here */
-      EMBER_RESOLVER_MODULE_UNIFICATION: false
-    }, resolverConfig.features);
+    return resolverConfig.features || {};
   },
 
   init: function() {
@@ -47,7 +44,7 @@ module.exports = {
     var MergeTrees = require('broccoli-merge-trees');
     let addonTrees = [].concat(
       this._super.treeForAddon.apply(this, arguments),
-      this._emberResolverFeatureFlags.EMBER_RESOLVER_MODULE_UNIFICATION && this._moduleUnificationTrees()
+      this.project.isModuleUnification && this.project.isModuleUnification() && this._moduleUnificationTrees()
     ).filter(Boolean);
 
     return new MergeTrees(addonTrees);

tests/dummy/config/environment.js

@@ -20,11 +20,6 @@ module.exports = function(environment) {
     APP: {
       // Here you can pass flags/options to your application instance
       // when it is created
-    },
-    'ember-resolver': {
-      features: {
-        EMBER_RESOLVER_MODULE_UNIFICATION: !!process.env.EMBER_RESOLVER_MODULE_UNIFICATION
-      }
     }
   };