Skip to content

Commit 94676b8

Browse files
ark120202ark120202
committed
Upgrade dependencies
1 parent be2ea58 commit 94676b8

File tree

12 files changed

+5167
-3049
lines changed

12 files changed

+5167
-3049
lines changed

‎docs/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To customize transpilation behavior we add a new group of options to the `tsconf
2525
| `sourceMapTraceback` | `true`, `false` (default: `false`) | Overrides Lua's `debug.traceback` to apply sourcemaps to Lua stacktraces. This will make error messages point to your original TypeScript code instead of the generated Lua. |
2626
| `luaBundle` | File path (relative to the `tsconfig.json`) | Will bundle all output lua files into a single bundle file. Requires **luaBundleEntry** to be set! |
2727
| `luaBundleEntry` | File path (relative to the `tsconfig.json`) | This should be the name/path of the TS file in your project that will serve as entry point to the bundled code. |
28-
| `luaPlugins` | `Array<{ name: string; import?: string }>` | List of [TypeScriptToLua plugins](plugins.md). |
28+
| `luaPlugins` | `Array<{ name: string; import?: string }>` | List of [TypeScriptToLua plugins](api/plugins.md). |
2929

3030
## Standard options
3131

‎docusaurus-plugin.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ module.exports = () => ({
2323
)]: require.resolve("typescript"),
2424

2525
// Exclude builtin monaco-typescript libs
26-
[require.resolve("monaco-editor/esm/vs/language/typescript/lib/lib.js")]: resolve("src/empty.ts"),
26+
[require.resolve("monaco-editor/esm/vs/language/typescript/lib/lib.js")]: resolve(
27+
"src/monaco-typescript-lib-stub.ts",
28+
),
2729
},
2830
},
2931
module: {
@@ -45,7 +47,9 @@ module.exports = () => ({
4547
},
4648
plugins: [
4749
new DefinePlugin({ __LUA_SYNTAX_KIND__: JSON.stringify(LuaSyntaxKind) }),
48-
...(isServer ? [] : [new ForkTsCheckerWebpackPlugin({ tsconfig: resolve("src/tsconfig.json") })]),
50+
...(isServer
51+
? []
52+
: [new ForkTsCheckerWebpackPlugin({ typescript: { configFile: resolve("src/tsconfig.json") } })]),
4953
],
5054
};
5155
},

‎docusaurus.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
navbar: {
1111
title: "TypeScriptToLua",
1212
logo: { src: "images/logo.png" },
13-
links: [
13+
items: [
1414
{ to: "docs/getting-started", label: "Docs", position: "left" },
1515
{ to: "play", label: "Playground", position: "left" },
1616
{ href: "https://discord.gg/BWAq58Y", label: "Discord", position: "right" },

‎package-lock.json

Lines changed: 5124 additions & 3011 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,39 @@
1212
"trailingComma": "all"
1313
},
1414
"dependencies": {
15-
"@types/d3": "^5.7.2",
15+
"@types/d3": "^5.16.3",
1616
"@types/lz-string": "^1.3.34",
17-
"@types/react": "^16.9.35",
17+
"@types/react": "^16.9.53",
1818
"@types/react-dom": "^16.9.8",
1919
"@types/react-json-tree": "^0.6.11",
20-
"@types/webpack-env": "^1.15.2",
20+
"@types/webpack-env": "^1.15.3",
2121
"clsx": "^1.1.1",
22-
"console-feed": "^3.0.0",
23-
"d3": "^5.16.0",
22+
"console-feed": "^3.1.10",
23+
"d3": "^6.2.0",
2424
"fengari-web": "^0.1.4",
2525
"lua-types": "^2.8.0",
2626
"lz-string": "^1.4.4",
27-
"monaco-editor": "^0.20.0",
28-
"react": "^16.13.1",
29-
"react-dom": "^16.13.1",
30-
"react-json-tree": "^0.11.2",
31-
"react-monaco-editor": "^0.36.0",
27+
"monaco-editor": "^0.21.2",
28+
"react": "^16.14.0",
29+
"react-dom": "^16.14.0",
30+
"react-json-tree": "^0.13.0",
31+
"react-monaco-editor": "^0.40.0",
3232
"typescript-to-lua": "^0.34.0"
3333
},
3434
"devDependencies": {
35-
"@ark120202/typescript-config": "^2.1.0",
36-
"@docusaurus/core": "^2.0.0-alpha.56",
37-
"@docusaurus/preset-classic": "^2.0.0-alpha.56",
38-
"@types/node": "^14.0.11",
39-
"file-loader": "^6.0.0",
40-
"fork-ts-checker-webpack-plugin": "^4.1.6",
41-
"null-loader": "^4.0.0",
42-
"prettier": "^2.0.5",
43-
"raw-loader": "^4.0.1",
44-
"sass": "^1.26.8",
45-
"sass-loader": "^8.0.2",
46-
"typescript": "^3.9.5",
47-
"worker-loader": "^2.0.0"
35+
"@ark120202/typescript-config": "^2.2.0",
36+
"@docusaurus/core": "^2.0.0-alpha.65",
37+
"@docusaurus/preset-classic": "^2.0.0-alpha.65",
38+
"@types/node": "^14.11.10",
39+
"file-loader": "^6.1.1",
40+
"fork-ts-checker-webpack-plugin": "^5.2.0",
41+
"null-loader": "^4.0.1",
42+
"prettier": "^2.1.2",
43+
"raw-loader": "^4.0.2",
44+
"sass": "^1.27.0",
45+
"sass-loader": "^10.0.3",
46+
"typescript": "^3.9.7",
47+
"worker-loader": "^3.0.5"
4848
},
4949
"browserslist": [
5050
"last 1 chrome version",

‎src/empty.ts

Whitespace-only changes.

‎src/monaco-typescript-lib-stub.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const libFileMap = {};

‎src/pages/benchviz/visualizations/bar-comparison-graph.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ export function barComparisonGraph(
5151
.append("rect")
5252
.attr("width", barWidth)
5353
.attr("x", (d) => xScale(d.name)! + 0.5 * bandWidth - barWidth - 1)
54-
.attr("height", (d) => barMaxHeight - yScale(d.oldValue))
55-
.attr("y", (d) => yScale(d.oldValue))
54+
.attr("height", (d) => barMaxHeight - yScale(d.oldValue)!)
55+
.attr("y", (d) => yScale(d.oldValue)!)
5656
.style("fill", COLOR_OLD);
5757
//.style("stroke", "currentColor");
5858

5959
entries
6060
.append("rect")
6161
.attr("width", barWidth)
6262
.attr("x", (d) => xScale(d.name)! + 0.5 * bandWidth + 1)
63-
.attr("height", (d) => barMaxHeight - yScale(d.newValue))
64-
.attr("y", (d) => yScale(d.newValue))
63+
.attr("height", (d) => barMaxHeight - yScale(d.newValue)!)
64+
.attr("y", (d) => yScale(d.newValue)!)
6565
.style("fill", COLOR_NEW);
6666
//.style("stroke", "currentColor");
6767

‎src/pages/benchviz/visualizations/positive-negative-bar-graph.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ export function positiveNegativeBarGraph(
3535

3636
selection
3737
.append("g")
38-
.attr("transform", `translate(0, ${yScale(0) + 5})`)
38+
.attr("transform", `translate(0, ${yScale(0)! + 5})`)
3939
.call(xAxis);
4040

4141
selection.append("g").attr("transform", `translate(${GRAPH_MARGIN.left}, ${GRAPH_MARGIN.top})`).call(yAxis);
4242

43-
const barSize = (val: number) => Math.abs(height / 2 - yScale(val));
43+
const barSize = (val: number) => Math.abs(height / 2 - yScale(val)!);
4444

4545
const bars = selection.selectAll("rect").data(data).enter();
4646

‎src/pages/play/execute/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import FengariWorker from "worker-loader?name=fengari.worker.js!./fengari.worker";
1+
import FengariWorker from "worker-loader?filename=fengari.worker.js!./fengari.worker";
22
import type { ConsoleMessage } from "./fengari.worker";
33

44
export type { ConsoleMessage };

‎src/pages/play/monaco.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import "monaco-editor/esm/vs/editor/edcore.main";
44
import "monaco-editor/esm/vs/basic-languages/lua/lua.contribution";
55
import "monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution";
66
import "monaco-editor/esm/vs/language/typescript/monaco.contribution";
7-
import EditorWorker from "worker-loader?name=editor.worker.js!monaco-editor/esm/vs/editor/editor.worker.js";
8-
import TsWorker from "worker-loader?name=ts.worker.js!./ts.worker";
7+
import EditorWorker from "worker-loader?filename=editor.worker.js!monaco-editor/esm/vs/editor/editor.worker.js";
8+
import TsWorker from "worker-loader?filename=ts.worker.js!./ts.worker";
99

1010
export { monaco };
1111

‎src/types.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ declare module "worker-loader*" {
2626
constructor();
2727
}
2828

29-
export = WebpackWorker;
29+
export default WebpackWorker;
3030
}
3131

3232
declare module "monaco-editor/esm/vs/editor/editor.worker" {
@@ -38,8 +38,8 @@ declare module "monaco-editor/esm/vs/editor/editor.worker" {
3838
}
3939

4040
declare module "monaco-editor/esm/vs/language/typescript/tsWorker" {
41-
import * as ts from "typescript";
4241
import monaco from "monaco-editor/esm/vs/editor/editor.api";
42+
import * as ts from "typescript";
4343

4444
export interface TypeScriptWorker extends monaco.languages.typescript.TypeScriptWorker {}
4545
export class TypeScriptWorker {

0 commit comments

Comments
 (0)