Use a bundler; keep the JAR small.

This commit was made after a conversation with Marten in which I agreed to keep the dependencies out of the JAR. It was too tempting to try this out instead.
lf-lang · Aug 26, 2022 · 1825bab · 1825bab
1 parent f304413
commit 1825bab
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/org.lflang.lfc/build.gradle b/org.lflang.lfc/build.gradle
@@ -32,6 +32,10 @@ task buildLfc(dependsOn: ['setupTypescriptRuntime']) {
     apply plugin: 'application'
     apply plugin: 'com.github.johnrengelman.shadow'
     mainClassName = 'org.lflang.lfc.Main'
+    inputs.dir 'src'
+    inputs.dir '../org.lflang/src'
+    inputs.dir '../org.lflang/src-gen'
+    outputs.dir 'build'
 
     shadowJar {
         zip64 true
@@ -50,7 +54,8 @@ task buildLfc(dependsOn: ['setupTypescriptRuntime']) {
 task setupTypescriptRuntime(type: Exec) {
     workingDir '../org.lflang/src/lib/ts/reactor-ts'
     commandLine 'npm', 'install'
-    outputs.file('../org.lflang/src/lib/ts/reactor-ts/*')
+    outputs.dir('../org.lflang/src/lib/ts/reactor-ts/lib')
+    inputs.dir('../org.lflang/src/lib/ts/reactor-ts')
 }
 
 buildLfc.finalizedBy shadowJar

diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json
@@ -22,6 +22,7 @@
         "@babel/preset-typescript": "^7.8.3",
         "command-line-usage": "^6.1.0",
         "command-line-args": "^5.1.1",
+        "microtime": "^3.1.1",
         "rimraf": "^3.0.2"
     },
     "devDependencies": {

diff --git a/org.lflang/src/lib/ts/reactor-ts b/org.lflang/src/lib/ts/reactor-ts
diff --git a/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSGenerator.kt
@@ -91,7 +91,7 @@ class TSGenerator(
          */
         val CONFIG_FILES = arrayOf("package.json", "tsconfig.json", "babel.config.js", ".eslintrc.json")
 
-        val RT_CONFIG_FILES = arrayOf("package.json", "package-lock.json", "tsconfig.json", ".babelrc")
+        val RT_CONFIG_FILES = arrayOf("package.json", "tsconfig.json")
 
         private val VG =
             ExpressionGenerator(::timeInTargetLanguage) { param -> "this.${param.name}.get()" }
@@ -148,7 +148,6 @@ class TSGenerator(
 
         clean(context)
         copyRuntime()
-        buildRuntime()
         copyConfigFiles()
 
         val codeMaps = HashMap<Path, CodeMap>()
@@ -208,19 +207,21 @@ class TSGenerator(
      */
     private fun copyRuntime() {
         FileUtil.copyDirectoryFromClassPath(
-            "$LIB_PATH/reactor-ts",
-            tsFileConfig.reactorTsPath(),
+            "$LIB_PATH/reactor-ts/lib",
+            tsFileConfig.reactorTsPath().resolve("lib"),
             true
         )
-    }
-
-    private fun buildRuntime() {
-        (commandFactory.createCommand(
-            "npm",
-            listOf("install"),
-            tsFileConfig.reactorTsPath(),
-            false // only produce a warning if command is not found
-        )).run()
+        FileUtil.copyDirectoryFromClassPath(
+            "$LIB_PATH/reactor-ts/src/core/@types",
+            tsFileConfig.reactorTsPath().resolve("src/core/@types"),
+            true
+        )
+        for (configFile in RT_CONFIG_FILES) {
+            FileUtil.copyFileFromClassPath(
+                "$LIB_PATH/reactor-ts/$configFile",
+                tsFileConfig.reactorTsPath().resolve(configFile)
+            )
+        }
     }
 
     /**