ember-source 6.0.0-alpha.9 → 6.0.0

package/blueprints/component/index.js

@@ -1,13 +1,10 @@
 'use strict';
 
 const chalk = require('chalk');
-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');
 const { has } = require('@ember/edition-utils');
 const { generateComponentSignature } = require('../-utils');
 
@@ -48,9 +45,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 +72,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 +98,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);
@@ -149,37 +134,7 @@ module.exports = {
   fileMapTokens(options) {
     let commandOptions = this.options;
 
-    if (commandOptions.pod) {
-      return {
-        __path__() {
-          return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
-        },
-        __templatepath__() {
-          return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
-        },
-        __templatename__() {
-          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'
-    ) {
+    if (this.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE && commandOptions.componentStructure === 'flat') {
       return {
         __path__() {
           return 'components';
@@ -236,19 +191,6 @@ module.exports = {
   },
 
   locals(options) {
-    // if we're in an addon, build import statement
-    let templatePath = '';
-    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);
-      }
-    }
-
     let componentClass = this.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
       ? options.componentClass
       : '@ember/component';
@@ -264,12 +206,7 @@ module.exports = {
     switch (componentClass) {
       case '@ember/component':
         importComponent = `import Component from '@ember/component';`;
-        if (templatePath) {
-          importTemplate = `import layout from '${templatePath}';${EOL}`;
-          defaultExport = `Component.extend({${EOL}  layout${EOL}});`;
-        } else {
-          defaultExport = `Component.extend({});`;
-        }
+        defaultExport = `Component.extend({});`;
         break;
       case '@glimmer/component':
         importComponent = `import Component from '@glimmer/component';`;

package/blueprints/component-class/index.js

@@ -1,12 +1,9 @@
 'use strict';
 
-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');
 const { has } = require('@ember/edition-utils');
 const { generateComponentSignature } = require('../-utils');
 
@@ -44,9 +41,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 +68,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' }];
       }
     });
 
@@ -99,19 +90,7 @@ module.exports = {
   fileMapTokens(options) {
     let commandOptions = this.options;
 
-    if (commandOptions.pod) {
-      return {
-        __path__() {
-          return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
-        },
-        __name__() {
-          return 'component';
-        },
-      };
-    } else if (
-      commandOptions.componentStructure === 'classic' ||
-      commandOptions.componentStructure === 'flat'
-    ) {
+    if (commandOptions.componentStructure === 'flat') {
       return {
         __path__() {
           return 'components';
@@ -139,35 +118,17 @@ module.exports = {
     let sanitizedModuleName = options.entity.name.replace(/\//g, '-');
     let classifiedModuleName = stringUtil.classify(sanitizedModuleName);
 
-    let templatePath = '';
     let importComponent = '';
     let importTemplate = '';
     let defaultExport = '';
     let componentSignature = '';
 
-    // if we're in an addon, build import statement
-    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);
-      }
-    }
-
     let componentClass = options.componentClass;
 
     switch (componentClass) {
       case '@ember/component':
         importComponent = `import Component from '@ember/component';`;
-        if (templatePath) {
-          importTemplate = `import layout from '${templatePath}';${EOL}`;
-          defaultExport = `Component.extend({${EOL}  layout${EOL}});`;
-        } else {
-          defaultExport = `Component.extend({});`;
-        }
+        defaultExport = `Component.extend({});`;
         break;
       case '@glimmer/component':
         importComponent = `import Component from '@glimmer/component';`;

package/build-metadata.json

@@ -1,6 +1,6 @@
 {
-  "version": "6.0.0-alpha.9",
+  "version": "6.0.0",
   "buildType": "tag",
-  "SHA": "98f7c251c08bf7380b7922ca62d18723275a9bef",
-  "assetPath": "/tag/shas/98f7c251c08bf7380b7922ca62d18723275a9bef.tgz"
+  "SHA": "3b57b6ab7a93d2444c396dd64603c0a12e88a719",
+  "assetPath": "/tag/shas/3b57b6ab7a93d2444c396dd64603c0a12e88a719.tgz"
 }