fast-follow - apply patch

Author: github-actions

WorkspaceStatic/jest/matchers/createConsoleMatcher.lua

@@ -1,24 +1,7 @@
-<<<<<<< HEAD
 --!nonstrict
--- ROBLOX upstream: https://github.com/facebook/react/blob/6d50a9d090a2a672fc3dea5ce77a3a05332a6caa/fixtures/legacy-jsx-runtimes/setupTests.js
+-- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/fixtures/legacy-jsx-runtimes/setupTests.js
 local Packages = script.Parent.Parent.Parent.TestRunner
 local JestDiff = require(Packages.Dev.JestDiff)
-
-=======
--- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/fixtures/legacy-jsx-runtimes/setupTests.js
-local Packages --[[ ROBLOX comment: must define Packages module ]]
-local LuauPolyfill = require(Packages.LuauPolyfill)
-local Array = LuauPolyfill.Array
-local Boolean = LuauPolyfill.Boolean
-local Error = LuauPolyfill.Error
-type Object = LuauPolyfill.Object
-local RegExp = require(Packages.RegExp)
--- This is mostly copypasta from toWarnDev.js matchers
--- that we use in the main repo Jest configuration.
-local expect = global.expect
-local jestDiff = require_("jest-diff").default
-local util = require_("util")
->>>>>>> upstream-apply
 local function shouldIgnoreConsoleError(format, args)
 	-- deviation: instead of checking if `process.env.NODE_ENV ~= "production"`
 	-- we use the __DEV__ global
@@ -48,7 +31,6 @@ local function shouldIgnoreConsoleError(format, args)
 			-- // They are noisy too so we'll try to ignore them.
 			return true
 		end
-<<<<<<< HEAD
 		if
 			string.find(format, "act(...) is not supported in production builds of React")
 			== 0
@@ -60,9 +42,6 @@ local function shouldIgnoreConsoleError(format, args)
 		end
 	end
 
-=======
-	end -- Looks legit
->>>>>>> upstream-apply
 	return false
 end
 

WorkspaceStatic/jest/matchers/reactTestMatchers.lua

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
--- ROBLOX upstream: https://github.com/facebook/react/blob/v17.0.2/scripts/jest/matchers/reactTestMatchers.js
-local Packages = script.Parent.Parent.Parent.TestRunner
-=======
 -- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/scripts/jest/matchers/reactTestMatchers.js
-local Packages --[[ ROBLOX comment: must define Packages module ]]
->>>>>>> upstream-apply
+local Packages = script.Parent.Parent.Parent.TestRunner
 -- ROBLOX deviation START: fix import
 -- local LuauPolyfill = require(Packages.LuauPolyfill)
 local LuauPolyfill = require(Packages.Dev.LuauPolyfill)

WorkspaceStatic/jest/matchers/schedulerTestMatchers.lua

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
--- ROBLOX upstream: https://github.com/facebook/react/blob/v17.0.2/scripts/jest/matchers/schedulerTestMatchers.js
-local Packages = script.Parent.Parent.Parent.TestRunner
-=======
 -- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/scripts/jest/matchers/schedulerTestMatchers.js
-local Packages --[[ ROBLOX comment: must define Packages module ]]
->>>>>>> upstream-apply
+local Packages = script.Parent.Parent.Parent.TestRunner
 -- ROBLOX deviation START: fix import
 -- local LuauPolyfill = require(Packages.LuauPolyfill)
 local LuauPolyfill = require(Packages.Dev.LuauPolyfill)

modules/jest-react/src/JestReact.lua

@@ -5,13 +5,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  ]]
-<<<<<<< HEAD
 local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill")
 local Array = LuauPolyfill.Array
-=======
-local Packages --[[ ROBLOX comment: must define Packages module ]]
-local LuauPolyfill = require(Packages.LuauPolyfill)
->>>>>>> upstream-apply
 -- ROBLOX deviation START: not used
 -- local Boolean = LuauPolyfill.Boolean
 -- ROBLOX deviation END
@@ -29,18 +24,13 @@ local sharedReactSymbolsModule = require("@pkg/@jsdotlua/shared").ReactSymbols
 -- ROBLOX deviation END
 local REACT_ELEMENT_TYPE = sharedReactSymbolsModule.REACT_ELEMENT_TYPE
 local REACT_FRAGMENT_TYPE = sharedReactSymbolsModule.REACT_FRAGMENT_TYPE
-<<<<<<< HEAD
 -- ROBLOX deviation START: fix import
 -- local invariant = require("@pkg/@jsdotlua/shared").default
 local invariant = require("@pkg/@jsdotlua/shared").invariant
 -- ROBLOX deviation END
 -- ROBLOX deviation START: predeclare variables
 local jsonChildToJSXChild, jsonChildrenToJSXChildren
 -- ROBLOX deviation END
-=======
-local isArray = require(Packages.shared.isArray).default
-exports.act = require(script.Parent.internalAct).act
->>>>>>> upstream-apply
 local function captureAssertion(fn)
 	-- Trick to use a Jest matcher inside another Jest matcher. `fn` contains an
 	-- assertion; if it throws, we capture the error and return it, so the stack
@@ -86,7 +76,6 @@ local function assertYieldsWereCleared(root)
 	-- local actualYields = Scheduler:unstable_clearYields()
 	local actualYields = Scheduler.unstable_clearYields()
 	-- ROBLOX deviation END
-<<<<<<< HEAD
 	invariant(
 		-- ROBLOX deviation START: fix .length
 		-- actualYields.length == 0,
@@ -95,16 +84,6 @@ local function assertYieldsWereCleared(root)
 		"Log of yielded values is not empty. "
 			.. "Call expect(ReactTestRenderer).unstable_toHaveYielded(...) first."
 	)
-=======
-	if actualYields.length ~= 0 then
-		error(
-			Error.new(
-				"Log of yielded values is not empty. "
-					.. "Call expect(ReactTestRenderer).unstable_toHaveYielded(...) first."
-			)
-		)
-	end
->>>>>>> upstream-apply
 end
 local function unstable_toMatchRenderedOutput(root, expectedJSX)
 	assertYieldsWereCleared(root)
@@ -115,14 +94,10 @@ local function unstable_toMatchRenderedOutput(root, expectedJSX)
 	local actualJSX
 	if actualJSON == nil or typeof(actualJSON) == "string" then
 		actualJSX = actualJSON
-<<<<<<< HEAD
 		-- ROBLOX deviation START: remove toJSBoolean
 		-- elseif Boolean.toJSBoolean(Array.isArray(actualJSON)) then
 	elseif Array.isArray(actualJSON) then
 		-- ROBLOX deviation END
-=======
-	elseif Boolean.toJSBoolean(isArray(actualJSON)) then
->>>>>>> upstream-apply
 		-- ROBLOX deviation START: fix .length
 		-- if actualJSON.length == 0 then
 		if #actualJSON == 0 then

modules/react-cache/src/LRU.lua

@@ -15,8 +15,7 @@ local exports = {}
 local Scheduler = require("@pkg/@jsdotlua/scheduler")
 -- ROBLOX deviation END
 -- use dynamic dispatch for CommonJS interop named imports.
-local scheduleCallback, IdlePriority =
-	Scheduler.unstable_scheduleCallback, Scheduler.unstable_IdlePriority
+local scheduleCallback, IdlePriority = Scheduler.unstable_scheduleCallback, Scheduler.unstable_IdlePriority
 -- ROBLOX deviation START: use next_ instead
 -- type Entry<T> = { value: T, onDelete: () -> unknown, previous: Entry<T>, next: Entry<T> }
 export type Entry<T> = {
@@ -32,8 +31,7 @@ local function createLRU<T>(limit: number)
 	local cleanUp
 	-- ROBLOX deviation END
 	local LIMIT = limit -- Circular, doubly-linked list
-	local first: Entry<T> | nil --[[ ROBLOX CHECK: verify if `null` wasn't used differently than `undefined` ]] =
-		nil
+	local first: Entry<T> | nil --[[ ROBLOX CHECK: verify if `null` wasn't used differently than `undefined` ]] = nil
 	local size: number = 0
 	local cleanUpIsScheduled: boolean = false
 	local function scheduleCleanUp()

modules/react-cache/src/ReactCacheOld.lua

@@ -121,12 +121,7 @@ local lru = createLRU(CACHE_LIMIT)
 local entries: Record<Resource<any, any>, Record<number, Entry<any>>> = {}
 -- ROBLOX deviation END
 local CacheContext = React.createContext(nil)
-local function accessResult<I, K, V>(
-	resource: any,
-	fetch: (I) -> Thenable<V>,
-	input: I,
-	key: K
-): Result<V>
+local function accessResult<I, K, V>(resource: any, fetch: (I) -> Thenable<V>, input: I, key: K): Result<V>
 	-- ROBLOX deviation START: use regular indexing instead
 	-- local entriesForResource = entries:get(resource)
 	local entriesForResource = entries[resource]
@@ -143,9 +138,7 @@ local function accessResult<I, K, V>(
 	end
 	-- ROBLOX deviation START: cast as Luau doesn't narrow type on itself
 	-- local entry = entriesForResource:get(key)
-	local entriesForResource_ = (
-		entriesForResource :: Record<any, Entry<any>>
-	) :: Record<K, Entry<any>>
+	local entriesForResource_ = (entriesForResource :: Record<any, Entry<any>>) :: Record<K, Entry<any>>
 	local entry = entriesForResource_[key]
 	-- ROBLOX deviation END
 	if entry == nil then
@@ -227,20 +220,15 @@ local function unstable_createResource<
 	I,
 	K, --[[ ROBLOX CHECK: upstream type uses type constraint which is not supported by Luau ]] --[[ K: string | number ]]
 	V
->(
-	fetch: (
-		I
-	) -> Thenable<V>,
-	maybeHashInput: (
-		(I) -> K
-	)?
-): Resource<
+>(fetch: (
+	I
+) -> Thenable<V>, maybeHashInput: (
+	(I) -> K
+)?): Resource<
 	I,
 	V
 >
-	local hashInput: (I) -> K = if maybeHashInput ~= nil
-		then maybeHashInput
-		else identityHashFn :: any
+	local hashInput: (I) -> K = if maybeHashInput ~= nil then maybeHashInput else identityHashFn :: any
 	-- ROBLOX deviation START: split declaration and assignment
 	-- local resource = {
 	local resource