From f7ad42ca0bb79b3c917ad0b0554e8dd1dae1b7ad Mon Sep 17 00:00:00 2001 From: sircfenner Date: Fri, 3 Jan 2025 20:37:59 +0000 Subject: [PATCH 1/4] bump package and tool versions --- foreman.toml | 8 ++++---- package-lock.json | 50 ++++++++++++++++++++++++++--------------------- package.json | 4 ++-- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/foreman.toml b/foreman.toml index a2bc4c25..940d139 100644 --- a/foreman.toml +++ b/foreman.toml @@ -1,7 +1,7 @@ [tools] -darklua = { github = "seaofvoices/darklua", version = "=0.13.0"} -luau-lsp = { github = "JohnnyMorganz/luau-lsp", version = "=1.28.1"} -rojo = { github = "rojo-rbx/rojo", version = "=7.4.1"} +darklua = { github = "seaofvoices/darklua", version = "=0.15.0"} +luau-lsp = { github = "JohnnyMorganz/luau-lsp", version = "=1.38.0"} +rojo = { github = "rojo-rbx/rojo", version = "=7.4.4"} selene = { github = "Kampfkarren/selene", version = "=0.27.1"} -stylua = { github = "JohnnyMorganz/StyLua", version = "=0.20.0"} +stylua = { github = "JohnnyMorganz/StyLua", version = "=2.0.2"} wally = { github = "UpliftGames/wally", version = "=0.3.2" } diff --git a/package-lock.json b/package-lock.json index bf100d0..55fad0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "1.1.0", "license": "MIT", "dependencies": { - "@jsdotlua/react": "^17.1.0", - "@jsdotlua/react-roblox": "^17.1.0" + "@jsdotlua/react": "^17.2.1", + "@jsdotlua/react-roblox": "^17.2.1" }, "devDependencies": { "npmluau": "^0.1.1" @@ -72,49 +72,55 @@ }, "node_modules/@jsdotlua/promise": { "version": "3.5.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@jsdotlua/promise/-/promise-3.5.0.tgz", + "integrity": "sha512-uMwL18+wAhzJ65O9VYEsS2+ns5J/ABcY3oTASznlKdPU+syE1LK1hTy/LqEouHiDNZ1zAvmNUA3kY7oZ4/3gOw==" }, "node_modules/@jsdotlua/react": { - "version": "17.1.0", - "license": "MIT", + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/@jsdotlua/react/-/react-17.2.1.tgz", + "integrity": "sha512-hZ+z4DOKZlHr5UGgomJgD8kCiqHzR+fZyNcIw0RS9G+ADUapnyW+hCSnrxTHmPA9PFhJKvnn7a8boDyGIxd6/g==", "dependencies": { "@jsdotlua/luau-polyfill": "^1.2.6", - "@jsdotlua/shared": "^17.1.0" + "@jsdotlua/shared": "^17.2.1" } }, "node_modules/@jsdotlua/react-reconciler": { - "version": "17.1.0", - "license": "MIT", + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/@jsdotlua/react-reconciler/-/react-reconciler-17.2.1.tgz", + "integrity": "sha512-wtSXXM5Dl7YVXc8C8N50nF+P2iEM6uqWiQDpUevYgyz4G9bJomI12naWfDs5LGhtlX/Pnigxa3GiyFjnTHsCtQ==", "dependencies": { "@jsdotlua/luau-polyfill": "^1.2.6", "@jsdotlua/promise": "^3.5.0", - "@jsdotlua/react": "^17.1.0", - "@jsdotlua/scheduler": "^17.1.0", - "@jsdotlua/shared": "^17.1.0" + "@jsdotlua/react": "^17.2.1", + "@jsdotlua/scheduler": "^17.2.1", + "@jsdotlua/shared": "^17.2.1" } }, "node_modules/@jsdotlua/react-roblox": { - "version": "17.1.0", - "license": "MIT", + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/@jsdotlua/react-roblox/-/react-roblox-17.2.1.tgz", + "integrity": "sha512-C2Q6UvVvyUwlNQ2grAXx/Ou5z2zlFHB8ROUJBDZ+pLAYK43tlYa+EhLGhn7J2CLP6YtlPaXA3qaMgzz9oDyYPg==", "dependencies": { "@jsdotlua/luau-polyfill": "^1.2.6", - "@jsdotlua/react": "^17.1.0", - "@jsdotlua/react-reconciler": "^17.1.0", - "@jsdotlua/scheduler": "^17.1.0", - "@jsdotlua/shared": "^17.1.0" + "@jsdotlua/react": "^17.2.1", + "@jsdotlua/react-reconciler": "^17.2.1", + "@jsdotlua/scheduler": "^17.2.1", + "@jsdotlua/shared": "^17.2.1" } }, "node_modules/@jsdotlua/scheduler": { - "version": "17.1.0", - "license": "MIT", + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/@jsdotlua/scheduler/-/scheduler-17.2.1.tgz", + "integrity": "sha512-hTnoLYG899h3uVNPakYT6l7zCG8es+qgzxEYniaZesSA9UG+2VbKUvobXvbaargeKmr6Unm3lAryEvT+vZ5gKQ==", "dependencies": { "@jsdotlua/luau-polyfill": "^1.2.6", - "@jsdotlua/shared": "^17.1.0" + "@jsdotlua/shared": "^17.2.1" } }, "node_modules/@jsdotlua/shared": { - "version": "17.1.0", - "license": "MIT", + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/@jsdotlua/shared/-/shared-17.2.1.tgz", + "integrity": "sha512-Ot9X5Es+5ihpDWJi58K+KS09NEvequK4bJ0i8QkniYw8dDRFyBwRUPK5afy2YZyEe6i20ow7fDip4jb0HdYjcg==", "dependencies": { "@jsdotlua/luau-polyfill": "^1.2.6" } diff --git a/package.json b/package.json index 21b6e04..6c7519c 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ "verify-pack": "npm pack --dry-run" }, "dependencies": { - "@jsdotlua/react": "^17.1.0", - "@jsdotlua/react-roblox": "^17.1.0" + "@jsdotlua/react": "^17.2.1", + "@jsdotlua/react-roblox": "^17.2.1" }, "devDependencies": { "npmluau": "^0.1.1" From f6a446a55fd3c27fea98c7bd45c52e5d52e43b96 Mon Sep 17 00:00:00 2001 From: sircfenner Date: Fri, 3 Jan 2025 20:38:27 +0000 Subject: [PATCH 2/4] type fixes for latest luau-analyze --- src/Components/NumberSequencePicker/SequenceNode.luau | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/NumberSequencePicker/SequenceNode.luau b/src/Components/NumberSequencePicker/SequenceNode.luau index 62e6bda..1efa04b 100644 --- a/src/Components/NumberSequencePicker/SequenceNode.luau +++ b/src/Components/NumberSequencePicker/SequenceNode.luau @@ -21,7 +21,7 @@ local function EnvelopeHandle(props: { }) local theme = useTheme() - local dragStart = React.useRef(0) + local dragStart = React.useRef(0 :: number?) local dragOffset = React.useRef(0) local function onDragBegin(rbx: GuiObject, input: InputObject) @@ -123,7 +123,7 @@ local function SequenceNode(props: { local theme = useTheme() local mouseIcon = useMouseIcon() - local nodeDragStart = React.useRef(Vector2.zero) + local nodeDragStart = React.useRef(Vector2.zero :: Vector2?) local nodeDragOffset = React.useRef(Vector2.zero) local function onNodeDragBegin(rbx: GuiObject, input: InputObject) local pos = Vector2.new(input.Position.X, input.Position.Y) From ce8d3d18419b100788526ad658fbd57edf964892 Mon Sep 17 00:00:00 2001 From: sircfenner Date: Fri, 3 Jan 2025 20:47:07 +0000 Subject: [PATCH 3/4] update luau-analyze setup --- .luau-analyze.json | 6 ------ .vscode/settings.json | 6 +----- scripts/analyze.sh | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 .luau-analyze.json diff --git a/.luau-analyze.json b/.luau-analyze.json deleted file mode 100644 index 18c90fd..0000000 --- a/.luau-analyze.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "luau-lsp.require.mode": "relativeToFile", - "luau-lsp.require.directoryAliases": { - "@pkg": "node_modules/.luau-aliases" - } -} diff --git a/.vscode/settings.json b/.vscode/settings.json index 20bf943..4251a62 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,9 +1,5 @@ { - "luau-lsp.require.directoryAliases": { - "@pkg": "node_modules/.luau-aliases" - }, - "luau-lsp.require.mode": "relativeToFile", "luau-lsp.completion.imports.requireStyle": "alwaysRelative", - "luau-lsp.types.roblox": true, + "luau-lsp.platform.type": "roblox", "luau-lsp.sourcemap.rojoProjectFile": "model.project.json", } \ No newline at end of file diff --git a/scripts/analyze.sh b/scripts/analyze.sh index 6708e88..9dd4c39 100755 --- a/scripts/analyze.sh +++ b/scripts/analyze.sh @@ -8,6 +8,4 @@ if [ ! -f "$TYPES_FILE" ]; then curl https://raw.githubusercontent.com/JohnnyMorganz/luau-lsp/main/scripts/globalTypes.d.lua > $TYPES_FILE fi -luau-lsp analyze --base-luaurc=.luaurc --settings=.luau-analyze.json \ - --definitions=$TYPES_FILE \ - src +luau-lsp analyze --base-luaurc=.luaurc --definitions=$TYPES_FILE src From 55c2204c7ac4039f3915b7ab4547c93b4937a99c Mon Sep 17 00:00:00 2001 From: sircfenner Date: Fri, 3 Jan 2025 20:48:01 +0000 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f003270..fc1f3c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added usePlugin hook - Added RectSize, RectOffset, and ResampleMode to icon props available in Button, MainButton, and Dropdown - Fixed NumberSequencePicker error when adding 21st keypoint ([#48](https://github.com/sircfenner/StudioComponents/issues/48)) +- Bumped package and tool versions ## 1.1.0