ember-source 6.5.0-alpha.6 → 6.6.0-alpha.1

package/blueprints/component/files/__root__/__templatepath__/__templatename__.gjs

@@ -0,0 +1,9 @@
+<% if (componentClass === '@glimmer/component') {%>import Component from '@glimmer/component';
+
+export default class <%= classifiedModuleName %> extends Component {
+  <template>
+    {{yield}}
+  </template>
+}<%} else {%><template>
+  {{yield}}
+</template><%}%>

package/blueprints/component/files/__root__/__templatepath__/__templatename__.gts

@@ -0,0 +1,13 @@
+<% if (componentClass === '@glimmer/component') {%>import Component from '@glimmer/component';
+
+<%= componentSignature %>
+export default class <%= classifiedModuleName %> extends Component<<%= classifiedModuleName %>Signature> {
+  <template>
+    {{yield}}
+  </template>
+}<%} else {%>import type { TOC } from '@ember/component/template-only';
+
+<%= componentSignature %>
+<template>
+  {{yield}}
+</template> satisfies TOC<<%= classifiedModuleName %>Signature>;<%}%>

package/blueprints/component/index.js

@@ -4,6 +4,7 @@ const chalk = require('chalk');
 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 SilentError = require('silent-error');
 const { generateComponentSignature } = require('../-utils');
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
@@ -40,6 +41,17 @@ module.exports = {
       default: 'flat',
       aliases: [{ fs: 'flat' }, { ns: 'nested' }],
     },
+    {
+      name: 'component-authoring-format',
+      type: ['loose', 'strict'],
+      default: 'loose',
+      aliases: [
+        { loose: 'loose' },
+        { strict: 'strict' },
+        { 'template-tag': 'strict' },
+        { tt: 'strict' },
+      ],
+    },
   ],
 
   init() {
@@ -58,6 +70,18 @@ module.exports = {
       options.componentClass = '';
     }
 
+    if (options.componentAuthoringFormat === 'strict') {
+      if (options.componentClass === '@ember/component') {
+        throw new SilentError(
+          'The "@ember/component" component class cannot be used in combination with the "--strict" flag'
+        );
+      }
+
+      if (options.componentClass === '') {
+        options.componentClass = '@ember/component/template-only';
+      }
+    }
+
     return this._super.install.apply(this, arguments);
   },
 
@@ -78,14 +102,16 @@ module.exports = {
   afterInstall(options) {
     this._super.afterInstall.apply(this, arguments);
 
-    this.skippedJsFiles.forEach((file) => {
-      let mapped = this.mapFile(file, this.savedLocals);
-      this.ui.writeLine(`  ${chalk.yellow('skip')} ${mapped}`);
-    });
+    if (options.componentAuthoringFormat === 'loose') {
+      this.skippedJsFiles.forEach((file) => {
+        let mapped = this.mapFile(file, this.savedLocals);
+        this.ui.writeLine(`  ${chalk.yellow('skip')} ${mapped}`);
+      });
 
-    if (this.skippedJsFiles.size > 0) {
-      let command = `ember generate component-class ${options.entity.name}`;
-      this.ui.writeLine(`  ${chalk.cyan('tip')} to add a class, run \`${command}\``);
+      if (this.skippedJsFiles.size > 0) {
+        let command = `ember generate component-class ${options.entity.name}`;
+        this.ui.writeLine(`  ${chalk.cyan('tip')} to add a class, run \`${command}\``);
+      }
     }
   },
 
@@ -135,6 +161,21 @@ module.exports = {
         }
       });
     }
+    if (this.options.componentAuthoringFormat === 'strict') {
+      const strictFilesToRemove =
+        this.options.isTypeScriptProject || this.options.typescript ? '.gjs' : '.gts';
+      files = files.filter(
+        (file) =>
+          !(
+            file.endsWith('.js') ||
+            file.endsWith('.ts') ||
+            file.endsWith('.hbs') ||
+            file.endsWith(strictFilesToRemove)
+          )
+      );
+    } else {
+      files = files.filter((file) => !(file.endsWith('.gjs') || file.endsWith('.gts')));
+    }
 
     return files;
   },
@@ -172,6 +213,7 @@ module.exports = {
     }
 
     return {
+      classifiedModuleName,
       importTemplate,
       importComponent,
       componentSignature,

package/blueprints/component-test/files/__root__/__testType__/__path__/__test__.gjs

@@ -0,0 +1,28 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
+import { render } from '@ember/test-helpers';
+import <%= componentName %> from '<%= pkgName %>/components/<%= componentPathName %>';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Updating values is achieved using autotracking, just like in app code. For example:
+    // class State { @tracked myProperty = 0; }; const state = new State();
+    // and update using state.myProperty = 1; await rerender();
+    // Handle any actions with function myAction(val) { ... };
+
+    await render(<template><%= selfCloseComponent(componentName) %></template>);
+
+    assert.dom().hasText('');
+
+    // Template block usage:
+    await render(<template>
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    </template>);
+
+    assert.dom().hasText('template block text');
+  });
+});

package/blueprints/component-test/files/__root__/__testType__/__path__/__test__.gts

@@ -0,0 +1,28 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
+import { render } from '@ember/test-helpers';
+import <%= componentName %> from '<%= pkgName %>/components/<%= componentPathName %>';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Updating values is achieved using autotracking, just like in app code. For example:
+    // class State { @tracked myProperty = 0; }; const state = new State();
+    // and update using state.myProperty = 1; await rerender();
+    // Handle any actions with function myAction(val) { ... };
+
+    await render(<template><%= selfCloseComponent(componentName) %></template>);
+
+    assert.dom().hasText('');
+
+    // Template block usage:
+    await render(<template>
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    </template>);
+
+    assert.dom().hasText('template block text');
+  });
+});

package/blueprints/component-test/index.js

@@ -14,6 +14,12 @@ function invocationFor(options) {
   return parts.map((p) => stringUtil.classify(p)).join('::');
 }
 
+function invocationForStrictComponentAuthoringFormat(options) {
+  let parts = options.entity.name.split('/');
+  let componentName = parts[parts.length - 1];
+  return stringUtil.classify(componentName);
+}
+
 module.exports = {
   description: 'Generates a component integration or unit test.',
 
@@ -36,6 +42,17 @@ module.exports = {
         { unit: 'unit' },
       ],
     },
+    {
+      name: 'component-authoring-format',
+      type: ['loose', 'strict'],
+      default: 'loose',
+      aliases: [
+        { loose: 'loose' },
+        { strict: 'strict' },
+        { 'template-tag': 'strict' },
+        { tt: 'strict' },
+      ],
+    },
   ],
 
   fileMapTokens: function () {
@@ -55,6 +72,23 @@ module.exports = {
     };
   },
 
+  files() {
+    let files = this._super.files.apply(this, arguments);
+
+    if (this.options.componentAuthoringFormat === 'strict') {
+      const strictFilesToRemove =
+        this.options.isTypeScriptProject || this.options.typescript ? '.gjs' : '.gts';
+      files = files.filter(
+        (file) =>
+          !(file.endsWith('.js') || file.endsWith('.ts') || file.endsWith(strictFilesToRemove))
+      );
+    } else {
+      files = files.filter((file) => !(file.endsWith('.gjs') || file.endsWith('.gts')));
+    }
+
+    return files;
+  },
+
   locals: function (options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let componentPathName = dasherizedModuleName;
@@ -74,7 +108,10 @@ module.exports = {
       ? "import { hbs } from 'ember-cli-htmlbars';"
       : "import hbs from 'htmlbars-inline-precompile';";
 
-    let templateInvocation = invocationFor(options);
+    let templateInvocation =
+      this.options.componentAuthoringFormat === 'strict'
+        ? invocationForStrictComponentAuthoringFormat(options)
+        : invocationFor(options);
     let componentName = templateInvocation;
     let openComponent = (descriptor) => `<${descriptor}>`;
     let closeComponent = (descriptor) => `</${descriptor}>`;
@@ -92,6 +129,7 @@ module.exports = {
       selfCloseComponent,
       friendlyTestDescription,
       hbsImportStatement,
+      pkgName: options.project.pkg.name,
     };
   },
 

package/build-metadata.json

@@ -1,6 +1,6 @@
 {
-  "version": "6.5.0-alpha.6",
+  "version": "6.6.0-alpha.1",
   "buildType": "tag",
-  "SHA": "6c601053dab9c40d900f19d16b08620c5e13f6ba",
-  "assetPath": "/tag/shas/6c601053dab9c40d900f19d16b08620c5e13f6ba.tgz"
+  "SHA": "e50c80ebf2cbfd5c13d66f3c89fcf4a49163ffac",
+  "assetPath": "/tag/shas/e50c80ebf2cbfd5c13d66f3c89fcf4a49163ffac.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.5.0-alpha.6
+ * @version   6.6.0-alpha.1
  */
 /* eslint-disable no-var */
 /* globals global globalThis self */
@@ -15039,7 +15039,7 @@ var define, require;
           }, Symbol.toStringTag, { value: 'Module' });
 
           // this file gets replaced with the real value during the build
-          const version = '6.5.0-alpha.6';
+          const version = '6.6.0-alpha.1';
 
           const emberVersion = /*#__PURE__*/Object.defineProperty({
                     __proto__: null,