ember-source 6.0.0-beta.1 → 6.0.1

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-beta.1",
+  "version": "6.0.1",
   "buildType": "tag",
-  "SHA": "fab7a68bd6b491e803e46a6d1190948cf6e1986b",
-  "assetPath": "/tag/shas/fab7a68bd6b491e803e46a6d1190948cf6e1986b.tgz"
+  "SHA": "0d7b7fcab84089dd8f8e86bc28cd769522e39b78",
+  "assetPath": "/tag/shas/0d7b7fcab84089dd8f8e86bc28cd769522e39b78.tgz"
 }

package/dist/ember-template-compiler.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   6.0.0-beta.1
+ * @version   6.0.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */
@@ -15651,7 +15651,7 @@ var define, require;
           }, Symbol.toStringTag, { value: 'Module' });
 
           // this file gets replaced with the real value during the build
-          const version = '6.0.0-beta.1';
+          const version = '6.0.1';
 
           const emberVersion = /*#__PURE__*/Object.defineProperty({
                     __proto__: null,

package/dist/ember-testing.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   6.0.0-beta.1
+ * @version   6.0.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */

package/dist/ember.debug.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   6.0.0-beta.1
+ * @version   6.0.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */
@@ -3379,7 +3379,7 @@ var define, require;
           }, Symbol.toStringTag, { value: 'Module' });
 
           // this file gets replaced with the real value during the build
-          const Version = '6.0.0-beta.1';
+          const Version = '6.0.1';
 
           const emberVersion = /*#__PURE__*/Object.defineProperty({
                     __proto__: null,

package/dist/ember.prod.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   6.0.0-beta.1
+ * @version   6.0.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */
@@ -2620,7 +2620,7 @@ var define, require;
           }, Symbol.toStringTag, { value: 'Module' });
 
           // this file gets replaced with the real value during the build
-          const Version = '6.0.0-beta.1';
+          const Version = '6.0.1';
 
           const emberVersion = /*#__PURE__*/Object.defineProperty({
                     __proto__: null,

package/dist/packages/ember/version.js

@@ -1,4 +1,4 @@
 // this file gets replaced with the real value during the build
-const Version = '6.0.0-beta.1';
+const Version = '6.0.1';
 
 export { Version as default };

package/docs/data.json

@@ -3,7 +3,7 @@
     "name": "The Ember API",
     "description": "The Ember API: a framework for building ambitious web applications",
     "url": "https://emberjs.com/",
-    "version": "6.0.0-beta.1"
+    "version": "6.0.1"
   },
   "files": {
     "node_modules/rsvp/lib/rsvp/promise/all.js": {

package/lib/browsers.js

@@ -1,75 +1,47 @@
 module.exports = [
-  'Chrome >= 103',
-  'Edge >= 110',
-  'Firefox >= 102',
-  'iOS >= 12',
-  'Safari >= 12',
-  'ChromeAndroid >= 112',
-  'FirefoxAndroid >= 110',
+  'Chrome >= 109',
+  'Edge >= 128',
+  'Firefox >= 115',
+  'iOS >= 15.6',
+  'Safari >= 15.6',
+  'ChromeAndroid >= 130',
+  'FirefoxAndroid >= 130',
 ];
 
 /*
-  As of the release of April 2023, the above query expands to:
+  The above is generated via browserslist to comply with [RFC #685](https://rfcs.emberjs.com/id/0685-new-browser-support-policy)
+  and [RFC #984](https://rfcs.emberjs.com/id/0984-update-browser-support-policy) by running the following command:
 
-  and_chr 112
-  and_ff 110
-  chrome 112
-  chrome 111
-  chrome 110
-  chrome 109
-  chrome 108
-  chrome 107
-  chrome 106
-  chrome 105
-  chrome 104
-  chrome 103
-  edge 112
-  edge 111
-  edge 110
-  firefox 112
-  firefox 111
-  firefox 110
-  firefox 109
-  firefox 108
-  firefox 107
-  firefox 106
-  firefox 105
-  firefox 104
-  firefox 103
-  firefox 102
-  ios_saf 16.4
-  ios_saf 16.3
-  ios_saf 16.2
-  ios_saf 16.0
-  ios_saf 15.6
-  ios_saf 15.5
-  ios_saf 15.4
-  ios_saf 15.2-15.3
-  ios_saf 15.0-15.1
-  ios_saf 14.5-14.8
-  ios_saf 14.0-14.4
-  ios_saf 13.4-13.7
-  ios_saf 13.3
-  ios_saf 13.2
-  ios_saf 13.0-13.1
-  ios_saf 12.2-12.5
-  ios_saf 12.0-12.1
-  safari 16.4
-  safari 16.3
-  safari 16.2
-  safari 16.1
-  safari 16.0
-  safari 15.6
-  safari 15.5
-  safari 15.4
-  safari 15.2-15.3
-  safari 15.1
-  safari 15
-  safari 14.1
-  safari 14
-  safari 13.1
-  safari 13
-  safari 12.1
-  safari 12
+  `npx browserslist '>0.25%, Firefox ESR, last 1 Chrome version, last 1 Firefox version, last 1 Edge version, last 1 FirefoxAndroid version, last 1 ChromeAndroid version, not dead'`
+
+  And then filtering out unsupported browsers.
 
+  and_chr 130
+  and_ff 130
+  chrome 130
+  chrome 129
+  chrome 128
+  chrome 127
+  chrome 126
+  chrome 125
+  chrome 124
+  chrome 109
+  edge 130
+  edge 129
+  edge 128
+  firefox 132
+  firefox 130
+  firefox 129
+  firefox 128
+  firefox 115
+  ios_saf 18.0
+  ios_saf 17.6-17.7
+  ios_saf 17.5
+  ios_saf 17.4
+  ios_saf 16.6-16.7
+  ios_saf 16.1
+  ios_saf 15.6-15.8
+  safari 17.6
+  safari 17.5
+  safari 16.6
 */

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "ember-source",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"
   ],
   "exports": {
     "./*": "./dist/packages/*",
+    "./types": {
+      "types": "./types/stable/index.d.ts"
+    },
     "./dist/ember-template-compiler.js": "./dist/ember-template-compiler.js",
     "./package.json": "./package.json"
   },
@@ -372,9 +375,6 @@
     "node": "16.20.0",
     "pnpm": "8.10.0"
   },
-  "_originalVersion": "6.0.0-beta.1",
-  "_versionPreviouslyCalculated": true,
-  "publishConfig": {
-    "tag": "beta"
-  }
+  "_originalVersion": "6.0.1",
+  "_versionPreviouslyCalculated": true
 }