Merge pull request #1017 from thoov/handle-static-getter-components

embroider-build · Nov 11, 2021 · dcd4eaa · dcd4eaa
2 parents ff97e7e + a5e1027
commit dcd4eaa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/packages/compat/src/resolver-transform.ts b/packages/compat/src/resolver-transform.ts
@@ -28,6 +28,9 @@ export function makeResolverTransform(resolver: Resolver) {
  if (scopeStack.inScope(node.path.parts[0])) {
  return;
  }
+ if (node.path.this === true) {
+ return;
+ }
  if (node.path.parts.length > 1) {
  // paths with a dot in them (which therefore split into more than
  // one "part") are classically understood by ember to be contextual
@@ -80,6 +83,9 @@ export function makeResolverTransform(resolver: Resolver) {
  if (scopeStack.inScope(node.path.parts[0])) {
  return;
  }
+ if (node.path.this === true) {
+ return;
+ }
  if (node.path.parts.length > 1) {
  // paths with a dot in them (which therefore split into more than
  // one "part") are classically understood by ember to be contextual

diff --git a/packages/compat/tests/resolver.test.ts b/packages/compat/tests/resolver.test.ts
@@ -476,6 +476,20 @@ describe('compat-resolver', function () {
  let findDependencies = configure({ staticHelpers: true });
  expect(findDependencies('templates/application.hbs', `{{(this.myHelper 42)}}`)).toEqual([]);
  });
+ test('helper defined in component not failing if there is no arguments', function () {
+ let findDependencies = configure({ staticComponents: true, staticHelpers: true });
+ expect(findDependencies('templates/application.hbs', `{{#if (this.myHelper)}}{{/if}}`)).toEqual([]);
+ });
+ test('class defined component not failing if there is a block', function () {
+ let findDependencies = configure({ staticComponents: true, staticHelpers: true });
+ expect(findDependencies('templates/application.hbs', `{{#this.myComponent}}hello{{/this.myComponent}}`)).toEqual(
+ []
+ );
+ });
+ test('class defined component not failing with arguments', function () {
+ let findDependencies = configure({ staticComponents: true, staticHelpers: true });
+ expect(findDependencies('templates/application.hbs', `{{#this.myComponent 42}}{{/this.myComponent}}`)).toEqual([]);
+ });
  test('mustache missing, no args', function () {
  let findDependencies = configure({
  staticComponents: true,