Merge pull request #147 from zonkyio/breaking/remove-enabled-option

Remove `enabled` configuration option
zonkyio · May 12, 2019 · 089e98e · 089e98e
2 parents 995ef61 + d377cf0
commit 089e98e
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 129 deletions.
diff --git a/index.js b/index.js
@@ -24,25 +24,15 @@ module.exports = {
 
     this.addonBuildConfig = this.app.options['ember-web-app'] || {};
 
-    if (!this._disabled()) {
-      this._configureFingerprint();
-      this.manifestConfiguration = getManifestConfiguration(
-        this.app.project,
-        this.app.env
-      );
-    }
+    this._configureFingerprint();
+    this.manifestConfiguration = getManifestConfiguration(
+      this.app.project,
+      this.app.env
+    );
 
     this._super.included.apply(this, arguments);
   },
 
-  treeFor() {
-    if (this._disabled()) {
-      return;
-    }
-
-    return this._super.treeFor.apply(this, arguments);
-  },
-
   treeForPublic() {
     const configPath = path.join(this.app.project.root, 'config');
 
@@ -66,10 +56,6 @@ module.exports = {
   },
 
   contentFor(section, config) {
-    if (this._disabled()) {
-      return;
-    }
-
     if (section === 'head') {
       let tags = [];
 
@@ -121,8 +107,4 @@ module.exports = {
       BROWSERCONFIG_NAME
     );
   },
-
-  _disabled() {
-    return this.addonBuildConfig.enabled === false;
-  },
 };
diff --git a/node-tests/acceptance/browserconfig-test.js b/node-tests/acceptance/browserconfig-test.js
@@ -54,29 +54,6 @@ describe('Acceptance: browserconfig file generation', function() {
       .then(assertJSON(app, { 'pio.png': 'pio-0987654321.png' }));
   });
 
-  it(`doesn't generate browserconfig when disabled`, function() {
-    return app
-      .create('disabled', {
-        fixturesPath: 'node-tests/acceptance/fixtures',
-      })
-      .then(function() {
-        return app.runEmberCommand('build');
-      })
-      .then(function() {
-        assert.ok(
-          !fs.existsSync(app.filePath('dist/browserconfig.xml')),
-          `Doesn't generate browserconfig.xml file`
-        );
-      })
-      .then(contentOf(app, 'dist/index.html'))
-      .then(function(content) {
-        assert.ok(
-          !content.includes('msapplication-config'),
-          `Doesn't include meta tags`
-        );
-      });
-  });
-
   it(`doesn't generate browserconfig when 'ms' is falsey`, function() {
     return app
       .create('no-ms', {

diff --git a/node-tests/acceptance/fixtures/disabled/config/manifest.js b/node-tests/acceptance/fixtures/disabled/config/manifest.js
diff --git a/node-tests/acceptance/fixtures/disabled/ember-cli-build.js b/node-tests/acceptance/fixtures/disabled/ember-cli-build.js
diff --git a/node-tests/acceptance/fixtures/disabled/public/pio.png b/node-tests/acceptance/fixtures/disabled/public/pio.png
diff --git a/node-tests/acceptance/manifest-test.js b/node-tests/acceptance/manifest-test.js
@@ -57,29 +57,6 @@ describe('Acceptance: manifest file generation', function() {
       .then(assertJSON(app, { 'pio.png': 'pio-0987654321.png' }));
   });
 
-  it(`doesn't generate manifest when disabled`, function() {
-    return app
-      .create('disabled', {
-        fixturesPath: 'node-tests/acceptance/fixtures',
-      })
-      .then(function() {
-        return app.runEmberCommand('build');
-      })
-      .then(function() {
-        assert.ok(
-          !fs.existsSync(app.filePath('dist/manifest.webmanifest')),
-          `Doesn't generate manifest.webmanifest file`
-        );
-      })
-      .then(contentOf(app, 'dist/index.html'))
-      .then(function(content) {
-        assert.ok(
-          !content.includes('apple-touch-icon'),
-          `Doesn't include meta tags`
-        );
-      });
-  });
-
   it('uses rootURL configuration', function() {
     return app
       .create('config-root-url', {

diff --git a/node-tests/unit/index-test.js b/node-tests/unit/index-test.js
@@ -9,9 +9,6 @@ function createIndex() {
       display: 'standalone',
     },
     addonBuildConfig: {},
-    _disabled() {
-      return false;
-    },
   });
 }
 
@@ -66,18 +63,6 @@ describe('Unit: index', function() {
       assert.ok(index.contentFor('head', { rootURL: '/' }).includes(expected));
     });
 
-    it('returns empty meta tags when disabled', function() {
-      let index = createIndex();
-      index._disabled = function() {
-        return true;
-      };
-
-      assert.ok(
-        !index.contentFor('head', { rootURL: '/' }),
-        "Doesn't include meta tags when disabled"
-      );
-    });
-
     it('returns safari pinned tab link tags', function() {
       let expected = '<link rel="mask-icon" href="/foo/bar.svg" color="red">';
       let index = createIndex();

diff --git a/tests/dummy/app/templates/docs/index.md b/tests/dummy/app/templates/docs/index.md
@@ -24,7 +24,6 @@ See the documentation section below for more information.
 - [Example](#example)
 - [Configuration](#configuration)
   - [CORS](#cors)
-  - [Disable](#disable)
   - [Fingerprint](#fingerprint)
 - [API Documentation](#api-documentation)
   - [`name`](#name)
@@ -205,26 +204,6 @@ module.exports = function(defaults) {
 };
 ```
 
-### Disable
-
-You can disable the addon by adding a configuration option to `ember-cli-build.js` build file.
-
-```js
-const EmberApp = require('ember-cli/lib/broccoli/ember-app');
-
-module.exports = function(defaults) {
-  let options = {
-    'ember-web-app': {
-      enabled: false,
-    },
-  };
-
-  let app = new EmberApp(defaults, options);
-
-  return app.toTree();
-};
-```
-
 ### Fingerprint
 
 You can add fingerprint checksum to your `manifest.webmanifest` file by configuring [broccoli-asset-rev](https://github.com/rickharrison/broccoli-asset-rev) in `ember-cli-build.js`.