From f1c905c9d3284740968031e72c26d66f732abf94 Mon Sep 17 00:00:00 2001
From: Dan Freeman <dfreeman@salsify.com>
Date: Fri, 8 Apr 2022 16:41:46 +0200
Subject: [PATCH] Add `typesVersions` entry for consistent Signature import
 paths

---
 packages/@glimmer/component/package.json | 9 ++++++++-
 test/types/component-test.ts             | 5 +----
 test/types/tsconfig.json                 | 4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/@glimmer/component/package.json b/packages/@glimmer/component/package.json
index e34d8b829..f5241e6b0 100644
--- a/packages/@glimmer/component/package.json
+++ b/packages/@glimmer/component/package.json
@@ -85,6 +85,13 @@
     "qunit-dom": "^0.7.1",
     "typescript": "~3.5.3"
   },
+  "typesVersions": {
+    "*": {
+      "-private/*": [
+        "dist/types/addon/-private/*"
+      ]
+    }
+  },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"
   },
@@ -93,4 +100,4 @@
     "defaultBlueprint": "install-glimmer-component",
     "main": "ember-addon-main.js"
   }
-}
\ No newline at end of file
+}
diff --git a/test/types/component-test.ts b/test/types/component-test.ts
index 8841a4ceb..d2a52717f 100644
--- a/test/types/component-test.ts
+++ b/test/types/component-test.ts
@@ -12,10 +12,7 @@ import Component from '@glimmer/component';
 // matches the actual import location to which this type would be emitted. Since
 // this is an internal-only type whose presence consumers should not rely on and
 // which they should not use in any way, this is "safe" from a public API POV.
-import {
-  EmptyObject,
-  ExpandSignature,
-} from '@glimmer/component/dist/types/addon/-private/component';
+import { EmptyObject, ExpandSignature } from '@glimmer/component/-private/component';
 
 declare let basicComponent: Component;
 expectTypeOf(basicComponent).toHaveProperty('args');
diff --git a/test/types/tsconfig.json b/test/types/tsconfig.json
index 151648d63..aae575c6c 100644
--- a/test/types/tsconfig.json
+++ b/test/types/tsconfig.json
@@ -31,6 +31,10 @@
     "noEmit": true,
 
     "paths": {
+      "@glimmer/component/-private/*": [
+        // This must match the `typesVersions` entry in `@glimmer/component`'s package.json
+        "../../dist/@glimmer/component/dist/types/addon/-private/*"
+      ],
       "@glimmer/*": ["../../dist/@glimmer/*"]
     }
   }