@lblod/ember-rdfa-editor-lblod-plugins 39.0.0 → 39.1.1

package/.woodpecker/.verify-pr.yml

@@ -3,9 +3,15 @@ steps:
     image: node:22-slim
     commands:
       - npm config set ignore-scripts true
-      - npm i -g corepack@0.35
       - corepack enable
       - pnpm i --frozen-lockfile
+  check-dev-packages:
+    image: node:22-slim
+    commands:
+      - corepack enable
+      - apt-get update
+      - apt-get install -y --no-install-recommends jq
+      - "pnpm list --json | jq -e '[ .. | .version? ] | map(select(. != null)) | map(test(\"dev\")) | any | not'"
   lint-js:
     image: node:22-slim
     group: lint

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 39.1.1
+
+### Patch Changes
+
+- [#685](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/685) [`898d635`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/898d6357fe879e3ddd1df27655af07c7feea60df) Thanks [@elpoelma](https://github.com/elpoelma)! - classic `address` plugin: fix typo in `generiek` namespace
+
+- [#680](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/680) [`e91e1bd`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/e91e1bd37cf6119b1dd403abeb61d0ff3ca275ad) Thanks [@lagartoverde](https://github.com/lagartoverde)! - `insert-article` command: fix article node selection to avoid prosemirror selection warning
+
+## 39.1.0
+
+### Minor Changes
+
+- [#683](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/683) [`69858cb`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/69858cb1b537e7e7ed43adcd78bc858b21a5bab3) Thanks [@elpoelma](https://github.com/elpoelma)! - Move to glint v2
+
+### Patch Changes
+
+- [#679](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/679) [`e08902b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/e08902b088d4e649abe0f4396341e581d8949fa2) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Fix variable serialization to include label
+
+- [#684](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/684) [`9781fc2`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/9781fc21da2f4a1a1aece249ee207b0d0e8cc350) Thanks [@abeforgit](https://github.com/abeforgit)! - add ci check for dev-packages
+
 ## 39.0.0
 
 ### Major Changes

package/addon/components/lmb-plugin/search-modal.gts

@@ -211,7 +211,7 @@ export default class SearchModal extends Component<Signature> {
     this.sort = sort;
   }
   @action
-  setInputSearchText(event: InputEvent) {
+  setInputSearchText(event: Event) {
     assert(
       'inputSearchText must be bound to an input element',
       event.target instanceof HTMLInputElement,

package/addon/components/location-plugin/edit.gts

@@ -340,18 +340,18 @@ export default class LocationPluginEditComponent extends Component<Signature> {
   }
 
   @action
-  updateHousenumber(event: InputEvent) {
+  updateHousenumber(event: Event) {
     this.newHousenumber = (event.target as HTMLInputElement).value;
     this.newBusnumber = '';
   }
 
   @action
-  updateBusnumber(event: InputEvent) {
+  updateBusnumber(event: Event) {
     this.newBusnumber = (event.target as HTMLInputElement).value;
   }
 
   @action
-  updatePlaceName(event: InputEvent) {
+  updatePlaceName(event: Event) {
     this.args.setPlaceName((event.target as HTMLInputElement).value);
   }
 
@@ -434,7 +434,7 @@ export default class LocationPluginEditComponent extends Component<Signature> {
           @allowClear={{true}}
           @renderInPlace={{true}}
           @searchEnabled={{true}}
-          @search={{perform this.searchMunicipality}}
+          @search={{this.searchMunicipality.perform}}
           @selected={{this.newMunicipality}}
           @onChange={{this.selectMunicipality}}
           as |municipality|

package/addon/components/locked-placeholder-plugin/insert.gts

@@ -74,12 +74,12 @@ export default class LockedPlaceholderPluginInsert extends Component<Signature>
   }
 
   @action
-  updateKey(event: InputEvent) {
+  updateKey(event: Event) {
     this.key = (event.target as HTMLInputElement).value;
   }
 
   @action
-  updateLabel(event: InputEvent) {
+  updateLabel(event: Event) {
     this.label = (event.target as HTMLInputElement).value;
   }
 

package/addon/components/mandatee-table-plugin/configure.gts

@@ -62,7 +62,7 @@ export default class ConfigureMandateeTableComponent extends Component<Sig> {
   }
 
   @action
-  updateNodeTitle(event: InputEvent) {
+  updateNodeTitle(event: Event) {
     this.updateAttribute('title', (event.target as HTMLInputElement).value);
   }
 

package/addon/components/placeholder-utils-plugin/edit.gts

@@ -64,7 +64,7 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
   get showCard() {
     return !!this.selectedPlaceholderNode;
   }
-  updateLabelPlaceholder = (event: InputEvent) => {
+  updateLabelPlaceholder = (event: Event) => {
     this.placeholderLabel = (event.target as HTMLInputElement).value;
   };
   updatePlaceholder = () => {

package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts

@@ -152,7 +152,7 @@ export default class RoadsignsModal extends Component<Signature> {
   }
 
   @action
-  handleSearch(event: InputEvent) {
+  handleSearch(event: Event) {
     this.searchQuery = (event.target as HTMLInputElement).value;
     this.resetPagination();
   }

package/addon/components/snippet-plugin/search-modal.gts

@@ -67,7 +67,7 @@ export default class SnippetPluginSearchModalComponent extends Component<Args> {
   }
 
   @action
-  setInputSearchText(event: InputEvent) {
+  setInputSearchText(event: Event) {
     assert(
       'inputSearchText must be bound to an input element',
       event.target instanceof HTMLInputElement,

package/addon/components/structure-plugin/control-card.gts

@@ -114,7 +114,7 @@ export default class StructureControlCardComponent extends Component<Sig> {
     },
   })
   startNumber: number | null = null;
-  onStartNumberChange = (event: InputEvent) => {
+  onStartNumberChange = (event: Event) => {
     const target = event.target as HTMLInputElement;
     this.startNumber = parseInt(target.value);
   };

package/addon/components/variable-plugin/autofilled/edit.gts

@@ -102,7 +102,7 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
   }
 
   @action
-  updateAutofillKey(event: InputEvent) {
+  updateAutofillKey(event: Event) {
     this.autofillKey = (event.target as HTMLInputElement).value;
   }
 

package/addon/components/variable-plugin/autofilled/insert.gts

@@ -39,12 +39,12 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
   }
 
   @action
-  updateLabel(event: InputEvent) {
+  updateLabel(event: Event) {
     this.label = (event.target as HTMLInputElement).value;
   }
 
   @action
-  updateAutofillKey(event: InputEvent) {
+  updateAutofillKey(event: Event) {
     this.autofillKey = (event.target as HTMLInputElement).value;
   }
 

package/addon/components/variable-plugin/date/edit.gts

@@ -301,7 +301,7 @@ export class DateEditComponent extends Component<Sig> {
   }
 
   @action
-  setCustomDateFormat(event: InputEvent) {
+  setCustomDateFormat(event: Event) {
     const format = (event.target as HTMLInputElement).value;
 
     const pos = this.documentDatePos;

package/addon/components/variable-plugin/utils/label-input.gts

@@ -7,7 +7,7 @@ import { TemplateOnlyComponent } from '@ember/component/template-only';
 interface Sig {
   Args: {
     label: string;
-    updateLabel: (event: InputEvent) => void;
+    updateLabel: (event: Event) => void;
   };
 }
 

package/addon/plugins/decision-plugin/actions/insert-article.ts

@@ -99,8 +99,8 @@ export function insertArticle(
     transaction.setSelection(
       TextSelection.create(
         transaction.doc,
-        insertLocation + 1,
-        insertLocation + node.nodeSize - 1,
+        insertLocation + 2,
+        insertLocation + 3,
       ),
     );
 

package/addon/plugins/location-plugin/node.ts

@@ -28,6 +28,7 @@ import {
 import {
   hasOutgoingNamedNodeTriple,
   hasRDFaAttribute,
+  getOutgoingTriple,
   Resource,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { contentSpan } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/dom-output-spec-helpers';
@@ -239,10 +240,9 @@ const serialize =
       }
     }
     if (!contentNode) {
-      const placeholder = t(
-        'location-plugin.nodeview.placeholder',
-        'Voeg locatie in',
-      );
+      const label = getOutgoingTriple(node.attrs, EXT('label'))?.object.value;
+      const placeholder =
+        label || t('location-plugin.nodeview.placeholder', 'Voeg locatie in');
       contentNode = contentSpan({}, placeholder);
     }
     const locationAttrs = {

package/addon/plugins/variable-plugin/variables/address.ts

@@ -30,6 +30,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/variable-attribute-parsers';
 import {
   findChildWithRdfaAttribute,
+  getOutgoingTriple,
   hasOutgoingNamedNodeTriple,
   hasRDFaAttribute,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
@@ -369,10 +370,10 @@ const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
   if (value) {
     contentNode = constructAddressNode(value);
   } else {
-    const placeholder = t(
-      'editor-plugins.address.nodeview.placeholder',
-      'Voeg adres in',
-    );
+    const label = getOutgoingTriple(node.attrs, EXT('label'))?.object.value;
+    const placeholder =
+      label ||
+      t('editor-plugins.address.nodeview.placeholder', 'Voeg adres in');
     contentNode = contentSpan({}, placeholder);
   }
   return renderRdfaAware({

package/addon/plugins/variable-plugin/variables/date.ts

@@ -252,9 +252,16 @@ const serialize = (node: PNode, state: EditorState) => {
       );
     }
   } else {
-    humanReadableDate = !formatContainsTime(format)
-      ? t('date-plugin.insert.date', TRANSLATION_FALLBACKS.insertDate)
-      : t('date-plugin.insert.datetime', TRANSLATION_FALLBACKS.insertDateTime);
+    if (node.attrs['label']) {
+      humanReadableDate = node.attrs['label'] as string;
+    } else {
+      humanReadableDate = !formatContainsTime(format)
+        ? t('date-plugin.insert.date', TRANSLATION_FALLBACKS.insertDate)
+        : t(
+            'date-plugin.insert.datetime',
+            TRANSLATION_FALLBACKS.insertDateTime,
+          );
+    }
   }
   const dateAttrs = {
     class: `${getClassnamesFromNode(node)}${content ? '' : ' say-variable'}`,

package/addon/plugins/variable-plugin/variables/number.ts

@@ -218,7 +218,9 @@ const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
       humanReadableContent = content as string;
     }
   } else {
-    humanReadableContent = t('variable.number.placeholder', 'Voeg getal in');
+    humanReadableContent =
+      (node.attrs['label'] as string) ||
+      t('variable.number.placeholder', 'Voeg getal in');
   }
 
   return renderRdfaAware({

package/addon/plugins/variable-plugin/variables/person.ts

@@ -152,7 +152,8 @@ const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
     },
     content: subject
       ? [firstName, lastName].filter(Boolean).join(' ')
-      : t(
+      : node.attrs['label'] ||
+        t(
           'variable-plugin.person.nodeview-placeholder',
           TRANSLATION_FALLBACKS.nodeview_placeholder,
         ),

package/addon/utils/constants.ts

@@ -28,7 +28,7 @@ export const ADRES_TYPO = namespace(
 );
 export const ADRES = namespace('https://data.vlaanderen.be/ns/adres#', 'adres');
 export const GENERIEK = namespace(
-  'https://data.vlaanderen.be/ns/generiek/#',
+  'https://data.vlaanderen.be/ns/generiek#',
   'generiek',
 );
 export const GEO = namespace('http://www.w3.org/2003/01/geo/wgs84_pos#', 'geo');

package/declarations/addon/components/lmb-plugin/search-modal.d.ts

@@ -43,7 +43,7 @@ export default class SearchModal extends Component<Signature> {
     searchAdministrativeUnits: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (search: string) => Promise<AdministrativeUnit[]>>;
     selectAdministrativeUnit: (administrativeUnit: AdministrativeUnit) => void;
     setSort(sort: SearchSort): void;
-    setInputSearchText(event: InputEvent): void;
+    setInputSearchText(event: Event): void;
     previousPage(): void;
     nextPage(): void;
     onInsert(electee: Electee): Promise<void>;

package/declarations/addon/components/location-plugin/edit.d.ts

@@ -53,9 +53,9 @@ export default class LocationPluginEditComponent extends Component<Signature> {
     newAddress: import("reactiveweb/ember-concurrency").TaskInstance<Address | undefined>;
     selectMunicipality(municipality: string): void;
     selectStreet(street: string): void;
-    updateHousenumber(event: InputEvent): void;
-    updateBusnumber(event: InputEvent): void;
-    updatePlaceName(event: InputEvent): void;
+    updateHousenumber(event: Event): void;
+    updateBusnumber(event: Event): void;
+    updatePlaceName(event: Event): void;
     truncateAddress(value: boolean): void;
     searchMunicipality: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<string[]>>;
     searchStreet: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<(string | undefined)[]>>;

package/declarations/addon/components/locked-placeholder-plugin/insert.d.ts

@@ -17,8 +17,8 @@ export default class LockedPlaceholderPluginInsert extends Component<Signature>
     get controller(): SayController;
     get canInsert(): boolean;
     insertPlaceholder(): void;
-    updateKey(event: InputEvent): void;
-    updateLabel(event: InputEvent): void;
+    updateKey(event: Event): void;
+    updateLabel(event: Event): void;
     updateType(type: string): void;
 }
 export {};

package/declarations/addon/components/mandatee-table-plugin/configure.d.ts

@@ -20,6 +20,6 @@ export default class ConfigureMandateeTableComponent extends Component<Sig> {
     get nodeTitle(): string | undefined;
     updateAttribute(key: string, value: unknown): void;
     updateTag(tag: string): void;
-    updateNodeTitle(event: InputEvent): void;
+    updateNodeTitle(event: Event): void;
 }
 export {};

package/declarations/addon/components/placeholder-utils-plugin/edit.d.ts

@@ -25,7 +25,7 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
     get controller(): SayController;
     get selectedPlaceholderNode(): Node | null;
     get showCard(): boolean;
-    updateLabelPlaceholder: (event: InputEvent) => void;
+    updateLabelPlaceholder: (event: Event) => void;
     updatePlaceholder: () => void;
 }
 export {};

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts

@@ -45,7 +45,7 @@ export default class RoadsignsModal extends Component<Signature> {
     changeCode(value: Code): void;
     changeCodeCombination(value: Code[]): void;
     changeZonality(value: Zonality): void;
-    handleSearch(event: InputEvent): void;
+    handleSearch(event: Event): void;
     closeModal(): void;
     doFirstCodeSearch(select: Select): boolean;
     searchCodes: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<{

package/declarations/addon/components/snippet-plugin/search-modal.d.ts

@@ -19,6 +19,6 @@ export default class SnippetPluginSearchModalComponent extends Component<Args> {
     get config(): SnippetPluginConfig;
     get searchText(): string | null;
     get modalTitle(): string;
-    setInputSearchText(event: InputEvent): void;
+    setInputSearchText(event: Event): void;
 }
 export {};

package/declarations/addon/components/structure-plugin/control-card.d.ts

@@ -22,7 +22,7 @@ export default class StructureControlCardComponent extends Component<Sig> {
     removeStructure(withContent: boolean): void;
     get number(): number | undefined;
     startNumber: number | null;
-    onStartNumberChange: (event: InputEvent) => void;
+    onStartNumberChange: (event: Event) => void;
     setStartNumber: () => void;
     resetStartNumber: () => void;
 }

package/declarations/addon/components/variable-plugin/autofilled/edit.d.ts

@@ -21,7 +21,7 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
     get schema(): import("prosemirror-model").Schema<any, any>;
     get documentLanguage(): string;
     updateLabel(event: InputEvent): void;
-    updateAutofillKey(event: InputEvent): void;
+    updateAutofillKey(event: Event): void;
     updateConvertToString(value: boolean): void;
     edit(): void;
 }

package/declarations/addon/components/variable-plugin/autofilled/insert.d.ts

@@ -13,8 +13,8 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
     get documentLanguage(): string;
-    updateLabel(event: InputEvent): void;
-    updateAutofillKey(event: InputEvent): void;
+    updateLabel(event: Event): void;
+    updateAutofillKey(event: Event): void;
     updateConvertToString(value: boolean): void;
     insert(): void;
 }

package/declarations/addon/components/variable-plugin/date/edit.d.ts

@@ -44,7 +44,7 @@ export declare class DateEditComponent extends Component<Sig> {
     changeIncludeTime(includeTime: boolean): void;
     setDateFormat(dateFormat: string, custom?: boolean): void;
     setDateFormatFromKey(formatKey?: string): void;
-    setCustomDateFormat(event: InputEvent): void;
+    setCustomDateFormat(event: Event): void;
     toggleHelpModal(): void;
 }
 declare const DateEditCardComponent: TOC<Sig>;

package/declarations/addon/components/variable-plugin/utils/label-input.d.ts

@@ -2,7 +2,7 @@ import { TemplateOnlyComponent } from '@ember/component/template-only';
 interface Sig {
     Args: {
         label: string;
-        updateLabel: (event: InputEvent) => void;
+        updateLabel: (event: Event) => void;
     };
 }
 declare const LabelInput: TemplateOnlyComponent<Sig>;

package/declarations/addon/utils/constants.d.ts

@@ -11,7 +11,7 @@ export declare const DCT: <Suffix extends string = string>(s: Suffix) => import(
 export declare const MOBILITEIT: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`https://data.vlaanderen.be/ns/mobiliteit#${Suffix}`, `mobiliteit:${Suffix}`>;
 export declare const ADRES_TYPO: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`https://data.vlaanderen.be/ns/adres/${Suffix}`, `adres:${Suffix}`>;
 export declare const ADRES: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`https://data.vlaanderen.be/ns/adres#${Suffix}`, `adres:${Suffix}`>;
-export declare const GENERIEK: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`https://data.vlaanderen.be/ns/generiek/#${Suffix}`, `generiek:${Suffix}`>;
+export declare const GENERIEK: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`https://data.vlaanderen.be/ns/generiek#${Suffix}`, `generiek:${Suffix}`>;
 export declare const GEO: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`http://www.w3.org/2003/01/geo/wgs84_pos#${Suffix}`, `geo:${Suffix}`>;
 export declare const GEOSPARQL: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`http://www.opengis.net/ont/geosparql#${Suffix}`, `geosparql:${Suffix}`>;
 export declare const MANDAAT: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`http://data.vlaanderen.be/ns/mandaat#${Suffix}`, `mandaat:${Suffix}`>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "39.0.0",
+  "version": "39.1.1",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -39,16 +39,16 @@
     "lint:js:fix": "eslint . --fix",
     "lint:prettier": "prettier --check .",
     "lint:prettier:fix": "pnpm format",
-    "lint:types": "glint",
+    "lint:types": "ember-tsc --noEmit",
     "format": "prettier --write .",
     "start": "concurrently -c \"auto\" -P \"pnpm:serve {@}\" \"pnpm:typecheck\" --",
-    "typecheck": "glint --watch --preserveWatchOutput",
+    "typecheck": "ember-tsc --watch --preserveWatchOutput",
     "serve": "ember serve",
     "test": "concurrently --group pnpm:lint pnpm:test:*",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each",
     "release": "release-it",
-    "prepack": "./scripts/generate-type-declarations.sh",
+    "prepack": "ember-tsc --project tsconfig.declarations.json",
     "postpack": "rimraf declarations"
   },
   "dependencies": {
@@ -106,12 +106,9 @@
     "@gavant/glint-template-types": "^0.4.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@glint/core": "^1.5.0",
-    "@glint/ember-tsc": "^1.5.0",
-    "@glint/environment-ember-loose": "^1.5.0",
-    "@glint/environment-ember-template-imports": "^1.5.0",
-    "@lblod/ember-rdfa-editor": "13.16.0-dev.7794d286b071182b48aea581cb16221fca22c8d1",
-    "@glint/template": "^1.7.7",
+    "@glint/ember-tsc": "^1.11.6",
+    "@glint/template": "^1.9.0",
+    "@lblod/ember-rdfa-editor": "13.20.0",
     "@rdfjs/to-ntriples": "^3.0.1",
     "@rdfjs/types": "^2.0.1",
     "@release-it/keep-a-changelog": "^4.0.0",
@@ -175,7 +172,7 @@
     "rimraf": "^5.0.7",
     "sass": "^1.77.6",
     "sinon": "^17.0.1",
-    "typescript": "^5.6.2",
+    "typescript": "^6.0.3",
     "vm-browserify": "^1.1.2",
     "webpack": "^5.95.0"
   },

package/tsconfig.declarations.json

@@ -1,15 +1,11 @@
 // This is the config for generating declarations
 {
-  "extends": "./tsconfig.main.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    // glint has a bug which means that glint directive comments cause an internal error,
-    // so to get declarations we need to also emit when we get an error (which is every time)
-    // See https://github.com/typed-ember/glint/issues/599
-    "noEmitOnError": false,
+    "declaration": true,
     "declarationDir": "declarations",
     "emitDeclarationOnly": true,
-    "noEmit": false,
-    "rootDir": "."
+    "noEmit": false
   },
   "include": ["addon", "addon-test-support", "types"]
 }

package/tsconfig.json

@@ -1,11 +1,49 @@
-// This is the config for running glint in watch mode
 {
-  "extends": "./tsconfig.main.json",
   "compilerOptions": {
-    "rootDir": "."
+    "target": "es2021",
+    "module": "es2020",
+    "allowJs": true,
+    "checkJs": false,
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+    "strict": false,
+    "strictNullChecks": true,
+    "strictPropertyInitialization": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noImplicitReturns": true,
+    "noEmitOnError": false,
+    "noEmit": true,
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "rootDir": ".",
+    "skipLibCheck": true,
+    "experimentalDecorators": true,
+    "paths": {
+      "dummy/tests/*": ["./tests/*"],
+      "dummy/*": ["./tests/dummy/app/*", "./app/*"],
+      "@lblod/ember-rdfa-editor-lblod-plugins": ["./addon"],
+      "@lblod/ember-rdfa-editor-lblod-plugins/*": ["./addon/*"],
+      "@lblod/ember-rdfa-editor-lblod-plugins/test-support": [
+        "./addon-test-support"
+      ],
+      "@lblod/ember-rdfa-editor-lblod-plugins/test-support/*": [
+        "./addon-test-support/*"
+      ],
+      "*": ["./types/*"]
+    },
+    "types": ["@glint/ember-tsc/types"]
   },
-  "glint": {
-    "environment": ["ember-loose", "ember-template-imports"],
-    "checkStandaloneTemplates": false
-  }
+  "include": [
+    "app/**/*",
+    "addon/**/*",
+    "tests/**/*",
+    "types/**/*",
+    "test-support/**/*",
+    "addon-test-support/**/*"
+  ]
 }

package/declarations/addon/components/citation-plugin/citations/article-list.d.ts

@@ -1 +0,0 @@
-export {};

package/declarations/addon/components/citation-plugin/citations/legal-document-list.d.ts

@@ -1 +0,0 @@
-export {};

package/declarations/addon/components/confidentiality-plugin/toolbar.d.ts

@@ -1 +0,0 @@
-export {};

package/declarations/addon/components/table-of-contents-plugin/ember-nodes/outline.d.ts

@@ -1 +0,0 @@
-export {};

package/declarations/addon/components/worship-plugin/list.d.ts

@@ -1 +0,0 @@
-export {};

package/scripts/generate-type-declarations.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-
-# This script exists because glint does not currently respect the --project flag, so we need to
-# switch out the tsconfig.json file to generate declarations, without that configuration preventing
-# --watch from running correctly
-
-mv tsconfig.json tsconfig.watch.json
-mv tsconfig.declarations.json tsconfig.json
-
-glint --declaration
-RETURN_VAL=$?
-
-mv tsconfig.json tsconfig.declarations.json
-mv tsconfig.watch.json tsconfig.json
-
-exit $RETURN_VAL

package/tsconfig.main.json

@@ -1,51 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2021",
-    "module": "es2020",
-    "allowJs": true,
-    "checkJs": false,
-    "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "alwaysStrict": true,
-    "strictNullChecks": true,
-    "strictPropertyInitialization": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noImplicitReturns": true,
-    "noEmitOnError": false,
-    "noEmit": true,
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "baseUrl": ".",
-    "skipLibCheck": true,
-    "experimentalDecorators": true,
-    "paths": {
-      "dummy/tests/*": ["tests/*"],
-      "dummy/*": ["tests/dummy/app/*", "app/*"],
-      "@lblod/ember-rdfa-editor-lblod-plugins": ["addon"],
-      "@lblod/ember-rdfa-editor-lblod-plugins/*": ["addon/*"],
-      "@lblod/ember-rdfa-editor-lblod-plugins/test-support": [
-        "addon-test-support"
-      ],
-      "@lblod/ember-rdfa-editor-lblod-plugins/test-support/*": [
-        "addon-test-support/*"
-      ],
-      "*": ["types/*"]
-    }
-  },
-  "include": [
-    "app/**/*",
-    "addon/**/*",
-    "tests/**/*",
-    "types/**/*",
-    "test-support/**/*",
-    "addon-test-support/**/*"
-  ],
-  "glint": {
-    "environment": ["ember-loose", "ember-template-imports"],
-    "checkStandaloneTemplates": false
-  }
-}