From d9e46286f7505cc7673460bdbbb5b7acd6166ae2 Mon Sep 17 00:00:00 2001 From: Perryvw Date: Sat, 19 Mar 2022 16:03:39 +0100 Subject: [PATCH 1/2] Upgrade ts and tstl --- package-lock.json | 47 +++++++++++++++++++++++++------------ package.json | 4 ++-- src/pages/play/ts.worker.ts | 7 +++++- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index c76ae33e..bc163b24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "react-json-tree": "^0.15.0", "react-monaco-editor": "^0.43.0", "stream-browserify": "^3.0.0", - "typescript-to-lua": "1.3.3" + "typescript-to-lua": "^1.4.0" }, "devDependencies": { "@ark120202/typescript-config": "^2.2.0", @@ -42,7 +42,7 @@ "raw-loader": "^4.0.2", "sass": "^1.27.0", "sass-loader": "^12.1.0", - "typescript": "^4.3.4", + "typescript": "^4.6.2", "worker-loader": "^3.0.8" } }, @@ -10272,6 +10272,18 @@ "node": ">= 8" } }, + "node_modules/lua-types/node_modules/typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/lua-types/node_modules/typescript-to-lua": { "version": "0.39.6", "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-0.39.6.tgz", @@ -16089,9 +16101,9 @@ } }, "node_modules/typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz", + "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -16101,9 +16113,9 @@ } }, "node_modules/typescript-to-lua": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.3.3.tgz", - "integrity": "sha512-Fkt0+dLufN5CK0G/qpINY7Sb0+SNmWpov+PHhO/dq0HFoNBzR47M1SJd+hQbG92vTVFLBO4f+Np29LuVvoemMA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.4.0.tgz", + "integrity": "sha512-arOG0Aq2pky8Kzz+S5kR27PWMi0iV8Vq4NqXWp5pXHUViW1I19GX0gTtYmYffzfzfrZalSfUaP5FnJ8XTzDukA==", "dependencies": { "enhanced-resolve": "^5.8.2", "resolve": "^1.15.1", @@ -16116,7 +16128,7 @@ "node": ">=12.13.0" }, "peerDependencies": { - "typescript": "~4.5.2" + "typescript": "~4.6.2" } }, "node_modules/typescript-to-lua/node_modules/source-map": { @@ -25994,6 +26006,11 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" }, + "typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==" + }, "typescript-to-lua": { "version": "0.39.6", "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-0.39.6.tgz", @@ -30443,14 +30460,14 @@ } }, "typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==" + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz", + "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==" }, "typescript-to-lua": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.3.3.tgz", - "integrity": "sha512-Fkt0+dLufN5CK0G/qpINY7Sb0+SNmWpov+PHhO/dq0HFoNBzR47M1SJd+hQbG92vTVFLBO4f+Np29LuVvoemMA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.4.0.tgz", + "integrity": "sha512-arOG0Aq2pky8Kzz+S5kR27PWMi0iV8Vq4NqXWp5pXHUViW1I19GX0gTtYmYffzfzfrZalSfUaP5FnJ8XTzDukA==", "requires": { "enhanced-resolve": "^5.8.2", "resolve": "^1.15.1", diff --git a/package.json b/package.json index e0bfe2c8..1b8a4143 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "react-json-tree": "^0.15.0", "react-monaco-editor": "^0.43.0", "stream-browserify": "^3.0.0", - "typescript-to-lua": "1.3.3" + "typescript-to-lua": "1.4.0" }, "devDependencies": { "@ark120202/typescript-config": "^2.2.0", @@ -49,7 +49,7 @@ "raw-loader": "^4.0.2", "sass": "^1.27.0", "sass-loader": "^12.1.0", - "typescript": "^4.3.4", + "typescript": "~4.6.2", "worker-loader": "^3.0.8" }, "browserslist": [ diff --git a/src/pages/play/ts.worker.ts b/src/pages/play/ts.worker.ts index fb734a70..cd4a85ba 100644 --- a/src/pages/play/ts.worker.ts +++ b/src/pages/play/ts.worker.ts @@ -8,12 +8,17 @@ import * as tstl from "typescript-to-lua"; require("path").parse = (x: any) => x; require("path").format = (x: any) => x; -const libContext = require.context(`raw-loader!typescript-to-lua/dist/lualib`, true, /(.+)(? false, fileExists: (fileName) => ts.sys.fileExists(fileName), getCurrentDirectory: () => "", readFile: (fileName: string) => { + if (fileName.endsWith("lualib_module_info.json")) { + // Make sure this json is read as ra wfile and not as ESM JSON module. + return require("typescript-to-lua/dist/lualib/lualib_module_info.json.raw!=!raw-loader!typescript-to-lua/dist/lualib/lualib_module_info.json").default; + } + const [, featureName] = fileName.match(/\/dist\/lualib\/(.+)\.lua$/) || []; if (featureName === undefined) { throw new Error(`Unexpected file to read: ${fileName}`); From f14f171119b127afec5dfaf9259bbde1cbe4cbd3 Mon Sep 17 00:00:00 2001 From: Perryvw Date: Sat, 19 Mar 2022 16:07:09 +0100 Subject: [PATCH 2/2] Fix prettier --- src/pages/play/ts.worker.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/play/ts.worker.ts b/src/pages/play/ts.worker.ts index cd4a85ba..f7d52702 100644 --- a/src/pages/play/ts.worker.ts +++ b/src/pages/play/ts.worker.ts @@ -8,7 +8,11 @@ import * as tstl from "typescript-to-lua"; require("path").parse = (x: any) => x; require("path").format = (x: any) => x; -const libContext = require.context(`raw-loader!typescript-to-lua/dist/lualib`, true, /(.+)(? false, fileExists: (fileName) => ts.sys.fileExists(fileName), @@ -16,7 +20,8 @@ const emitHost: tstl.EmitHost = { readFile: (fileName: string) => { if (fileName.endsWith("lualib_module_info.json")) { // Make sure this json is read as ra wfile and not as ESM JSON module. - return require("typescript-to-lua/dist/lualib/lualib_module_info.json.raw!=!raw-loader!typescript-to-lua/dist/lualib/lualib_module_info.json").default; + return require("typescript-to-lua/dist/lualib/lualib_module_info.json.raw!=!raw-loader!typescript-to-lua/dist/lualib/lualib_module_info.json") + .default; } const [, featureName] = fileName.match(/\/dist\/lualib\/(.+)\.lua$/) || [];