Merge pull request #17552 from jenweber/bugfix-angle-brackets-17549

[BUGFIX lts] support numbers in component names for Angle Brackets
emberjs · Feb 2, 2019 · d940958 · d940958
2 parents ca0b437 + 6cd0258
commit d940958
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/packages/ember-template-compiler/lib/system/dasherize-component-name.ts b/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
@@ -5,7 +5,7 @@ import { Cache } from '@ember/-internals/utils';
   `Ember.String.dasherize` would resolve it to `xfoo`..
 */
 const SIMPLE_DASHERIZE_REGEXP = /[A-Z]/g;
-const ALPHA = /[A-Za-z]/;
+const ALPHA = /[A-Za-z0-9]/;
 export default new Cache<string, string>(1000, key =>
   key.replace(SIMPLE_DASHERIZE_REGEXP, (char, index) => {
     if (index === 0 || !ALPHA.test(key[index - 1])) {

diff --git a/packages/ember-template-compiler/tests/system/dasherize-component-name-test.js b/packages/ember-template-compiler/tests/system/dasherize-component-name-test.js
@@ -8,6 +8,10 @@ moduleFor(
       assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('Foo'), 'foo');
       assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('foo-bar'), 'foo-bar');
       assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('FooBar'), 'foo-bar');
+      assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('F3Bar'), 'f3-bar');
+      assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('Foo3Bar'), 'foo3-bar');
+      assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('Foo3barBaz'), 'foo3bar-baz');
+      assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('FooB3ar'), 'foo-b3ar');
       assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('XBlah'), 'x-blah');
       assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('X-Blah'), 'x-blah');
       assert.equal(COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get('Foo::BarBaz'), 'foo::bar-baz');