Remove support for non-Octane blueprints

blueprints/component-addon/index.js

@@ -4,9 +4,8 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const useEditionDetector = require('../edition-detector');
 
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a component.',
 
   fileMapTokens: function () {
@@ -73,4 +72,4 @@ module.exports = useEditionDetector({
       path: getPathOption(options),
     };
   },
-});
+};

blueprints/component-class-addon/index.js

@@ -4,9 +4,8 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const useEditionDetector = require('../edition-detector');
 
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a component class.',
 
   fileMapTokens: function () {
@@ -51,4 +50,4 @@ module.exports = useEditionDetector({
       path: getPathOption(options),
     };
   },
-});
+};

blueprints/controller/files/__root__/__path__/__name__.js

@@ -1,4 +1,4 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-});
+export default class <%= classifiedModuleName %>Controller extends Controller {
+}

blueprints/controller/index.js

@@ -1,10 +1,8 @@
 'use strict';
 
-const useEditionDetector = require('../edition-detector');
-
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a controller.',
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
-});
+};

blueprints/route/files/__root__/__path__/__name__.js

@@ -1,11 +1,11 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({<% if (hasDynamicSegment) {%>
+export default class <%= classifiedModuleName %>Route extends Route {<% if (hasDynamicSegment) {%>
   model(params) {
     /**
      * This route was generated with a dynamic segment. Implement data loading
      * based on that dynamic segment here in the model hook.
      */
     return params;
-  },<%}%>
-});
+  }<%}%>
+}

blueprints/route/index.js

@@ -5,9 +5,8 @@ const path = require('path');
 const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
-const useEditionDetector = require('../edition-detector');
 
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a route and a template, and registers the route with the router.',
 
   availableOptions: [
@@ -122,7 +121,7 @@ module.exports = useEditionDetector({
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
-});
+};
 
 function updateRouter(action, options) {
   let entity = options.entity;

blueprints/service/files/__root__/__path__/__name__.js

@@ -1,4 +1,4 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-});
+export default class <%= classifiedModuleName %>Service extends Service {
+}

blueprints/service/index.js

@@ -1,10 +1,8 @@
 'use strict';
 
-const useEditionDetector = require('../edition-detector');
-
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a service.',
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
-});
+};

node-tests/blueprints/component-class-addon-test.js

@@ -4,11 +4,13 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
 const setupTestHooks = blueprintHelpers.setupTestHooks;
 const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
-
+const setupTestEnvironment = require('../helpers/setup-test-environment');
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
+const enableOctane = setupTestEnvironment.enableOctane;
 describe('Blueprint: component-class-addon', function () {
+  enableOctane();
   setupTestHooks(this);
 
   describe('in addon', function () {