Skip to content

Commit 2be35bc

Browse files
grilme99grilme99
committed
Merge branch 'main' into brooke/react-devtools
2 parents 3fb4c3f + 208b3e2 commit 2be35bc

File tree

93 files changed

+600
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+600
-319
lines changed

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v4
2626

27+
- name: Enable corepack
28+
run: corepack enable
29+
2730
- uses: actions/setup-node@v3
2831
with:
2932
node-version: "latest"
3033
cache: "yarn"
3134
cache-dependency-path: "yarn.lock"
3235

33-
- name: Update yarn
34-
run: yarn set version stable
35-
3636
- name: Install packages
3737
run: yarn install --immutable
3838

@@ -61,15 +61,15 @@ jobs:
6161
with:
6262
token: ${{ secrets.GITHUB_TOKEN }}
6363

64+
- name: Enable corepack
65+
run: corepack enable
66+
6467
- uses: actions/setup-node@v3
6568
with:
6669
node-version: "latest"
6770
cache: "yarn"
6871
cache-dependency-path: "yarn.lock"
6972

70-
- name: Update yarn
71-
run: yarn set version stable
72-
7373
- name: Install packages
7474
run: yarn install --immutable
7575

@@ -177,15 +177,15 @@ jobs:
177177
with:
178178
token: ${{ secrets.GITHUB_TOKEN }}
179179

180+
- name: Enable corepack
181+
run: corepack enable
182+
180183
- uses: actions/setup-node@v3
181184
with:
182185
node-version: "latest"
183186
cache: "yarn"
184187
cache-dependency-path: "yarn.lock"
185188

186-
- name: Update yarn
187-
run: yarn set version stable
188-
189189
- name: Install packages
190190
run: yarn install --immutable
191191

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
with:
2121
token: ${{ secrets.GITHUB_TOKEN }}
2222

23+
- name: Enable corepack
24+
run: corepack enable
25+
2326
- uses: actions/setup-node@v3
2427
with:
2528
node-version: "latest"
2629
cache: "yarn"
2730
cache-dependency-path: "yarn.lock"
2831

29-
- name: Update yarn
30-
run: yarn set version stable
31-
3232
- name: Install packages
3333
run: yarn install --immutable
3434

‎README.md‎

Lines changed: 34 additions & 34 deletions
Large diffs are not rendered by default.

‎aftman.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tools]
2-
rojo = "rojo-rbx/rojo@7.3.0"
3-
selene = "Kampfkarren/selene@0.26.1"
4-
stylua = "JohnnyMorganz/StyLua@0.19.1"
5-
lune = "filiptibell/lune@0.7.11"
6-
darklua = "seaofvoices/darklua@0.12.1"
2+
rojo = "rojo-rbx/rojo@7.4.4"
3+
selene = "Kampfkarren/selene@0.27.1"
4+
stylua = "JohnnyMorganz/StyLua@0.20.0"
5+
lune = "filiptibell/lune@0.8.8"
6+
darklua = "seaofvoices/darklua@0.13.1"

‎foreman.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ rojo = { source = "rojo-rbx/rojo", version = "7.3.0" }
33
selene = { source = "Kampfkarren/selene", version = "0.26.1" }
44
stylua = { source = "JohnnyMorganz/StyLua", version = "=0.15.1" }
55
wally = { github = "UpliftGames/wally", version = "=0.3.2" }
6-
luau-lsp = { github = "johnnymorganz/luau-lsp", version = "=1.23.0"}
6+
luau-lsp = { github = "johnnymorganz/luau-lsp", version = "=1.23.0" }
77
darklua = { github = "seaofvoices/darklua", version = "=0.12.1" }
88
lune = { github = "filiptibell/lune", version = "0.7.11" }

‎modules/react-cache/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@jsdotlua/react-cache",
3-
"version": "17.1.0",
3+
"version": "17.2.0",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/jsdotlua/react-lua.git",
77
"directory": "modules/react-cache"
88
},
99
"license": "MIT",
10-
"main": "src/init.lua",
10+
"main": "src/init.luau",
1111
"scripts": {
1212
"prepare": "npmluau"
1313
},

‎modules/react-debug-tools/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@jsdotlua/react-debug-tools",
3-
"version": "17.1.0",
3+
"version": "17.2.0",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/jsdotlua/react-lua.git",
77
"directory": "modules/react-debug-tools"
88
},
99
"license": "MIT",
10-
"main": "src/init.lua",
10+
"main": "src/init.luau",
1111
"scripts": {
1212
"prepare": "npmluau"
1313
},

‎modules/react-debug-tools/src/ReactDebugHooks.luau‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,7 @@ local function useReducer<S, I, A>(
292292
return state, function(action: A) end
293293
-- ROBLOX deviation END
294294
end
295-
-- ROBLOX deviation START: TS models this slightly differently, which is needed to have an initially empty ref and clear the ref, and still typecheck
296-
-- local function useRef<T>(initialValue: T): { current: T }
297-
local function useRef<T>(initialValue: T): { current: T | nil }
298-
-- ROBLOX deviation END
295+
local function useRef<T>(initialValue: T): { current: T }
299296
local hook = nextHook()
300297
local ref = if hook ~= nil then hook.memoizedState else { current = initialValue }
301298
table.insert(

‎modules/react-devtools-extensions/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@jsdotlua/react-devtools-extensions",
3-
"version": "17.1.0",
3+
"version": "17.2.0",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/jsdotlua/react-lua.git",
77
"directory": "modules/react-devtools-extensions"
88
},
99
"license": "MIT",
10-
"main": "src/init.lua",
10+
"main": "src/init.luau",
1111
"scripts": {
1212
"prepare": "npmluau"
1313
},

‎modules/react-devtools-shared/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@jsdotlua/react-devtools-shared",
3-
"version": "17.1.0",
3+
"version": "17.2.0",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/jsdotlua/react-lua.git",
77
"directory": "modules/react-devtools-shared"
88
},
99
"license": "MIT",
10-
"main": "src/init.lua",
10+
"main": "src/init.luau",
1111
"scripts": {
1212
"prepare": "npmluau"
1313
},

0 commit comments

Comments
 (0)