Remove rollup-plugin-ts

ember-container-query/.eslintignore

@@ -2,6 +2,7 @@
 /blueprints/*/files/
 
 # compiled output
+/declarations/
 /dist/
 
 # misc

ember-container-query/.gitignore

@@ -1,4 +1,5 @@
 # compiled output
+/declarations/
 /dist/
 
 # dependencies

ember-container-query/package.json

@@ -21,17 +21,20 @@
   "license": "MIT",
   "author": "Isaac J. Lee",
   "exports": {
-    ".": "./dist/index.js",
+    ".": {
+      "types": "./declarations/index.d.ts",
+      "default": "./dist/index.js"
+    },
     "./*": {
-      "types": "./dist/*.d.ts",
+      "types": "./declarations/*.d.ts",
       "default": "./dist/*.js"
     },
     "./addon-main.js": "./addon-main.cjs"
   },
   "typesVersions": {
     "*": {
       "*": [
-        "dist/*"
+        "declarations/*"
       ]
     }
   },
@@ -41,10 +44,13 @@
   },
   "files": [
     "addon-main.cjs",
+    "declarations",
     "dist"
   ],
   "scripts": {
-    "build": "rollup --config",
+    "build": "concurrently \"npm:build:*\" --names \"build:\"",
+    "build:js": "rollup --config",
+    "build:types": "glint --declaration",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
     "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
@@ -53,7 +59,9 @@
     "lint:js:fix": "eslint . --fix",
     "lint:types": "glint",
     "prepack": "rollup --config",
-    "start": "rollup --config --watch",
+    "start": "concurrently \"npm:start:*\" --names \"start:\"",
+    "start:js": "rollup --config --watch --no-watch.clearScreen",
+    "start:types": "glint --declaration --watch",
     "test": "echo 'A v2 addon does not have tests, run tests in test-app'"
   },
   "dependencies": {
@@ -75,6 +83,8 @@
     "@glint/core": "^1.0.2",
     "@glint/environment-ember-loose": "^1.0.2",
     "@glint/template": "^1.0.2",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "@tsconfig/ember": "^2.0.0",
     "@types/ember__component": "^4.0.14",
     "@types/ember__destroyable": "^4.0.2",
@@ -97,7 +107,6 @@
     "prettier": "^2.8.8",
     "rollup": "^3.25.1",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.2.0",
     "typescript": "^5.1.3"
   },
   "engines": {

ember-container-query/rollup.config.mjs

@@ -1,12 +1,16 @@
 import { Addon } from '@embroider/addon-dev/rollup';
+import { babel } from '@rollup/plugin-babel';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
-import typescript from 'rollup-plugin-ts';
 
 const addon = new Addon({
   srcDir: 'src',
   destDir: 'dist',
 });
 
+// Add extensions here, such as ts, gjs, etc that you may import
+const extensions = ['.js', '.ts'];
+
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
   // You can augment this if you need to.
@@ -41,11 +45,20 @@ export default {
     // package names.
     addon.dependencies(),
 
-    // compile TypeScript to latest JavaScript, including Babel transpilation
-    typescript({
-      transpiler: 'babel',
-      browserslist: false,
-      transpileOnly: false,
+    // This babel config should *not* apply presets or compile away ES modules.
+    // It exists only to provide development niceties for you, like automatic
+    // template colocation.
+    //
+    // By default, this will load the actual babel config from the file
+    // babel.config.json.
+    babel({
+      babelHelpers: 'bundled',
+      extensions,
+    }),
+
+    // Allows rollup to resolve imports of files with the specified extensions
+    nodeResolve({
+      extensions,
     }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.

ember-container-query/src/components/container-query.hbs

@@ -1,4 +1,3 @@
-{{! @glint-ignore: ember-element-helper needs to provide Glint signature }}
 {{#let (element this.tagName) as |Tag|}}
   <Tag
     class="container-query"

ember-container-query/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "@tsconfig/ember/tsconfig.json",
   "compilerOptions": {
+    "declarationDir": "declarations",
     "skipLibCheck": true
   },
   "include": [

ember-container-query/unpublished-development-types/index.d.ts

@@ -3,11 +3,26 @@
 
 import '@glint/environment-ember-loose';
 
+import { ComponentLike, HelperLike } from '@glint/template';
+
 import EmberContainerQueryRegistry from '../src/template-registry';
 
+interface ElementHelperSignature<T extends string> {
+  Args: {
+    Positional: [name: T];
+  };
+  Return: ComponentLike<{
+    Blocks: { default: [] };
+    Element: T extends keyof HTMLElementTagNameMap
+      ? HTMLElementTagNameMap[T]
+      : Element;
+  }>;
+}
+
 declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry extends EmberContainerQueryRegistry {
     // Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
     // See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
+    element: HelperLike<ElementHelperSignature>;
   }
 }

package.json

@@ -39,10 +39,5 @@
       "enhance: documentation": "Documentation",
       "user feedback": "User Feedback"
     }
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "[email protected]": "patches/[email protected]"
-    }
   }
 }