From e8d43c431203fe425d223b629a8c0841155d99a4 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 22 Aug 2022 16:57:36 -0700
Subject: [PATCH] Work around inability to use declaration files.

See https://github.com/microsoft/TypeScript/issues/35822
---
 org.lflang/src/lib/ts/package.json                    | 2 ++
 org.lflang/src/lib/ts/reactor-ts                      | 2 +-
 org.lflang/src/org/lflang/generator/ts/TSGenerator.kt | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json
index f8b075882c..3d7911721d 100644
--- a/org.lflang/src/lib/ts/package.json
+++ b/org.lflang/src/lib/ts/package.json
@@ -2,12 +2,14 @@
     "name": "LinguaFrancaDefault",
     "version": "0.0.1",
     "description": "A default Lingua Franca project for the TypeScript target",
+    "type": "commonjs",
     "repository": {
         "type": "git",
         "url": "https://github.com/icyphy/lingua-franca"
     },
     "license": "BSD-2-Clause",
     "dependencies": {
+        "reactor-ts": "file:../../lib/reactor-ts",
         "@types/reactor-ts": "file:../../lib/reactor-ts",
         "command-line-usage": "^6.1.0",
         "command-line-args": "^5.1.1"
diff --git a/org.lflang/src/lib/ts/reactor-ts b/org.lflang/src/lib/ts/reactor-ts
index 9a24ce4b05..6b7134bfd2 160000
--- a/org.lflang/src/lib/ts/reactor-ts
+++ b/org.lflang/src/lib/ts/reactor-ts
@@ -1 +1 @@
-Subproject commit 9a24ce4b0589e09bfc58c196736075217ff2fffa
+Subproject commit 6b7134bfd229ead4f34b074297c49b55775bf175
diff --git a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
index 5ad5945754..a67fd4ebb7 100644
--- a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
@@ -101,7 +101,7 @@ class TSGenerator(
         val RUNTIME_FILES = arrayOf("action.ts", "bank.ts", "cli.ts", "command-line-args.d.ts",
             "command-line-usage.d.ts", "component.ts", "event.ts", "federation.ts", "internal.ts",
             "reaction.ts", "reactor.ts", "microtime.d.ts", "multiport.ts", "nanotimer.d.ts", "port.ts",
-            "state.ts", "strings.ts", "time.ts", "trigger.ts", "types.ts", "ulog.d.ts", "util.ts")
+            "state.ts", "strings.ts", "time.ts", "trigger.ts", "types.ts", "ulog.d.ts", "util.ts", "index.ts")
 
         private val VG =
             ExpressionGenerator(::timeInTargetLanguage) { param -> "this.${param.name}.get()" }