Remove the classic component-structure option

The classic file structure is deprecated.
emberjs · Oct 6, 2024 · bcb2d29 · bcb2d29
1 parent 0f9b3fc
commit bcb2d29
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 127 deletions.
diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.js
@@ -3,7 +3,6 @@
 const path = require('path');
 const SilentError = require('silent-error');
 const stringUtil = require('ember-cli-string-utils');
-const pathUtil = require('ember-cli-path-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const { EOL } = require('os');
@@ -44,9 +43,9 @@ module.exports = {
     },
     {
       name: 'component-structure',
-      type: OCTANE ? ['flat', 'nested', 'classic'] : ['classic'],
-      default: OCTANE ? 'flat' : 'classic',
-      aliases: OCTANE ? [{ fs: 'flat' }, { ns: 'nested' }, { cs: 'classic' }] : [{ cs: 'classic' }],
+      type: ['flat', 'nested'],
+      default: 'flat',
+      aliases: [{ fs: 'flat' }, { ns: 'nested' }],
     },
   ],
 
@@ -71,15 +70,9 @@ module.exports = {
           option.default = '@ember/component';
         }
       } else if (option.name === 'component-structure') {
-        if (isOctane) {
-          option.type = ['flat', 'nested', 'classic'];
-          option.default = 'flat';
-          option.aliases = [{ fs: 'flat' }, { ns: 'nested' }, { cs: 'classic' }];
-        } else {
-          option.type = ['classic'];
-          option.default = 'classic';
-          option.aliases = [{ cs: 'classic' }];
-        }
+        option.type = ['flat', 'nested'];
+        option.default = 'flat';
+        option.aliases = [{ fs: 'flat' }, { ns: 'nested' }];
       }
     });
 
@@ -108,10 +101,7 @@ module.exports = {
           return 'component';
         },
       };
-    } else if (
-      commandOptions.componentStructure === 'classic' ||
-      commandOptions.componentStructure === 'flat'
-    ) {
+    } else if (commandOptions.componentStructure === 'flat') {
       return {
         __path__() {
           return 'components';
@@ -149,11 +139,6 @@ module.exports = {
     if (options.project.isEmberCLIAddon() || (options.inRepoAddon && !options.inDummy)) {
       if (options.pod) {
         templatePath = './template';
-      } else {
-        templatePath =
-          pathUtil.getRelativeParentPath(options.entity.name) +
-          'templates/components/' +
-          stringUtil.dasherize(options.entity.name);
       }
     }
 

diff --git a/blueprints/component/index.js b/blueprints/component/index.js
@@ -48,9 +48,9 @@ module.exports = {
     },
     {
       name: 'component-structure',
-      type: OCTANE ? ['flat', 'nested', 'classic'] : ['classic'],
-      default: OCTANE ? 'flat' : 'classic',
-      aliases: OCTANE ? [{ fs: 'flat' }, { ns: 'nested' }, { cs: 'classic' }] : [{ cs: 'classic' }],
+      type: ['flat', 'nested'],
+      default: 'flat',
+      aliases: [{ fs: 'flat' }, { ns: 'nested' }],
     },
   ],
 
@@ -75,15 +75,9 @@ module.exports = {
           option.default = '@ember/component';
         }
       } else if (option.name === 'component-structure') {
-        if (isOctane) {
-          option.type = ['flat', 'nested', 'classic'];
-          option.default = 'flat';
-          option.aliases = [{ fs: 'flat' }, { ns: 'nested' }, { cs: 'classic' }];
-        } else {
-          option.type = ['classic'];
-          option.default = 'classic';
-          option.aliases = [{ cs: 'classic' }];
-        }
+        option.type = ['flat', 'nested'];
+        option.default = 'flat';
+        option.aliases = [{ fs: 'flat' }, { ns: 'nested' }];
       }
     });
 
@@ -107,12 +101,6 @@ module.exports = {
           'Usage of --component-class argument to `ember generate component` is only available on canary'
         );
       }
-
-      if (options.componentStructure !== 'classic') {
-        throw new SilentError(
-          'Usage of --component-structure argument to `ember generate component` is only available on canary'
-        );
-      }
     }
 
     return this._super.install.apply(this, arguments);
@@ -161,21 +149,6 @@ module.exports = {
           return 'template';
         },
       };
-    } else if (
-      !this.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE ||
-      commandOptions.componentStructure === 'classic'
-    ) {
-      return {
-        __path__() {
-          return 'components';
-        },
-        __templatepath__() {
-          return 'templates/components';
-        },
-        __templatename__() {
-          return options.dasherizedModuleName;
-        },
-      };
     } else if (
       this.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE &&
       commandOptions.componentStructure === 'flat'

diff --git a/node-tests/blueprints/component-class-test.js b/node-tests/blueprints/component-class-test.js
@@ -54,23 +54,6 @@ describe('Blueprint: component-class', function () {
       });
     });
 
-    // classic default
-    it('component-class foo --component-structure=classic --component-class=@ember/component', function () {
-      return emberGenerateDestroy(
-        [
-          'component-class',
-          'foo',
-          '--component-structure',
-          'classic',
-          '--component-class',
-          '@ember/component',
-        ],
-        (_file) => {
-          expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-        }
-      );
-    });
-
     // Octane default
     it('component-class foo --component-structure=flat --component-class=@glimmer/component', function () {
       return emberGenerateDestroy(
@@ -106,15 +89,6 @@ describe('Blueprint: component-class', function () {
       );
     });
 
-    it('component-class foo --component-structure=classic', function () {
-      return emberGenerateDestroy(
-        ['component-class', '--component-structure', 'classic', 'foo'],
-        (_file) => {
-          expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
-        }
-      );
-    });
-
     it('component-class foo --component-class=@ember/component', function () {
       return emberGenerateDestroy(
         ['component-class', '--component-class', '@ember/component', 'foo'],

diff --git a/node-tests/blueprints/component-test.js b/node-tests/blueprints/component-test.js
@@ -64,34 +64,6 @@ describe('Blueprint: component', function () {
       });
     });
 
-    // classic default
-    it('component foo --component-structure=classic --component-class=@ember/component', function () {
-      return emberGenerateDestroy(
-        [
-          'component',
-          'foo',
-          '--component-structure',
-          'classic',
-          '--component-class',
-          '@ember/component',
-        ],
-        (_file) => {
-          expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-
-          expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-          expect(_file('tests/integration/components/foo-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo',
-                componentInvocation: 'Foo',
-              },
-            })
-          );
-        }
-      );
-    });
-
     // Octane default
     it('component foo --component-structure=flat --component-class=@glimmer/component', function () {
       return emberGenerateDestroy(
@@ -156,24 +128,6 @@ describe('Blueprint: component', function () {
       );
     });
 
-    it('component foo --component-structure=classic', function () {
-      return emberGenerateDestroy(
-        ['component', '--component-structure', 'classic', 'foo'],
-        (_file) => {
-          expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-          expect(_file('tests/integration/components/foo-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo',
-                componentInvocation: 'Foo',
-              },
-            })
-          );
-        }
-      );
-    });
-
     it('component foo --component-class=@ember/component', function () {
       return emberGenerateDestroy(
         ['component', '--component-class', '@ember/component', 'foo'],