Improve ESM configuration

Author: ark120202

src/landing/index.ts

@@ -1,6 +1,6 @@
-import * as hljs from "highlight.js/lib/highlight";
-import * as lua from "highlight.js/lib/languages/lua";
-import * as typescript from "highlight.js/lib/languages/typescript";
+import hljs from "highlight.js/lib/highlight";
+import lua from "highlight.js/lib/languages/lua";
+import typescript from "highlight.js/lib/languages/typescript";
 import "highlight.js/styles/vs2015.css";
 import "../../assets/styles/landing.scss";
 

src/playground/index.ts

@@ -1,12 +1,10 @@
-import "../../assets/styles/play.scss";
-
 import { editor } from "monaco-editor/esm/vs/editor/editor.api";
+import renderjson from "renderjson";
 import * as lua from "typescript-to-lua/dist/LuaAST";
-import TSTLWorker = require("worker-loader?name=tstl.worker.js!./tstlWorker");
-import FengariWorker = require("worker-loader?name=fengari.worker.js!./fengariWorker");
-
-const renderjson = require("renderjson");
-const tstlPackageJson = require("typescript-to-lua/package.json");
+import { version as tstlVersion } from "typescript-to-lua/package.json";
+import FengariWorker from "worker-loader?name=fengari.worker.js!./fengariWorker";
+import TSTLWorker from "worker-loader?name=tstl.worker.js!./tstlWorker";
+import "../../assets/styles/play.scss";
 
 const container = document.getElementById("editor-ts");
 const outputTerminalHeader = document.getElementById("editor-output-terminal-header");
@@ -15,7 +13,7 @@ const exampleLua = document.getElementById("editor-lua");
 const astLua = document.getElementById("editor-lua-ast");
 
 // Set tstl version
-outputTerminalHeader!.textContent = `TypescriptToLua version ${tstlPackageJson.version}`;
+outputTerminalHeader!.textContent = `TypescriptToLua version ${tstlVersion}`;
 
 // Layout stuff
 const luaTabText = document.getElementById("lua-tab-text") as HTMLDivElement | null;

src/playground/tstlWorker.ts

@@ -1,6 +1,5 @@
-import { CompilerOptions, LuaTarget, LuaLibImportKind } from "typescript-to-lua/dist/CompilerOptions";
-import * as tstl from "typescript-to-lua";
 import * as ts from "typescript";
+import * as tstl from "typescript-to-lua";
 
 onmessage = (event: MessageEvent) => {
     const result = transpileString(event.data.tsStr);
@@ -20,9 +19,9 @@ onmessage = (event: MessageEvent) => {
 
 function transpileString(
     str: string,
-    options: CompilerOptions = {
-        luaLibImport: LuaLibImportKind.Inline,
-        luaTarget: LuaTarget.Lua53,
+    options: tstl.CompilerOptions = {
+        luaLibImport: tstl.LuaLibImportKind.Inline,
+        luaTarget: tstl.LuaTarget.Lua53,
     },
 ): tstl.TranspileResult {
     const compilerHost = {

src/tsconfig.json

@@ -1,11 +1,12 @@
 {
     "compilerOptions": {
+        "module": "esnext",
+        "moduleResolution": "node",
+        "allowSyntheticDefaultImports": true,
+        "resolveJsonModule": true,
         "sourceMap": true,
-        "noImplicitAny": true,
-        "module": "commonjs",
         "target": "es5",
         "lib": ["es5", "scripthost", "dom", "webworker"],
-        "allowJs": true,
         "strict": true
     }
 }

src/types.d.ts

@@ -1,10 +1,10 @@
+declare module "fengari-web";
+declare module "highlight.js/lib/*";
+declare module "renderjson";
 declare module "worker-loader*" {
     class WebpackWorker extends Worker {
         constructor();
     }
 
     export = WebpackWorker;
 }
-
-declare module "fengari-web";
-declare module "highlight.js/lib/*";