From 8ddf36251f44ad6b195db4ed00090b0b4f58ac77 Mon Sep 17 00:00:00 2001
From: Simon Ihmig <simon.ihmig@kaliber5.de>
Date: Thu, 20 Jul 2023 23:52:15 +0200
Subject: [PATCH] Update to latest blueprint changes

---
 .gitignore                       |  1 +
 ember-stargate/.gitignore        |  5 -----
 ember-stargate/package.json      | 14 ++++++++------
 ember-stargate/rollup.config.mjs |  4 +---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e2466940..710e297f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 
 # compiled output
 dist/
+declarations/
 
 # dependencies
 node_modules/
diff --git a/ember-stargate/.gitignore b/ember-stargate/.gitignore
index 66c9c224b..a6512bcf5 100644
--- a/ember-stargate/.gitignore
+++ b/ember-stargate/.gitignore
@@ -3,8 +3,3 @@
 # will also appear in published NPM packages.
 /README.md
 /LICENSE.md
-# Build output
-/dist/
-/declarations/
-# npm/pnpm/yarn pack output
-*.tgz
diff --git a/ember-stargate/package.json b/ember-stargate/package.json
index fdc2018c0..625550916 100644
--- a/ember-stargate/package.json
+++ b/ember-stargate/package.json
@@ -14,13 +14,13 @@
   },
   "files": [
     "addon-main.js",
-    "dist",
-    "declarations"
+    "declarations",
+    "dist"
   ],
   "scripts": {
     "build": "concurrently 'npm:build:*'",
     "build:js": "rollup --config",
-    "build:types": "glint -d",
+    "build:types": "glint --declaration",
     "lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
     "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
     "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern",
@@ -72,7 +72,6 @@
     "@typescript-eslint/eslint-plugin": "5.59.7",
     "@typescript-eslint/parser": "5.59.7",
     "@rollup/plugin-babel": "6.0.3",
-    "@rollup/plugin-node-resolve": "15.1.0",
     "concurrently": "8.0.1",
     "ember-modifier": "4.1.0",
     "ember-template-lint": "5.11.0",
@@ -103,9 +102,12 @@
     }
   },
   "exports": {
-    ".": "./dist/index.js",
+    ".": {
+      "types": "./declarations/index.d.ts",
+      "default": "./dist/index.js"
+    },
     "./*": {
-      "types": "./declarations/*.d.js",
+      "types": "./declarations/*.d.ts",
       "default": "./dist/*.js"
     },
     "./addon-main.js": "./addon-main.js"
diff --git a/ember-stargate/rollup.config.mjs b/ember-stargate/rollup.config.mjs
index a5b2ba012..985a3f2be 100644
--- a/ember-stargate/rollup.config.mjs
+++ b/ember-stargate/rollup.config.mjs
@@ -9,7 +9,7 @@ const addon = new Addon({
 });
 
 // Add extensions here, such as ts, gjs, etc that you may import
-const extensions = ['.js', '.ts', '.hbs'];
+const extensions = ['.js', '.ts'];
 
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
@@ -43,8 +43,6 @@ export default {
       extensions,
       babelHelpers: 'bundled',
     }),
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({ extensions }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),