diff --git a/.darklua.json b/.darklua.json index 6d599d65..5cfb6426 100644 --- a/.darklua.json +++ b/.darklua.json @@ -1,5 +1,5 @@ { - "process": [ + "rules": [ { "rule": "inject_global_value", "identifier": "__DEV__", diff --git a/.styluaignore b/.styluaignore index 2c8a1314..f54fc13f 100644 --- a/.styluaignore +++ b/.styluaignore @@ -1 +1 @@ -*.snap.lua \ No newline at end of file +*.snap.luau \ No newline at end of file diff --git a/foreman.toml b/foreman.toml index 6909df9a..fef0a458 100644 --- a/foreman.toml +++ b/foreman.toml @@ -3,6 +3,6 @@ rojo = { source = "rojo-rbx/rojo", version = "7.3.0" } selene = { source = "Kampfkarren/selene", version = "0.26.1" } stylua = { source = "JohnnyMorganz/StyLua", version = "=0.15.1" } wally = { github = "UpliftGames/wally", version = "=0.3.2" } -luau-lsp = { github = "johnnymorganz/luau-lsp", version = "=1.23.0" } -darklua = { github = "seaofvoices/darklua", version = "=0.12.1" } +luau-lsp = { github = "johnnymorganz/luau-lsp", version = "=1.35.0" } +darklua = { github = "seaofvoices/darklua", version = "=0.14.0" } lune = { github = "filiptibell/lune", version = "0.7.11" } diff --git a/WorkspaceStatic/jest/matchers/__tests__/toWarnDev.spec.luau b/jest-setup/matchers/__tests__/toWarnDev.spec.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/__tests__/toWarnDev.spec.luau rename to jest-setup/matchers/__tests__/toWarnDev.spec.luau diff --git a/WorkspaceStatic/jest/matchers/createConsoleMatcher.luau b/jest-setup/matchers/createConsoleMatcher.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/createConsoleMatcher.luau rename to jest-setup/matchers/createConsoleMatcher.luau diff --git a/WorkspaceStatic/jest/matchers/interactionTracingMatchers.luau b/jest-setup/matchers/interactionTracingMatchers.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/interactionTracingMatchers.luau rename to jest-setup/matchers/interactionTracingMatchers.luau diff --git a/WorkspaceStatic/jest/matchers/reactTestMatchers.luau b/jest-setup/matchers/reactTestMatchers.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/reactTestMatchers.luau rename to jest-setup/matchers/reactTestMatchers.luau diff --git a/WorkspaceStatic/jest/matchers/schedulerTestMatchers.luau b/jest-setup/matchers/schedulerTestMatchers.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/schedulerTestMatchers.luau rename to jest-setup/matchers/schedulerTestMatchers.luau diff --git a/WorkspaceStatic/jest/matchers/toErrorDev.luau b/jest-setup/matchers/toErrorDev.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/toErrorDev.luau rename to jest-setup/matchers/toErrorDev.luau diff --git a/WorkspaceStatic/jest/matchers/toLogDev.luau b/jest-setup/matchers/toLogDev.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/toLogDev.luau rename to jest-setup/matchers/toLogDev.luau diff --git a/WorkspaceStatic/jest/matchers/toWarnDev.luau b/jest-setup/matchers/toWarnDev.luau similarity index 100% rename from WorkspaceStatic/jest/matchers/toWarnDev.luau rename to jest-setup/matchers/toWarnDev.luau diff --git a/WorkspaceStatic/jest/testSetupFile.luau b/jest-setup/testSetupFile.luau similarity index 100% rename from WorkspaceStatic/jest/testSetupFile.luau rename to jest-setup/testSetupFile.luau diff --git a/WorkspaceStatic/jest.config.luau b/jest.config.luau similarity index 100% rename from WorkspaceStatic/jest.config.luau rename to jest.config.luau diff --git a/modules/jest-react/package.json b/modules/jest-react/package.json new file mode 100644 index 00000000..6e550f39 --- /dev/null +++ b/modules/jest-react/package.json @@ -0,0 +1,22 @@ +{ + "name": "@jsdotlua/jest-react", + "version": "17.2.0", + "repository": { + "type": "git", + "url": "https://github.com/jsdotlua/react-lua.git", + "directory": "modules/jest-react" + }, + "license": "MIT", + "main": "src/init.luau", + "scripts": { + "prepare": "npmluau" + }, + "dependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/luau-polyfill": "^1.2.6", + "@jsdotlua/shared": "workspace:^" + }, + "devDependencies": { + "npmluau": "^0.1.0" + } +} diff --git a/modules/react-cache/package.json b/modules/react-cache/package.json index 92452695..f9a7b041 100644 --- a/modules/react-cache/package.json +++ b/modules/react-cache/package.json @@ -18,6 +18,10 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/jest-react": "workspace:^", + "@jsdotlua/promise": "^3.5.0", + "@jsdotlua/react-test-renderer": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react-cache/src/__tests__/ReactCacheOld-internal.spec.luau b/modules/react-cache/src/__tests__/ReactCacheOld-internal.spec.luau index e2a236e4..10485cd2 100644 --- a/modules/react-cache/src/__tests__/ReactCacheOld-internal.spec.luau +++ b/modules/react-cache/src/__tests__/ReactCacheOld-internal.spec.luau @@ -52,7 +52,7 @@ describe("ReactCache", function() Suspense = React.Suspense -- ROBLOX deviation START: fix require -- ReactCache = require_("react-cache") - ReactCache = require(".") + ReactCache = require("..") -- ROBLOX deviation END createResource = ReactCache.unstable_createResource -- ROBLOX deviation START: fix requires diff --git a/modules/react-debug-tools/package.json b/modules/react-debug-tools/package.json index 8c51f017..275890e3 100644 --- a/modules/react-debug-tools/package.json +++ b/modules/react-debug-tools/package.json @@ -17,6 +17,11 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/promise": "^3.5.0", + "@jsdotlua/react": "workspace:^", + "@jsdotlua/react-test-renderer": "workspace:^", + "@jsdotlua/scheduler": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react-debug-tools/src/__tests__/ReactDevToolsHooksIntegration.spec.luau b/modules/react-debug-tools/src/__tests__/ReactDevToolsHooksIntegration.spec.luau index 9f2fc835..52f6f3c4 100644 --- a/modules/react-debug-tools/src/__tests__/ReactDevToolsHooksIntegration.spec.luau +++ b/modules/react-debug-tools/src/__tests__/ReactDevToolsHooksIntegration.spec.luau @@ -8,7 +8,6 @@ * @emails react-core * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") -- ROBLOX deviation START: not needed -- local Boolean = LuauPolyfill.Boolean diff --git a/modules/react-debug-tools/src/__tests__/ReactHooksInspection.spec.luau b/modules/react-debug-tools/src/__tests__/ReactHooksInspection.spec.luau index 23520f81..a6352c2b 100644 --- a/modules/react-debug-tools/src/__tests__/ReactHooksInspection.spec.luau +++ b/modules/react-debug-tools/src/__tests__/ReactHooksInspection.spec.luau @@ -8,7 +8,6 @@ * @emails react-core * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent -- ROBLOX deviation START: not needed -- local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") -- local Boolean = LuauPolyfill.Boolean diff --git a/modules/react-devtools-extensions/package.json b/modules/react-devtools-extensions/package.json index 970c2947..fb40f3eb 100644 --- a/modules/react-devtools-extensions/package.json +++ b/modules/react-devtools-extensions/package.json @@ -19,6 +19,8 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/react-test-renderer": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react-devtools-shared/package.json b/modules/react-devtools-shared/package.json index 22f60625..28866265 100644 --- a/modules/react-devtools-shared/package.json +++ b/modules/react-devtools-shared/package.json @@ -21,6 +21,10 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/promise": "^3.5.0", + "@jsdotlua/react-test-renderer": "workspace:^", + "@jsdotlua/scheduler": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react-devtools-shared/src/__tests__/bridge.spec.luau b/modules/react-devtools-shared/src/__tests__/bridge.spec.luau index 586a5995..c94037b4 100644 --- a/modules/react-devtools-shared/src/__tests__/bridge.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/bridge.spec.luau @@ -5,7 +5,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local describe = JestGlobals.describe local it = JestGlobals.it @@ -19,7 +18,7 @@ describe("bridge", function() beforeEach(function() jest.resetModules() jest.useFakeTimers() - Bridge = require("./bridge") + Bridge = require("../bridge") end) it("should shutdown properly", function() diff --git a/modules/react-devtools-shared/src/__tests__/console.spec.luau b/modules/react-devtools-shared/src/__tests__/console.spec.luau index 23279e5f..1e871aa1 100644 --- a/modules/react-devtools-shared/src/__tests__/console.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/console.spec.luau @@ -5,7 +5,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local describe = JestGlobals.describe local xit = JestGlobals.xit diff --git a/modules/react-devtools-shared/src/__tests__/events.spec.luau b/modules/react-devtools-shared/src/__tests__/events.spec.luau index 353d8f1d..8a0fbb29 100644 --- a/modules/react-devtools-shared/src/__tests__/events.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/events.spec.luau @@ -8,7 +8,6 @@ -- * @flow -- */ -local Packages = script.Parent.Parent.Parent local Error = require("@pkg/@jsdotlua/luau-polyfill").Error local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local describe = JestGlobals.describe @@ -21,7 +20,7 @@ describe("events", function() local dispatcher beforeEach(function() jest.resetModules() - local EventEmitter = require("./events") + local EventEmitter = require("../events") dispatcher = EventEmitter.new() end) diff --git a/modules/react-devtools-shared/src/__tests__/profilerStore.spec.luau b/modules/react-devtools-shared/src/__tests__/profilerStore.spec.luau index 2245d2dd..83c6db0d 100644 --- a/modules/react-devtools-shared/src/__tests__/profilerStore.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/profilerStore.spec.luau @@ -9,7 +9,6 @@ * @flow ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jest = JestGlobals.jest local jestExpect = JestGlobals.expect @@ -17,7 +16,7 @@ local xdescribe = JestGlobals.xdescribe local it = JestGlobals.it local beforeEach = JestGlobals.beforeEach -local devtoolsTypes = require("./devtools/types") +local devtoolsTypes = require("../devtools/types") type Store = devtoolsTypes.Store local global = _G diff --git a/modules/react-devtools-shared/src/__tests__/profilingCache.spec.luau b/modules/react-devtools-shared/src/__tests__/profilingCache.spec.luau index 2b57b1ef..b86ed138 100644 --- a/modules/react-devtools-shared/src/__tests__/profilingCache.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/profilingCache.spec.luau @@ -8,8 +8,6 @@ * * @flow ]] - -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local xdescribe = JestGlobals.xdescribe @@ -21,13 +19,13 @@ local afterEach = JestGlobals.afterEach local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Error = LuauPolyfill.Error -local Bridge = require("./bridge") +local Bridge = require("../bridge") type FrontendBridge = Bridge.FrontendBridge -local devtoolsTypes = require("./devtools/types") +local devtoolsTypes = require("../devtools/types") type Store = devtoolsTypes.Store -local ProfilerTypes = require("./devtools/views/Profiler/types") +local ProfilerTypes = require("../devtools/views/Profiler/types") type ProfilingDataFrontend = ProfilerTypes.ProfilingDataFrontend local global = _G diff --git a/modules/react-devtools-shared/src/__tests__/profilingCharts.spec.luau b/modules/react-devtools-shared/src/__tests__/profilingCharts.spec.luau index 8b486ab1..1ece090f 100644 --- a/modules/react-devtools-shared/src/__tests__/profilingCharts.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/profilingCharts.spec.luau @@ -9,7 +9,6 @@ * @flow ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local xdescribe = JestGlobals.xdescribe local beforeEach = JestGlobals.beforeEach @@ -18,7 +17,7 @@ local describe = JestGlobals.describe local it = JestGlobals.it local jestExpect = JestGlobals.expect -local devtoolsTypes = require("./devtools/types") +local devtoolsTypes = require("../devtools/types") type Store = devtoolsTypes.Store xdescribe("profiling charts", function() diff --git a/modules/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder.spec.luau b/modules/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder.spec.luau index 0924d485..a18e248b 100644 --- a/modules/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/profilingCommitTreeBuilder.spec.luau @@ -10,14 +10,13 @@ * @flow ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local xdescribe = JestGlobals.xdescribe local beforeEach = JestGlobals.beforeEach local it = JestGlobals.it local jestExpect = JestGlobals.expect -local devtoolsTypes = require("./devtools/types") +local devtoolsTypes = require("../devtools/types") type Store = devtoolsTypes.Store local global = _G diff --git a/modules/react-devtools-shared/src/__tests__/profilingUtils.spec.luau b/modules/react-devtools-shared/src/__tests__/profilingUtils.spec.luau index 467735b1..cd9dc393 100644 --- a/modules/react-devtools-shared/src/__tests__/profilingUtils.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/profilingUtils.spec.luau @@ -8,7 +8,6 @@ * @flow ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe @@ -18,7 +17,7 @@ local beforeEach = JestGlobals.beforeEach describe("profiling utils", function() local utils beforeEach(function() - utils = require("./devtools/views/Profiler/utils") + utils = require("../devtools/views/Profiler/utils") end) it("should throw if importing older/unsupported data", function() jestExpect(function() diff --git a/modules/react-devtools-shared/src/__tests__/setupTests.luau b/modules/react-devtools-shared/src/__tests__/setupTests.luau index 5dbc6aa6..910a0dff 100644 --- a/modules/react-devtools-shared/src/__tests__/setupTests.luau +++ b/modules/react-devtools-shared/src/__tests__/setupTests.luau @@ -37,12 +37,12 @@ beforeEach(function() -- rather than imported at the head of the module. -- That's because we reset modules between tests, -- which disconnects the DevTool's cache from the current dispatcher ref. - local Agent = require("./backend/agent") - local initBackend = require("./backend").initBackend - local Bridge = require("./bridge") - local Store = require("./devtools/store") - local installHook = require("./hook").installHook - local utils = require("./utils") + local Agent = require("../backend/agent") + local initBackend = require("../backend").initBackend + local Bridge = require("../bridge") + local Store = require("../devtools/store") + local installHook = require("../hook").installHook + local utils = require("../utils") local getDefaultComponentFilters = utils.getDefaultComponentFilters local saveComponentFilters = utils.saveComponentFilters diff --git a/modules/react-devtools-shared/src/__tests__/store.spec.luau b/modules/react-devtools-shared/src/__tests__/store.spec.luau index bd8c63db..6bd9f481 100644 --- a/modules/react-devtools-shared/src/__tests__/store.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/store.spec.luau @@ -16,7 +16,6 @@ local fill = function(count, value) return output end -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jest = JestGlobals.jest local jestExpect = JestGlobals.expect @@ -36,7 +35,7 @@ type Array = { [number]: T } local ReactRoblox local React -- ROBLOX deviation: bring in the Agent type -local Agent = require("./backend/agent") +local Agent = require("../backend/agent") type Agent = Agent.Agent describe("Store", function() @@ -54,8 +53,8 @@ describe("Store", function() React = require("@pkg/@jsdotlua/react") jest.resetModules() ReactRoblox = require("@pkg/@jsdotlua/react-roblox") - devtoolsUtils = require("./devtools/utils") - constants = require("./constants") + devtoolsUtils = require("../devtools/utils") + constants = require("../constants") jest.useFakeTimers() diff --git a/modules/react-devtools-shared/src/__tests__/storeComponentFilters.spec.luau b/modules/react-devtools-shared/src/__tests__/storeComponentFilters.spec.luau index d8299c53..2899e4c8 100644 --- a/modules/react-devtools-shared/src/__tests__/storeComponentFilters.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/storeComponentFilters.spec.luau @@ -10,7 +10,6 @@ ]] type Function = (...any) -> ...any -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jest = JestGlobals.jest local describe = JestGlobals.describe @@ -20,9 +19,9 @@ local jestExpect = JestGlobals.expect local global = _G -local bridgeModule = require("./bridge") +local bridgeModule = require("../bridge") type FrontendBridge = bridgeModule.FrontendBridge -local devtoolsTypes = require("./devtools/types") +local devtoolsTypes = require("../devtools/types") type Store = devtoolsTypes.Store describe("Store component filters", function() @@ -55,9 +54,9 @@ describe("Store component filters", function() React = require("@pkg/@jsdotlua/react") ReactRoblox = require("@pkg/@jsdotlua/react-roblox") - Types = require("./types") + Types = require("../types") utils = require("./utils") - devtoolsUtils = require("./devtools/utils") + devtoolsUtils = require("../devtools/utils") end) it("should throw if filters are updated while profiling", function() diff --git a/modules/react-devtools-shared/src/__tests__/storeOwners.spec.luau b/modules/react-devtools-shared/src/__tests__/storeOwners.spec.luau index 662960e9..98b013b5 100644 --- a/modules/react-devtools-shared/src/__tests__/storeOwners.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/storeOwners.spec.luau @@ -9,7 +9,6 @@ * @flow ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe @@ -38,7 +37,7 @@ describeIfDev("Store owners list", function() Boolean = LuauPolyfill.Boolean React = require("@pkg/@jsdotlua/react") ReactRoblox = require("@pkg/@jsdotlua/react-roblox") - devtoolsUtils = require("./devtools/utils") + devtoolsUtils = require("../devtools/utils") printOwnersList = devtoolsUtils.printOwnersList local utils = require("./utils") diff --git a/modules/react-devtools-shared/src/__tests__/utils.luau b/modules/react-devtools-shared/src/__tests__/utils.luau index 90068540..5ef3db85 100644 --- a/modules/react-devtools-shared/src/__tests__/utils.luau +++ b/modules/react-devtools-shared/src/__tests__/utils.luau @@ -21,13 +21,13 @@ type Function = (...any) -> any? local global = _G local exports = {} -local Bridge = require("./bridge") +local Bridge = require("../bridge") type FrontendBridge = Bridge.FrontendBridge -local devtoolsTypes = require("./devtools/types") +local devtoolsTypes = require("../devtools/types") type Store = devtoolsTypes.Store -local ProfilerTypes = require("./devtools/views/Profiler/types") +local ProfilerTypes = require("../devtools/views/Profiler/types") type ProfilingDataFrontend = ProfilerTypes.ProfilingDataFrontend -local Types = require("./types") +local Types = require("../types") type ElementType = Types.ElementType exports.act = function(callback: () -> ()): () @@ -198,7 +198,7 @@ exports.requireTestRenderer = function(): any end exports.exportImportHelper = function(bridge: FrontendBridge, store: Store): () - local utils = require("./devtools/views/Profiler/utils") + local utils = require("../devtools/views/Profiler/utils") local prepareProfilingDataExport = utils.prepareProfilingDataExport local prepareProfilingDataFrontendFromExport = utils.prepareProfilingDataFrontendFromExport diff --git a/modules/react-devtools-shared/src/__tests__/utils.spec.luau b/modules/react-devtools-shared/src/__tests__/utils.spec.luau index a7e0cde8..4e72df8f 100644 --- a/modules/react-devtools-shared/src/__tests__/utils.spec.luau +++ b/modules/react-devtools-shared/src/__tests__/utils.spec.luau @@ -7,7 +7,6 @@ -- * -- * @flow -- */ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe @@ -17,7 +16,7 @@ local beforeEach = JestGlobals.beforeEach local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Symbol = LuauPolyfill.Symbol -local utils = require("./utils") +local utils = require("../utils") local getDisplayName = utils.getDisplayName local getDisplayNameForReactElement = utils.getDisplayNameForReactElement local SuspenseList, StrictMode diff --git a/modules/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.luau b/modules/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.luau index 00a388ac..fdb61e64 100644 --- a/modules/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.luau +++ b/modules/react-devtools-shared/src/devtools/views/Profiler/FlamegraphChartBuilder.luau @@ -18,7 +18,7 @@ type Set = LuauPolyfill.Set local exports = {} -local devtoolsTypes = require("./types") +local devtoolsTypes = require("../../types") type ProfilerStore = devtoolsTypes.ProfilerStore local formatDuration = require("./utils").formatDuration diff --git a/modules/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.luau b/modules/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.luau index 7b36bf05..3593b9b6 100644 --- a/modules/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.luau +++ b/modules/react-devtools-shared/src/devtools/views/Profiler/InteractionsChartBuilder.luau @@ -16,7 +16,7 @@ type Array = LuauPolyfill.Array local exports = {} -local devtoolsTypes = require("./types") +local devtoolsTypes = require("../../types") type ProfilerStore = devtoolsTypes.ProfilerStore local typesModule = require("./types") type Interaction = typesModule.Interaction diff --git a/modules/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.luau b/modules/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.luau index 6712ed81..e2418128 100644 --- a/modules/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.luau +++ b/modules/react-devtools-shared/src/devtools/views/Profiler/RankedChartBuilder.luau @@ -18,10 +18,10 @@ type Set = LuauPolyfill.Set local exports = {} -local devtoolsTypes = require("./types") +local devtoolsTypes = require("../../types") type ProfilerStore = devtoolsTypes.ProfilerStore -local typesModule = require("./types") +local typesModule = require("../../../types") local ElementTypeForwardRef = typesModule.ElementTypeForwardRef local ElementTypeMemo = typesModule.ElementTypeMemo local formatDuration = require("./utils").formatDuration diff --git a/modules/react-is/package.json b/modules/react-is/package.json index 79df6fa1..0180dd03 100644 --- a/modules/react-is/package.json +++ b/modules/react-is/package.json @@ -15,6 +15,11 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/luau-polyfill": "^1.2.6", + "@jsdotlua/promise": "^3.5.0", + "@jsdotlua/react": "workspace:^", + "@jsdotlua/react-roblox": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react-noop-renderer/package(placeholder).json b/modules/react-noop-renderer/package.json similarity index 92% rename from modules/react-noop-renderer/package(placeholder).json rename to modules/react-noop-renderer/package.json index 72c39848..3835264f 100644 --- a/modules/react-noop-renderer/package(placeholder).json +++ b/modules/react-noop-renderer/package.json @@ -12,6 +12,7 @@ "prepare": "npmluau" }, "dependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", "@jsdotlua/luau-polyfill": "^1.2.6", "@jsdotlua/react-reconciler": "workspace:^", "@jsdotlua/scheduler": "workspace:^", diff --git a/modules/react-reconciler/package.json b/modules/react-reconciler/package.json index 5d631439..d1663a48 100644 --- a/modules/react-reconciler/package.json +++ b/modules/react-reconciler/package.json @@ -19,6 +19,13 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/jest-react": "workspace:^", + "@jsdotlua/react-cache": "workspace:^", + "@jsdotlua/react-devtools-shared": "workspace:^", + "@jsdotlua/react-noop-renderer": "workspace:^", + "@jsdotlua/react-roblox": "workspace:^", + "@jsdotlua/react-test-renderer": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react-reconciler/src/__tests__/DebugTracing-test.internal.spec.luau b/modules/react-reconciler/src/__tests__/DebugTracing-test.internal.spec.luau index e57285b1..09490a0a 100644 --- a/modules/react-reconciler/src/__tests__/DebugTracing-test.internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/DebugTracing-test.internal.spec.luau @@ -29,7 +29,6 @@ -- originalObjects = nil -- end -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local describe = JestGlobals.describe local beforeEach = JestGlobals.beforeEach diff --git a/modules/react-reconciler/src/__tests__/ReactClassSetStateCallback.spec.luau b/modules/react-reconciler/src/__tests__/ReactClassSetStateCallback.spec.luau index 358232b0..5c2fe755 100644 --- a/modules/react-reconciler/src/__tests__/ReactClassSetStateCallback.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactClassSetStateCallback.spec.luau @@ -10,7 +10,6 @@ ]] --[[ eslint-disable no-func-assign ]] -local Packages = script.Parent.Parent.Parent local React local ReactNoop diff --git a/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.roblox.spec.luau b/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.roblox.spec.luau index d5368d73..92a1fd62 100644 --- a/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.roblox.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.roblox.spec.luau @@ -17,7 +17,7 @@ ]] local HttpService = game:GetService("HttpService") -local Packages = script.Parent.Parent.Parent + local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe diff --git a/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.spec.luau b/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.spec.luau index 717213e0..4bf8c0a6 100644 --- a/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactComponentLifeCycle.spec.luau @@ -15,7 +15,7 @@ * some cases. Better to just block all updates in initialization. ]] local HttpService = game:GetService("HttpService") -local Packages = script.Parent.Parent.Parent + local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jest = JestGlobals.jest local jestExpect = JestGlobals.expect diff --git a/modules/react-reconciler/src/__tests__/ReactErrorBoundaries-internal.spec.luau b/modules/react-reconciler/src/__tests__/ReactErrorBoundaries-internal.spec.luau index 87d2dfaf..082b9f14 100644 --- a/modules/react-reconciler/src/__tests__/ReactErrorBoundaries-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactErrorBoundaries-internal.spec.luau @@ -7,7 +7,6 @@ -- * @emails react-core -- */ --!strict -local Packages = script.Parent.Parent.Parent -- local PropTypes local React diff --git a/modules/react-reconciler/src/__tests__/ReactFiberComponentStack.roblox.spec.luau b/modules/react-reconciler/src/__tests__/ReactFiberComponentStack.roblox.spec.luau index 506bb13d..2b3fe28f 100644 --- a/modules/react-reconciler/src/__tests__/ReactFiberComponentStack.roblox.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactFiberComponentStack.roblox.spec.luau @@ -1,4 +1,3 @@ -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Error = LuauPolyfill.Error local JestGlobals = require("@pkg/@jsdotlua/jest-globals") @@ -7,7 +6,7 @@ local describe = JestGlobals.describe local beforeEach = JestGlobals.beforeEach local it = JestGlobals.it local jest = JestGlobals.jest -local ReactInternalTypes = require("./ReactInternalTypes") +local ReactInternalTypes = require("../ReactInternalTypes") type Fiber = ReactInternalTypes.Fiber local ReactFiberComponentStack @@ -15,7 +14,7 @@ local ReactFiberComponentStack describe("ReactFiberComponentStack", function() beforeEach(function() jest.resetModules() - ReactFiberComponentStack = require("./ReactFiberComponentStack") + ReactFiberComponentStack = require("../ReactFiberComponentStack") end) it("given a nil fiber then it gives correct error message", function() diff --git a/modules/react-reconciler/src/__tests__/ReactFiberContext-internal.spec.luau b/modules/react-reconciler/src/__tests__/ReactFiberContext-internal.spec.luau index 73e90c02..e9681c6f 100644 --- a/modules/react-reconciler/src/__tests__/ReactFiberContext-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactFiberContext-internal.spec.luau @@ -9,7 +9,6 @@ * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -25,9 +24,9 @@ local ReactFeatureFlags beforeEach(function() jest.resetModules() - ReactFiberContext = require("./ReactFiberContext.new.luau") - ReactFiber = require("./ReactFiber.new.luau") - ReactRootTags = require("./ReactRootTags") + ReactFiberContext = require("../ReactFiberContext.new.luau") + ReactFiber = require("../ReactFiber.new.luau") + ReactRootTags = require("../ReactRootTags") ReactFeatureFlags = require("@pkg/@jsdotlua/shared").ReactFeatureFlags ReactFeatureFlags.disableLegacyContext = false end) diff --git a/modules/react-reconciler/src/__tests__/ReactFiberDevToolsHook-internal.spec.luau b/modules/react-reconciler/src/__tests__/ReactFiberDevToolsHook-internal.spec.luau index eeb85dbe..ac12fda0 100644 --- a/modules/react-reconciler/src/__tests__/ReactFiberDevToolsHook-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactFiberDevToolsHook-internal.spec.luau @@ -9,7 +9,6 @@ * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local beforeEach = JestGlobals.beforeEach @@ -26,8 +25,8 @@ local ReactFiberDevToolsHook, ReactDevtoolsShared beforeEach(function() jest.resetModules() - ReactFiberDevToolsHook = require("./ReactFiberDevToolsHook.new.luau") - ReactDevtoolsShared = require("@dev-packages/ReactDevtoolsShared") + ReactFiberDevToolsHook = require("../ReactFiberDevToolsHook.new.luau") + ReactDevtoolsShared = require("@pkg/@jsdotlua/react-devtools-shared") end) describe("DevTools hook detection", function() diff --git a/modules/react-reconciler/src/__tests__/ReactFiberHostContext-internal.spec.luau b/modules/react-reconciler/src/__tests__/ReactFiberHostContext-internal.spec.luau index 8f165cb3..8a0d65f8 100644 --- a/modules/react-reconciler/src/__tests__/ReactFiberHostContext-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactFiberHostContext-internal.spec.luau @@ -9,7 +9,6 @@ * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -25,8 +24,8 @@ describe("ReactFiberHostContext", function() beforeEach(function() jest.resetModules() React = require("@pkg/@jsdotlua/react") - ReactFiberReconciler = require(".") - ConcurrentRoot = require("./ReactRootTags") + ReactFiberReconciler = require("..") + ConcurrentRoot = require("../ReactRootTags") end) it("works with nil host context", function() diff --git a/modules/react-reconciler/src/__tests__/ReactFiberRoot.roblox.spec.luau b/modules/react-reconciler/src/__tests__/ReactFiberRoot.roblox.spec.luau index 3d077077..c31916db 100644 --- a/modules/react-reconciler/src/__tests__/ReactFiberRoot.roblox.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactFiberRoot.roblox.spec.luau @@ -9,7 +9,6 @@ * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -22,8 +21,8 @@ local ReactRootTags beforeEach(function() jest.resetModules() - ReactFiberRoot = require("./ReactFiberRoot.new.luau") - ReactRootTags = require("./ReactRootTags") + ReactFiberRoot = require("../ReactFiberRoot.new.luau") + ReactRootTags = require("../ReactRootTags") end) it("should properly initialize a fiber created with createFiberRoot", function() diff --git a/modules/react-reconciler/src/__tests__/ReactFiberStack-test.roblox.spec.luau b/modules/react-reconciler/src/__tests__/ReactFiberStack-test.roblox.spec.luau index 64a65cec..696d21c5 100644 --- a/modules/react-reconciler/src/__tests__/ReactFiberStack-test.roblox.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactFiberStack-test.roblox.spec.luau @@ -1,4 +1,3 @@ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe @@ -11,7 +10,7 @@ local ReactFiberStack describe("ReactFiberStack", function() beforeEach(function() jest.resetModules() - ReactFiberStack = require("./ReactFiberStack.new.luau") + ReactFiberStack = require("../ReactFiberStack.new.luau") end) it("creates a cursor with the given default value", function() diff --git a/modules/react-reconciler/src/__tests__/ReactFiberSuspenseContext.roblox.spec.luau b/modules/react-reconciler/src/__tests__/ReactFiberSuspenseContext.roblox.spec.luau index 24dab0b0..f8aa4af0 100644 --- a/modules/react-reconciler/src/__tests__/ReactFiberSuspenseContext.roblox.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactFiberSuspenseContext.roblox.spec.luau @@ -1,18 +1,17 @@ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest local beforeEach = JestGlobals.beforeEach local describe = JestGlobals.describe local it = JestGlobals.it -local ReactFiber = require("./ReactFiber.new.luau") +local ReactFiber = require("../ReactFiber.new.luau") local ReactFiberSuspenseContext describe("ReactFiberSuspenseContext", function() beforeEach(function() jest.resetModules() - ReactFiberSuspenseContext = require("./ReactFiberSuspenseContext.new.luau") + ReactFiberSuspenseContext = require("../ReactFiberSuspenseContext.new.luau") end) describe("suspense context stack", function() diff --git a/modules/react-reconciler/src/__tests__/ReactHooks-internal.spec.luau b/modules/react-reconciler/src/__tests__/ReactHooks-internal.spec.luau index ed0ddb6f..1b18f3a8 100644 --- a/modules/react-reconciler/src/__tests__/ReactHooks-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactHooks-internal.spec.luau @@ -15,7 +15,6 @@ local ReactTestRenderer local Scheduler -- local ReactDOMServer local act -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local beforeEach = JestGlobals.beforeEach diff --git a/modules/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer.spec.luau b/modules/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer.spec.luau index fc12349d..6407ace0 100644 --- a/modules/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer.spec.luau @@ -11,7 +11,6 @@ ]] --[[ eslint-disable no-func-assign ]] -local Packages = script.Parent.Parent.Parent local React local Promise diff --git a/modules/react-reconciler/src/__tests__/ReactIdentity.spec.luau b/modules/react-reconciler/src/__tests__/ReactIdentity.spec.luau index fff93abf..b0eec9e0 100644 --- a/modules/react-reconciler/src/__tests__/ReactIdentity.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIdentity.spec.luau @@ -12,7 +12,6 @@ local React, Scheduler local ReactRoblox, reactRobloxRoot -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local beforeEach = JestGlobals.beforeEach diff --git a/modules/react-reconciler/src/__tests__/ReactIncremental.spec.luau b/modules/react-reconciler/src/__tests__/ReactIncremental.spec.luau index e8493abc..0c6174dd 100644 --- a/modules/react-reconciler/src/__tests__/ReactIncremental.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIncremental.spec.luau @@ -9,7 +9,6 @@ -- * @jest-environment node -- */ -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Error = LuauPolyfill.Error diff --git a/modules/react-reconciler/src/__tests__/ReactIncrementalErrorReplay.spec.luau b/modules/react-reconciler/src/__tests__/ReactIncrementalErrorReplay.spec.luau index af675e2c..192a5d18 100644 --- a/modules/react-reconciler/src/__tests__/ReactIncrementalErrorReplay.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIncrementalErrorReplay.spec.luau @@ -10,7 +10,6 @@ --]] --!strict -local Packages = script.Parent.Parent.Parent local React local ReactNoop local Scheduler diff --git a/modules/react-reconciler/src/__tests__/ReactIncrementalReflection.spec.luau b/modules/react-reconciler/src/__tests__/ReactIncrementalReflection.spec.luau index 517a9ff5..0797ab1f 100644 --- a/modules/react-reconciler/src/__tests__/ReactIncrementalReflection.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIncrementalReflection.spec.luau @@ -8,7 +8,6 @@ -- * @jest-environment node -- -local Packages = script.Parent.Parent.Parent local React local ReactNoop local Scheduler diff --git a/modules/react-reconciler/src/__tests__/ReactIncrementalScheduling.spec.luau b/modules/react-reconciler/src/__tests__/ReactIncrementalScheduling.spec.luau index e5201541..d94f8fb0 100644 --- a/modules/react-reconciler/src/__tests__/ReactIncrementalScheduling.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIncrementalScheduling.spec.luau @@ -9,7 +9,6 @@ * @jest-environment node --]] --!strict -local Packages = script.Parent.Parent.Parent local React local ReactNoop local Scheduler diff --git a/modules/react-reconciler/src/__tests__/ReactIncrementalSideEffects.spec.luau b/modules/react-reconciler/src/__tests__/ReactIncrementalSideEffects.spec.luau index 1e1205f7..89936438 100644 --- a/modules/react-reconciler/src/__tests__/ReactIncrementalSideEffects.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIncrementalSideEffects.spec.luau @@ -10,7 +10,6 @@ -- 'use strict' -local Packages = script.Parent.Parent.Parent local React local ReactNoop local Scheduler diff --git a/modules/react-reconciler/src/__tests__/ReactIncrementalUpdates.spec.luau b/modules/react-reconciler/src/__tests__/ReactIncrementalUpdates.spec.luau index 46504451..7d937f41 100644 --- a/modules/react-reconciler/src/__tests__/ReactIncrementalUpdates.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIncrementalUpdates.spec.luau @@ -8,7 +8,6 @@ -- * @jest-environment node -- */ -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Object = LuauPolyfill.Object local ReactFeatureFlags = require("@pkg/@jsdotlua/shared").ReactFeatureFlags diff --git a/modules/react-reconciler/src/__tests__/ReactIncrementalUpdatesMinimalism.spec.luau b/modules/react-reconciler/src/__tests__/ReactIncrementalUpdatesMinimalism.spec.luau index d89d61fa..ba32bf6f 100644 --- a/modules/react-reconciler/src/__tests__/ReactIncrementalUpdatesMinimalism.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactIncrementalUpdatesMinimalism.spec.luau @@ -11,7 +11,6 @@ --!strict local React local ReactNoop -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jest = JestGlobals.jest local jestExpect = JestGlobals.expect diff --git a/modules/react-reconciler/src/__tests__/ReactLazy-internal.spec.luau b/modules/react-reconciler/src/__tests__/ReactLazy-internal.spec.luau index 7ed342ec..62ce9706 100644 --- a/modules/react-reconciler/src/__tests__/ReactLazy-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactLazy-internal.spec.luau @@ -6,8 +6,6 @@ local ReactFeatureFlags local Suspense local lazy -local Packages = script.Parent.Parent.Parent - local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Error = LuauPolyfill.Error local setTimeout = LuauPolyfill.setTimeout diff --git a/modules/react-reconciler/src/__tests__/ReactNewContext.spec.luau b/modules/react-reconciler/src/__tests__/ReactNewContext.spec.luau index 4d291593..08f0d425 100644 --- a/modules/react-reconciler/src/__tests__/ReactNewContext.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactNewContext.spec.luau @@ -9,7 +9,6 @@ * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Array = LuauPolyfill.Array local Error = LuauPolyfill.Error diff --git a/modules/react-reconciler/src/__tests__/ReactNoopRendererAct.spec.luau b/modules/react-reconciler/src/__tests__/ReactNoopRendererAct.spec.luau index 7304de6b..c0affb4b 100644 --- a/modules/react-reconciler/src/__tests__/ReactNoopRendererAct.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactNoopRendererAct.spec.luau @@ -10,7 +10,6 @@ -- sanity tests for ReactNoop.act() -local Packages = script.Parent.Parent.Parent local React local ReactNoop local Scheduler diff --git a/modules/react-reconciler/src/__tests__/ReactSuspense-internal.spec.luau b/modules/react-reconciler/src/__tests__/ReactSuspense-internal.spec.luau index fac48831..58385a8f 100644 --- a/modules/react-reconciler/src/__tests__/ReactSuspense-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactSuspense-internal.spec.luau @@ -19,7 +19,6 @@ local _act local TextResource local textResourceShouldFail -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local beforeEach = JestGlobals.beforeEach diff --git a/modules/react-reconciler/src/__tests__/ReactTopLevelFragment.spec.luau b/modules/react-reconciler/src/__tests__/ReactTopLevelFragment.spec.luau index 4d56b7d1..e3568a54 100644 --- a/modules/react-reconciler/src/__tests__/ReactTopLevelFragment.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactTopLevelFragment.spec.luau @@ -10,7 +10,6 @@ ]] --!strict -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") type Array = LuauPolyfill.Array local React diff --git a/modules/react-reconciler/src/__tests__/ReactTopLevelText.spec.luau b/modules/react-reconciler/src/__tests__/ReactTopLevelText.spec.luau index 5bbc5d52..f6b6c226 100644 --- a/modules/react-reconciler/src/__tests__/ReactTopLevelText.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactTopLevelText.spec.luau @@ -10,7 +10,6 @@ ]] --!strict -local Packages = script.Parent.Parent.Parent local React local ReactNoop local Scheduler diff --git a/modules/react-reconciler/src/__tests__/ReactUpdateQueue.roblox.spec.luau b/modules/react-reconciler/src/__tests__/ReactUpdateQueue.roblox.spec.luau index 5170dbbe..c6333522 100644 --- a/modules/react-reconciler/src/__tests__/ReactUpdateQueue.roblox.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactUpdateQueue.roblox.spec.luau @@ -3,7 +3,6 @@ * LICENSE file in the root directory of this source tree. ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local beforeEach = JestGlobals.beforeEach @@ -24,9 +23,9 @@ beforeEach(function() jest.resetModules() React = require("@pkg/@jsdotlua/react") - ReactUpdateQueue = require("./ReactUpdateQueue.new.luau") - Fiber = require("./ReactFiber.new.luau") - FiberLane = require("./ReactFiberLane") + ReactUpdateQueue = require("../ReactUpdateQueue.new.luau") + Fiber = require("../ReactFiber.new.luau") + FiberLane = require("../ReactFiberLane") component = React.Component:extend("fundamental") fundamentalFiber = Fiber.createFiberFromFundamental(component) @@ -159,7 +158,7 @@ describe("enqueueCapturedUpdate", function() update.lane = lane ReactUpdateQueue.initializeUpdateQueue(fundamentalFiber) workInProgress = Fiber.createWorkInProgress(fundamentalFiber, nextProps) - local ReactFiberFlags = require("./ReactFiberFlags") + local ReactFiberFlags = require("../ReactFiberFlags") workInProgress.flags = bit32.bor(0, ReactFiberFlags.ShouldCapture) end) diff --git a/modules/react-reconciler/src/__tests__/ReactUseRef.roblox.spec.luau b/modules/react-reconciler/src/__tests__/ReactUseRef.roblox.spec.luau index 6931936f..fa0edbf4 100644 --- a/modules/react-reconciler/src/__tests__/ReactUseRef.roblox.spec.luau +++ b/modules/react-reconciler/src/__tests__/ReactUseRef.roblox.spec.luau @@ -1,4 +1,3 @@ -local Packages = script.Parent.Parent.Parent local React local ReactRoblox local Scheduler diff --git a/modules/react-reconciler/src/__tests__/SchedulingProfiler-internal.spec.luau b/modules/react-reconciler/src/__tests__/SchedulingProfiler-internal.spec.luau index d20bd9cc..8bb93aef 100644 --- a/modules/react-reconciler/src/__tests__/SchedulingProfiler-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/SchedulingProfiler-internal.spec.luau @@ -8,7 +8,6 @@ -- * @emails react-core -- * @jest-environment node -- */ -local Packages = script.Parent.Parent.Parent local ReactVersion = require("@pkg/@jsdotlua/shared").ReactVersion local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect diff --git a/modules/react-reconciler/src/__tests__/useMutableSource-internal.spec.luau b/modules/react-reconciler/src/__tests__/useMutableSource-internal.spec.luau index b26ae5bc..6a4413ff 100644 --- a/modules/react-reconciler/src/__tests__/useMutableSource-internal.spec.luau +++ b/modules/react-reconciler/src/__tests__/useMutableSource-internal.spec.luau @@ -8,7 +8,6 @@ -- * @jest-environment node -- */ -local Packages = script.Parent.Parent.Parent local React local ReactNoop local Scheduler diff --git a/modules/react-roblox/package.json b/modules/react-roblox/package.json index 0f865d64..9f2c36a0 100644 --- a/modules/react-roblox/package.json +++ b/modules/react-roblox/package.json @@ -19,6 +19,8 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/promise": "^3.5.0", "npmluau": "^0.1.0" } } diff --git a/modules/react-roblox/src/client/__tests__/PropAssignmentErrors.roblox.spec.luau b/modules/react-roblox/src/client/__tests__/PropAssignmentErrors.roblox.spec.luau index f4f4a989..1ce58469 100644 --- a/modules/react-roblox/src/client/__tests__/PropAssignmentErrors.roblox.spec.luau +++ b/modules/react-roblox/src/client/__tests__/PropAssignmentErrors.roblox.spec.luau @@ -1,5 +1,3 @@ -local Packages = script.Parent.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local beforeEach = JestGlobals.beforeEach diff --git a/modules/react-roblox/src/client/__tests__/ReactRobloxBindings.roblox.spec.luau b/modules/react-roblox/src/client/__tests__/ReactRobloxBindings.roblox.spec.luau index ade810ef..77a1562b 100644 --- a/modules/react-roblox/src/client/__tests__/ReactRobloxBindings.roblox.spec.luau +++ b/modules/react-roblox/src/client/__tests__/ReactRobloxBindings.roblox.spec.luau @@ -13,8 +13,6 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest diff --git a/modules/react-roblox/src/client/__tests__/ReactRobloxComponentTree.roblox.spec.luau b/modules/react-roblox/src/client/__tests__/ReactRobloxComponentTree.roblox.spec.luau index 7b6fca42..c938b3c6 100644 --- a/modules/react-roblox/src/client/__tests__/ReactRobloxComponentTree.roblox.spec.luau +++ b/modules/react-roblox/src/client/__tests__/ReactRobloxComponentTree.roblox.spec.luau @@ -8,8 +8,6 @@ * @flow ]] -local Packages = script.Parent.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -32,7 +30,7 @@ beforeEach(function() React = require("@pkg/@jsdotlua/react") ReactRoblox = require("@pkg/@jsdotlua/react-roblox") Scheduler = require("@pkg/@jsdotlua/scheduler") - ReactRobloxComponentTree = require("./ReactRobloxComponentTree") + ReactRobloxComponentTree = require("../ReactRobloxComponentTree") parent = Instance.new("Folder") reactRobloxRoot = ReactRoblox.createRoot(parent) end) diff --git a/modules/react-roblox/src/client/__tests__/ReactRobloxFiber.spec.luau b/modules/react-roblox/src/client/__tests__/ReactRobloxFiber.spec.luau index e69cf984..ae63155b 100644 --- a/modules/react-roblox/src/client/__tests__/ReactRobloxFiber.spec.luau +++ b/modules/react-roblox/src/client/__tests__/ReactRobloxFiber.spec.luau @@ -9,8 +9,6 @@ ]] -- 'use strict' -local Packages = script.Parent.Parent.Parent.Parent - local React local ReactRoblox local reactRobloxRoot diff --git a/modules/react-roblox/src/client/__tests__/RobloxRenderer.roblox.spec.luau b/modules/react-roblox/src/client/__tests__/RobloxRenderer.roblox.spec.luau index 7c2ae202..1c20e810 100644 --- a/modules/react-roblox/src/client/__tests__/RobloxRenderer.roblox.spec.luau +++ b/modules/react-roblox/src/client/__tests__/RobloxRenderer.roblox.spec.luau @@ -1,5 +1,3 @@ -local Packages = script.Parent.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest diff --git a/modules/react-roblox/src/client/roblox/RobloxComponentProps.luau b/modules/react-roblox/src/client/roblox/RobloxComponentProps.luau index 015ccc42..1706b221 100644 --- a/modules/react-roblox/src/client/roblox/RobloxComponentProps.luau +++ b/modules/react-roblox/src/client/roblox/RobloxComponentProps.luau @@ -337,7 +337,7 @@ local function cleanupHostComponent(domElement: HostInstance) if instanceToEventManager[descElement] ~= nil then instanceToEventManager[descElement] = nil end - + cleanupBindings(descElement) removeAllTags(domElement) end diff --git a/modules/react-roblox/src/client/roblox/__tests__/RobloxComponentProps.roblox.spec.luau b/modules/react-roblox/src/client/roblox/__tests__/RobloxComponentProps.roblox.spec.luau index 4eb8ae74..11c02108 100644 --- a/modules/react-roblox/src/client/roblox/__tests__/RobloxComponentProps.roblox.spec.luau +++ b/modules/react-roblox/src/client/roblox/__tests__/RobloxComponentProps.roblox.spec.luau @@ -3,7 +3,6 @@ local ReactRoblox local Scheduler local RobloxComponentProps -local Packages = script.Parent.Parent.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -15,7 +14,7 @@ beforeEach(function() React = require("@pkg/@jsdotlua/react") ReactRoblox = require("@pkg/@jsdotlua/react-roblox") Scheduler = require("@pkg/@jsdotlua/scheduler") - RobloxComponentProps = require("./RobloxComponentProps") + RobloxComponentProps = require("../RobloxComponentProps") end) local function getSizeOfMap(map) diff --git a/modules/react-roblox/src/client/roblox/__tests__/SingleEventManager.spec.luau b/modules/react-roblox/src/client/roblox/__tests__/SingleEventManager.spec.luau index 58844b73..4940e22d 100644 --- a/modules/react-roblox/src/client/roblox/__tests__/SingleEventManager.spec.luau +++ b/modules/react-roblox/src/client/roblox/__tests__/SingleEventManager.spec.luau @@ -14,7 +14,6 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -23,7 +22,7 @@ local describe = JestGlobals.describe -- ROBLOX FIXME -- local Logging = require("./Logging") -local SingleEventManager = require("./SingleEventManager") +local SingleEventManager = require("../SingleEventManager") local waitForEvents = require("./waitForEvents") describe("new", function() diff --git a/modules/react-roblox/src/client/roblox/__tests__/Tagging.spec.luau b/modules/react-roblox/src/client/roblox/__tests__/Tagging.spec.luau index c688cac0..75024395 100644 --- a/modules/react-roblox/src/client/roblox/__tests__/Tagging.spec.luau +++ b/modules/react-roblox/src/client/roblox/__tests__/Tagging.spec.luau @@ -20,7 +20,7 @@ local Scheduler local Tag local CollectionService = game:GetService("CollectionService") -local Packages = script.Parent.Parent.Parent.Parent.Parent + local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest diff --git a/modules/react-roblox/src/client/roblox/__tests__/getDefaultInstanceProperty.spec.luau b/modules/react-roblox/src/client/roblox/__tests__/getDefaultInstanceProperty.spec.luau index 48bdc797..8077f8de 100644 --- a/modules/react-roblox/src/client/roblox/__tests__/getDefaultInstanceProperty.spec.luau +++ b/modules/react-roblox/src/client/roblox/__tests__/getDefaultInstanceProperty.spec.luau @@ -14,11 +14,10 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local it = JestGlobals.it -local getDefaultInstanceProperty = require("./getDefaultInstanceProperty") +local getDefaultInstanceProperty = require("../getDefaultInstanceProperty") it("should get default name string values", function() local _, defaultName = getDefaultInstanceProperty("StringValue", "Name") diff --git a/modules/react-shallow-renderer/package.json b/modules/react-shallow-renderer/package.json index e1d91845..ebdc1751 100644 --- a/modules/react-shallow-renderer/package.json +++ b/modules/react-shallow-renderer/package.json @@ -18,6 +18,7 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", "npmluau": "^0.1.0" } } diff --git a/modules/react-shallow-renderer/src/__tests__/ReactShallowRenderer.spec.luau b/modules/react-shallow-renderer/src/__tests__/ReactShallowRenderer.spec.luau index 0bee26c5..1cbfa333 100644 --- a/modules/react-shallow-renderer/src/__tests__/ReactShallowRenderer.spec.luau +++ b/modules/react-shallow-renderer/src/__tests__/ReactShallowRenderer.spec.luau @@ -9,7 +9,6 @@ ]] -- local Dependencies = script.Parent.Parent.Parent.Parent.Packages -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -26,7 +25,7 @@ local createRenderer beforeEach(function() UninitializedState = require("@pkg/@jsdotlua/shared").UninitializedState React = require("@pkg/@jsdotlua/react") - ReactShallowRenderer = require(".") + ReactShallowRenderer = require("..") createRenderer = ReactShallowRenderer.createRenderer end) diff --git a/modules/react-shallow-renderer/src/__tests__/ReactShallowRendererHooks.spec.luau b/modules/react-shallow-renderer/src/__tests__/ReactShallowRendererHooks.spec.luau index b81bb4c0..e7c97228 100644 --- a/modules/react-shallow-renderer/src/__tests__/ReactShallowRendererHooks.spec.luau +++ b/modules/react-shallow-renderer/src/__tests__/ReactShallowRendererHooks.spec.luau @@ -8,7 +8,6 @@ * @jest-environment node ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -21,7 +20,7 @@ local createRenderer beforeEach(function() React = require("@pkg/@jsdotlua/react") - ReactShallowRenderer = require(".") + ReactShallowRenderer = require("..") createRenderer = ReactShallowRenderer.createRenderer end) diff --git a/modules/react-test-renderer/package.json b/modules/react-test-renderer/package.json index 43a92cba..4f377a9e 100644 --- a/modules/react-test-renderer/package.json +++ b/modules/react-test-renderer/package.json @@ -19,6 +19,10 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/jest-react": "workspace:^", + "@jsdotlua/promise": "^3.5.0", + "@jsdotlua/react-roblox": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react-test-renderer/src/__tests__/RobloxComponentProps.roblox.spec.luau b/modules/react-test-renderer/src/__tests__/RobloxComponentProps.roblox.spec.luau index 3386772e..900c5e01 100644 --- a/modules/react-test-renderer/src/__tests__/RobloxComponentProps.roblox.spec.luau +++ b/modules/react-test-renderer/src/__tests__/RobloxComponentProps.roblox.spec.luau @@ -15,7 +15,7 @@ local jest = JestGlobals.jest describe("TestRenderer Tag Support", function() beforeEach(function() jest.resetModules() - RobloxComponentProps = require("./roblox/RobloxComponentProps") + RobloxComponentProps = require("../roblox/RobloxComponentProps") setInitialTags = RobloxComponentProps.setInitialTags updateTags = RobloxComponentProps.updateTags removeTags = RobloxComponentProps.removeTags diff --git a/modules/react/package.json b/modules/react/package.json index c19a0ab8..212efa95 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -16,6 +16,13 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/jest-react": "workspace:^", + "@jsdotlua/promise": "^3.5.0", + "@jsdotlua/react-cache": "workspace:^", + "@jsdotlua/react-noop-renderer": "workspace:^", + "@jsdotlua/react-roblox": "workspace:^", + "@jsdotlua/react-test-renderer": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/react/src/__tests__/ReactBaseClasses.roblox.spec.luau b/modules/react/src/__tests__/ReactBaseClasses.roblox.spec.luau index 31b097dd..c348a8ee 100644 --- a/modules/react/src/__tests__/ReactBaseClasses.roblox.spec.luau +++ b/modules/react/src/__tests__/ReactBaseClasses.roblox.spec.luau @@ -1,6 +1,5 @@ --!strict -local Packages = script.Parent.Parent.Parent -local ReactBaseClasses = require("./ReactBaseClasses") +local ReactBaseClasses = require("../ReactBaseClasses") local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe diff --git a/modules/react/src/__tests__/ReactChildren.spec.luau b/modules/react/src/__tests__/ReactChildren.spec.luau index 53af5dc2..2f33a8e8 100644 --- a/modules/react/src/__tests__/ReactChildren.spec.luau +++ b/modules/react/src/__tests__/ReactChildren.spec.luau @@ -9,7 +9,6 @@ * * @emails react-core ]] -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Array = LuauPolyfill.Array type Array = LuauPolyfill.Array @@ -29,7 +28,7 @@ local xit = JestGlobals.xit describe("ReactChildren", function() beforeEach(function() jest.resetModules() - React = require(".") + React = require("..") ReactRoblox = require("@pkg/@jsdotlua/react-roblox") ReactTestUtils = { renderIntoDocument = function(element) diff --git a/modules/react/src/__tests__/ReactDeprecationWarnings-internal.spec.luau b/modules/react/src/__tests__/ReactDeprecationWarnings-internal.spec.luau index a61fb64e..e13e1d18 100644 --- a/modules/react/src/__tests__/ReactDeprecationWarnings-internal.spec.luau +++ b/modules/react/src/__tests__/ReactDeprecationWarnings-internal.spec.luau @@ -4,7 +4,6 @@ local ReactFeatureFlags local ReactNoop local Scheduler -- local JSXDEVRuntime -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe @@ -17,7 +16,7 @@ local xit = JestGlobals.xit describe("ReactDeprecationWarnings", function() beforeEach(function() jest.resetModules() - React = require(".") + React = require("..") ReactFeatureFlags = require("@pkg/@jsdotlua/shared").ReactFeatureFlags ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") Scheduler = require("@pkg/@jsdotlua/scheduler") diff --git a/modules/react/src/__tests__/ReactElement.roblox.spec.luau b/modules/react/src/__tests__/ReactElement.roblox.spec.luau index 6db5f2a5..fe1aae1f 100644 --- a/modules/react/src/__tests__/ReactElement.roblox.spec.luau +++ b/modules/react/src/__tests__/ReactElement.roblox.spec.luau @@ -1,8 +1,7 @@ --!strict -- ROBLOX upstream: https://github.com/facebook/react/blob/702fad4b1b48ac8f626ed3f35e8f86f5ea728084/packages/react/src/__tests__/ReactElement-test.js -local Packages = script.Parent.Parent.Parent -local ReactElement = require("./ReactElement") +local ReactElement = require("../ReactElement") local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe diff --git a/modules/react/src/__tests__/ReactElementValidator-internal.spec.luau b/modules/react/src/__tests__/ReactElementValidator-internal.spec.luau index b5a49653..3a067b63 100644 --- a/modules/react/src/__tests__/ReactElementValidator-internal.spec.luau +++ b/modules/react/src/__tests__/ReactElementValidator-internal.spec.luau @@ -6,7 +6,6 @@ * * @emails react-core ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -40,7 +39,7 @@ describe("ReactElementValidator", function() -- PropTypes = require("prop-types") ReactFeatureFlags = require("@pkg/@jsdotlua/shared").ReactFeatureFlags ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false - React = require(".") + React = require("..") ReactRoblox = require("@pkg/@jsdotlua/react-roblox") -- ReactTestUtils = require("react-dom/test-utils") ComponentClass = React.Component:extend("ComponentClass") diff --git a/modules/react/src/__tests__/ReactProfiler-internal.spec.luau b/modules/react/src/__tests__/ReactProfiler-internal.spec.luau index 27897333..ef925adc 100644 --- a/modules/react/src/__tests__/ReactProfiler-internal.spec.luau +++ b/modules/react/src/__tests__/ReactProfiler-internal.spec.luau @@ -16,8 +16,6 @@ local resourcePromise local setTimeout local Set -local Packages = script.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest diff --git a/modules/react/src/__tests__/ReactProfilerDevToolsIntegration-internal.spec.luau b/modules/react/src/__tests__/ReactProfilerDevToolsIntegration-internal.spec.luau index c4be1e76..3c58a6ba 100644 --- a/modules/react/src/__tests__/ReactProfilerDevToolsIntegration-internal.spec.luau +++ b/modules/react/src/__tests__/ReactProfilerDevToolsIntegration-internal.spec.luau @@ -1,5 +1,4 @@ -- ROBLOX upstream: https://github.com/facebook/react/blob/v17.0.1/packages/react/src/__tests__/ReactProfilerDevToolsIntegration-test.internal.js -local Packages = script.Parent.Parent.Parent local React local Scheduler local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") @@ -38,7 +37,7 @@ describe("ReactProfiler DevTools integration", function() Scheduler = require("@pkg/@jsdotlua/scheduler") -- ROBLOX deviation: import tracing from top-level Scheduler export to avoid direct file access SchedulerTracing = Scheduler.tracing - React = require("@pkg/@jsdotlua/react") + React = require("..") ReactTestRenderer = require("@pkg/@jsdotlua/react-test-renderer") AdvanceTime = React.Component:extend("AdvanceTime") diff --git a/modules/react/src/__tests__/ReactStrictMode.spec.luau b/modules/react/src/__tests__/ReactStrictMode.spec.luau index deb4b894..8dd30e9a 100644 --- a/modules/react/src/__tests__/ReactStrictMode.spec.luau +++ b/modules/react/src/__tests__/ReactStrictMode.spec.luau @@ -7,7 +7,6 @@ -- * @emails react-core --!strict -local Packages = script.Parent.Parent.Parent local React local ReactNoop -- local ReactDOM @@ -32,7 +31,7 @@ describe("ReactStrictMode", function() -- ROBLOX deviation: workaround because our flag is currently always set to false local ReactFeatureFlags = require("@pkg/@jsdotlua/shared").ReactFeatureFlags ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = true - React = require(".") + React = require("..") -- ROBLOX deviation: using ReactNoop in place of ReactDOM ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") @@ -405,7 +404,7 @@ end) describe("Concurrent Mode", function() beforeEach(function() jest.resetModules() - React = require(".") + React = require("..") -- ROBLOX deviation: using ReactNoop in place of ReactDOM ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") -- ReactDOM = require('react-dom') @@ -663,7 +662,7 @@ end) describe("symbol checks", function() beforeEach(function() jest.resetModules() - React = require(".") + React = require("..") -- ROBLOX deviation: using ReactNoop in place of ReactDOM ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") -- ReactDOM = require('react-dom') @@ -821,7 +820,7 @@ end) describe("string refs", function() beforeEach(function() jest.resetModules() - React = require(".") + React = require("..") -- ROBLOX deviation: using ReactNoop in place of ReactDOM ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") -- ReactDOM = require('react-dom') @@ -914,7 +913,7 @@ end) describe("context legacy", function() beforeEach(function() jest.resetModules() - React = require(".") + React = require("..") -- ROBLOX deviation: using ReactNoop in place of ReactDOM ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") -- ReactDOM = require('react-dom') diff --git a/modules/react/src/__tests__/ReactUpdates.spec.luau b/modules/react/src/__tests__/ReactUpdates.spec.luau index 70532602..93469c8d 100644 --- a/modules/react/src/__tests__/ReactUpdates.spec.luau +++ b/modules/react/src/__tests__/ReactUpdates.spec.luau @@ -7,7 +7,6 @@ -- * -- * @emails react-core -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Array = LuauPolyfill.Array local Boolean = LuauPolyfill.Boolean @@ -38,7 +37,7 @@ describe("ReactUpdates", function() -- ROBLOX deviation: workaround because our flag is currently always set to false local ReactFeatureFlags = require("@pkg/@jsdotlua/shared").ReactFeatureFlags ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = true - React = require(".") + React = require("..") -- ROBLOX deviation: using React Test Renderer in place of ReactDOM ReactTestRenderer = require("@pkg/@jsdotlua/react-test-renderer") diff --git a/modules/react/src/__tests__/SetStateInConstructor.roblox.spec.luau b/modules/react/src/__tests__/SetStateInConstructor.roblox.spec.luau index 04e483ab..77f6b7f5 100644 --- a/modules/react/src/__tests__/SetStateInConstructor.roblox.spec.luau +++ b/modules/react/src/__tests__/SetStateInConstructor.roblox.spec.luau @@ -1,6 +1,5 @@ -- ROBLOX: tests deviant logic for Roblox react which permits use of setState() in component constructor -local Packages = script.Parent.Parent.Parent local React, Shared, ReactNoop local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jest = JestGlobals.jest @@ -12,7 +11,7 @@ local beforeEach = JestGlobals.beforeEach beforeEach(function() jest.resetModules() ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") - React = require(".") + React = require("..") Shared = require("@pkg/@jsdotlua/shared") end) diff --git a/modules/react/src/__tests__/forwardRef-internal.spec.luau b/modules/react/src/__tests__/forwardRef-internal.spec.luau index 0cec1762..02a97881 100644 --- a/modules/react/src/__tests__/forwardRef-internal.spec.luau +++ b/modules/react/src/__tests__/forwardRef-internal.spec.luau @@ -10,7 +10,6 @@ -- ROBLOX FIXME Luau: this doesn't play nicely with Object.assign --!nonstrict -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local jest = JestGlobals.jest @@ -30,7 +29,7 @@ beforeEach(function() ReactFeatureFlags = require("@pkg/@jsdotlua/shared").ReactFeatureFlags ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false - React = require(".") + React = require("..") ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") Scheduler = require("@pkg/@jsdotlua/scheduler") end) diff --git a/modules/react/src/__tests__/forwardRef.spec.luau b/modules/react/src/__tests__/forwardRef.spec.luau index 1af0fedf..af80789c 100644 --- a/modules/react/src/__tests__/forwardRef.spec.luau +++ b/modules/react/src/__tests__/forwardRef.spec.luau @@ -36,7 +36,7 @@ describe("forwardRef", function() jest.resetModules() -- PropTypes = require('prop-types') - React = require("@pkg/@jsdotlua/react") + React = require("..") ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") Scheduler = require("@pkg/@jsdotlua/scheduler") end) diff --git a/modules/roact-compat/package.json b/modules/roact-compat/package.json index 60536c74..421229d5 100644 --- a/modules/roact-compat/package.json +++ b/modules/roact-compat/package.json @@ -18,6 +18,8 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/scheduler": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/roact-compat/src/__tests__/RoactCompatibility.spec.luau b/modules/roact-compat/src/__tests__/RoactCompatibility.spec.luau index 9a2576fa..042584a2 100644 --- a/modules/roact-compat/src/__tests__/RoactCompatibility.spec.luau +++ b/modules/roact-compat/src/__tests__/RoactCompatibility.spec.luau @@ -13,8 +13,6 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -34,8 +32,8 @@ local UNSUPPORTED = { } beforeEach(function() jest.resetModules() - Roact = require("@dev-packages/Roact") - RoactCompat = require(".") + Roact = require("@pkg/@jsdotlua/roact") + RoactCompat = require("..") end) it("has all interface members that old Roact exposes", function() diff --git a/modules/roact-compat/src/__tests__/RoactRecursiveLayoutPcallDepth.spec.luau b/modules/roact-compat/src/__tests__/RoactRecursiveLayoutPcallDepth.spec.luau index 4491b85f..dfd3dafe 100644 --- a/modules/roact-compat/src/__tests__/RoactRecursiveLayoutPcallDepth.spec.luau +++ b/modules/roact-compat/src/__tests__/RoactRecursiveLayoutPcallDepth.spec.luau @@ -14,8 +14,6 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -29,7 +27,7 @@ local Scheduler beforeEach(function() jest.resetModules() - RoactCompat = require(".") + RoactCompat = require("..") ReactRoblox = require("@pkg/@jsdotlua/react-roblox") Scheduler = require("@pkg/@jsdotlua/scheduler") React = require("@pkg/@jsdotlua/react") diff --git a/modules/roact-compat/src/__tests__/RoactTree.spec.luau b/modules/roact-compat/src/__tests__/RoactTree.spec.luau index 0d8fb8b1..411a79f4 100644 --- a/modules/roact-compat/src/__tests__/RoactTree.spec.luau +++ b/modules/roact-compat/src/__tests__/RoactTree.spec.luau @@ -13,7 +13,6 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local afterEach = JestGlobals.afterEach local beforeEach = JestGlobals.beforeEach @@ -43,8 +42,8 @@ describe("Concurrent root (default behavior)", function() _G.__ROACT_17_INLINE_ACT__ = true _G.__ROACT_17_MOCK_SCHEDULER__ = true jest.resetModules() - Roact = require("@dev-packages/Roact") - RoactCompat = require(".") + Roact = require("@pkg/@jsdotlua/roact") + RoactCompat = require("..") end) afterEach(function() @@ -147,8 +146,8 @@ describe("Legacy root", function() previousGlobalValue = _G.__ROACT_17_COMPAT_LEGACY_ROOT__ _G.__ROACT_17_COMPAT_LEGACY_ROOT__ = true jest.resetModules() - Roact = require("@dev-packages/Roact") - RoactCompat = require(".") + Roact = require("@pkg/@jsdotlua/roact") + RoactCompat = require("..") end) afterEach(function() diff --git a/modules/roact-compat/src/__tests__/act.spec.luau b/modules/roact-compat/src/__tests__/act.spec.luau index a00b740a..a240ddb7 100644 --- a/modules/roact-compat/src/__tests__/act.spec.luau +++ b/modules/roact-compat/src/__tests__/act.spec.luau @@ -13,8 +13,6 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local afterEach = JestGlobals.afterEach local beforeEach = JestGlobals.beforeEach @@ -30,12 +28,12 @@ describe("production mode", function() prevMockScheduler = _G.__ROACT_17_MOCK_SCHEDULER__ _G.__ROACT_17_MOCK_SCHEDULER__ = nil jest.resetModules() - RoactCompat = require(".") + RoactCompat = require("..") end) it("disallows use of 'act'", function() jest.resetModules() - RoactCompat = require(".") + RoactCompat = require("..") jestExpect(function() RoactCompat.act(function() @@ -59,12 +57,12 @@ describe("test mode", function() prevMockScheduler = _G.__ROACT_17_MOCK_SCHEDULER__ _G.__ROACT_17_MOCK_SCHEDULER__ = true jest.resetModules() - RoactCompat = require(".") + RoactCompat = require("..") end) it("allows use of 'act'", function() jest.resetModules() - RoactCompat = require(".") + RoactCompat = require("..") local parent = Instance.new("Folder") local tree diff --git a/modules/roact-compat/src/__tests__/warnOnce.spec.luau b/modules/roact-compat/src/__tests__/warnOnce.spec.luau index d7650e2c..ab9aa8c0 100644 --- a/modules/roact-compat/src/__tests__/warnOnce.spec.luau +++ b/modules/roact-compat/src/__tests__/warnOnce.spec.luau @@ -14,8 +14,6 @@ * limitations under the License. ]] -local Packages = script.Parent.Parent.Parent - local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -25,7 +23,7 @@ local warnOnce beforeEach(function() jest.resetModules() - warnOnce = require("./warnOnce") + warnOnce = require("../warnOnce") end) it("warns exactly once", function() diff --git a/modules/scheduler/package.json b/modules/scheduler/package.json index 2ec3f09a..8a207b08 100644 --- a/modules/scheduler/package.json +++ b/modules/scheduler/package.json @@ -16,6 +16,7 @@ "@jsdotlua/shared": "workspace:^" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", "npmluau": "^0.1.0" } } diff --git a/modules/scheduler/src/__tests__/Scheduler.spec.luau b/modules/scheduler/src/__tests__/Scheduler.spec.luau index af7fc0b7..515efa6c 100644 --- a/modules/scheduler/src/__tests__/Scheduler.spec.luau +++ b/modules/scheduler/src/__tests__/Scheduler.spec.luau @@ -8,7 +8,6 @@ * @emails react-core ]] -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Error = LuauPolyfill.Error local JestGlobals = require("@pkg/@jsdotlua/jest-globals") @@ -53,7 +52,7 @@ beforeEach(function() -- unstable_mock depends on the real Scheduler, and our mock -- functionality isn't smart enough to prevent self-requires, we simply -- require the mock entry point directly for use in tests - Scheduler = require("./unstable_mock") + Scheduler = require("../unstable_mock") runWithPriority = Scheduler.unstable_runWithPriority ImmediatePriority = Scheduler.unstable_ImmediatePriority diff --git a/modules/scheduler/src/__tests__/SchedulerMinHeap.roblox.spec.luau b/modules/scheduler/src/__tests__/SchedulerMinHeap.roblox.spec.luau index d7c10aa1..ef04eb95 100644 --- a/modules/scheduler/src/__tests__/SchedulerMinHeap.roblox.spec.luau +++ b/modules/scheduler/src/__tests__/SchedulerMinHeap.roblox.spec.luau @@ -1,9 +1,8 @@ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe local it = JestGlobals.it -local Heap = require("./SchedulerMinHeap") +local Heap = require("../SchedulerMinHeap") local function verifyOrder(heap) for pos = 2, #heap do diff --git a/modules/scheduler/src/__tests__/SchedulerNoDOM.spec.luau b/modules/scheduler/src/__tests__/SchedulerNoDOM.spec.luau index 65a028ec..4c35eedd 100644 --- a/modules/scheduler/src/__tests__/SchedulerNoDOM.spec.luau +++ b/modules/scheduler/src/__tests__/SchedulerNoDOM.spec.luau @@ -8,7 +8,6 @@ * @emails react-core ]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -23,7 +22,7 @@ local NormalPriority beforeEach(function() jest.resetModules() jest.useFakeTimers() - local Scheduler = require("./Scheduler")() + local Scheduler = require("../Scheduler")() scheduleCallback = Scheduler.unstable_scheduleCallback ImmediatePriority = Scheduler.unstable_ImmediatePriority diff --git a/modules/scheduler/src/__tests__/SchedulerProfiling.spec.luau b/modules/scheduler/src/__tests__/SchedulerProfiling.spec.luau index 9863d965..c34169d2 100644 --- a/modules/scheduler/src/__tests__/SchedulerProfiling.spec.luau +++ b/modules/scheduler/src/__tests__/SchedulerProfiling.spec.luau @@ -8,7 +8,6 @@ * @flow *]] -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -42,24 +41,24 @@ local function priorityLevelToString(priorityLevel) end describe("Scheduler", function() it("profiling APIs are not available", function() - local SchedulerFeatureFlags = require("./SchedulerFeatureFlags") + local SchedulerFeatureFlags = require("../SchedulerFeatureFlags") SchedulerFeatureFlags.enableProfiling = false - Scheduler = require("./Scheduler")() + Scheduler = require("../Scheduler")() jestExpect(Scheduler.unstable_Profiling).toBe(nil) end) beforeEach(function() jest.resetModules() jest.useFakeTimers() - local SchedulerFeatureFlags = require("./SchedulerFeatureFlags") + local SchedulerFeatureFlags = require("../SchedulerFeatureFlags") SchedulerFeatureFlags.enableProfiling = true -- ROBLOX deviation: In react, jest mocks Scheduler -> unstable_mock since -- unstable_mock depends on the real Scheduler, and our mock -- functionality isn't smart enough to prevent self-requires, we simply -- require the mock entry point directly for use in tests - Scheduler = require("./unstable_mock") + Scheduler = require("../unstable_mock") ImmediatePriority = Scheduler.unstable_ImmediatePriority UserBlockingPriority = Scheduler.unstable_UserBlockingPriority NormalPriority = Scheduler.unstable_NormalPriority diff --git a/modules/scheduler/src/__tests__/Tracing-internal.spec.luau b/modules/scheduler/src/__tests__/Tracing-internal.spec.luau index 6ae71081..8cf19d68 100644 --- a/modules/scheduler/src/__tests__/Tracing-internal.spec.luau +++ b/modules/scheduler/src/__tests__/Tracing-internal.spec.luau @@ -8,7 +8,6 @@ -- * @jest-environment node -- */ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect diff --git a/modules/scheduler/src/__tests__/Tracing.spec.luau b/modules/scheduler/src/__tests__/Tracing.spec.luau index af427c30..d3007a7d 100644 --- a/modules/scheduler/src/__tests__/Tracing.spec.luau +++ b/modules/scheduler/src/__tests__/Tracing.spec.luau @@ -8,7 +8,6 @@ -- * @jest-environment node -- */ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local describe = JestGlobals.describe diff --git a/modules/scheduler/src/__tests__/TracingSubscriptions-internal.spec.luau b/modules/scheduler/src/__tests__/TracingSubscriptions-internal.spec.luau index 3c1c6b32..10373f47 100644 --- a/modules/scheduler/src/__tests__/TracingSubscriptions-internal.spec.luau +++ b/modules/scheduler/src/__tests__/TracingSubscriptions-internal.spec.luau @@ -8,7 +8,6 @@ -- * @flow -- */ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect diff --git a/modules/shared/package.json b/modules/shared/package.json index 3561c373..d297aa2c 100644 --- a/modules/shared/package.json +++ b/modules/shared/package.json @@ -15,6 +15,11 @@ "@jsdotlua/luau-polyfill": "^1.2.6" }, "devDependencies": { + "@jsdotlua/jest-globals": "^3.6.1-rc.2", + "@jsdotlua/jest-react": "workspace:^", + "@jsdotlua/react": "workspace:^", + "@jsdotlua/react-noop-renderer": "workspace:^", + "@jsdotlua/scheduler": "workspace:^", "npmluau": "^0.1.0" } } diff --git a/modules/shared/src/__tests__/ReactComponentStackFrame.roblox.spec.luau b/modules/shared/src/__tests__/ReactComponentStackFrame.roblox.spec.luau index 81c29be7..209a1d38 100644 --- a/modules/shared/src/__tests__/ReactComponentStackFrame.roblox.spec.luau +++ b/modules/shared/src/__tests__/ReactComponentStackFrame.roblox.spec.luau @@ -1,6 +1,5 @@ --!strict -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Object = LuauPolyfill.Object local String = LuauPolyfill.String @@ -26,7 +25,7 @@ describe("describeNativeComponentFrame", function() beforeEach(function() jest.resetModules() - ReactComponentStackFrame = require("./ReactComponentStackFrame") + ReactComponentStackFrame = require("../ReactComponentStackFrame") describeNativeComponentFrame = ReactComponentStackFrame.describeNativeComponentFrame end) @@ -51,7 +50,7 @@ describe("with enableComponentStackLocations to false", function() beforeEach(function() jest.resetModules() - local ReactFeatureFlags = require("./ReactFeatureFlags") + local ReactFeatureFlags = require("../ReactFeatureFlags") -- ROBLOX FIXME: Calling mock after require won't work jest.mock(script.Parent.Parent.ReactFeatureFlags :: any, function() @@ -60,7 +59,7 @@ describe("with enableComponentStackLocations to false", function() }) end) - ReactComponentStackFrame = require("./ReactComponentStackFrame") + ReactComponentStackFrame = require("../ReactComponentStackFrame") end) describe("describeBuiltInComponentFrame", function() @@ -164,7 +163,7 @@ describe("with enableComponentStackLocations to true", function() beforeEach(function() jest.resetModules() - local ReactFeatureFlags = require("./ReactFeatureFlags") + local ReactFeatureFlags = require("../ReactFeatureFlags") -- ROBLOX FIXME: Calling mock after require won't work jest.mock(script.Parent.Parent.ReactFeatureFlags :: any, function() @@ -173,7 +172,7 @@ describe("with enableComponentStackLocations to true", function() }) end) - ReactComponentStackFrame = require("./ReactComponentStackFrame") + ReactComponentStackFrame = require("../ReactComponentStackFrame") describeBuiltInComponentFrame = ReactComponentStackFrame.describeBuiltInComponentFrame end) diff --git a/modules/shared/src/__tests__/ReactErrorProd-internal.spec.luau b/modules/shared/src/__tests__/ReactErrorProd-internal.spec.luau index 1239ecd2..821063e1 100644 --- a/modules/shared/src/__tests__/ReactErrorProd-internal.spec.luau +++ b/modules/shared/src/__tests__/ReactErrorProd-internal.spec.luau @@ -9,7 +9,6 @@ ]] --!strict -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect @@ -19,7 +18,7 @@ local formatProdErrorMessage beforeEach(function() jest.resetModules() - formatProdErrorMessage = require("./formatProdErrorMessage") + formatProdErrorMessage = require("../formatProdErrorMessage") end) it("should throw with the correct number of `%s`s in the URL", function() diff --git a/modules/shared/src/__tests__/ReactErrorUtils-internal.spec.luau b/modules/shared/src/__tests__/ReactErrorUtils-internal.spec.luau index d5cfd7c4..02403f5e 100644 --- a/modules/shared/src/__tests__/ReactErrorUtils-internal.spec.luau +++ b/modules/shared/src/__tests__/ReactErrorUtils-internal.spec.luau @@ -8,7 +8,6 @@ * @emails react-core ]] -local Packages = script.Parent.Parent.Parent local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill") local Error = LuauPolyfill.Error local JestGlobals = require("@pkg/@jsdotlua/jest-globals") @@ -22,7 +21,7 @@ local ReactErrorUtils beforeEach(function() -- TODO: can we express this test with only public API? jest.resetModules() - ReactErrorUtils = require("./ReactErrorUtils") + ReactErrorUtils = require("../ReactErrorUtils") end) afterEach(function() @@ -111,9 +110,9 @@ it("handles nested errors", function() end) it("handles nested errors in separate renderers", function() - local ReactErrorUtils1 = require("./ReactErrorUtils") + local ReactErrorUtils1 = require("../ReactErrorUtils") jest.resetModules() - local ReactErrorUtils2 = require("./ReactErrorUtils") + local ReactErrorUtils2 = require("../ReactErrorUtils") jestExpect(ReactErrorUtils1).never.toEqual(ReactErrorUtils2) local ops = {} @@ -159,7 +158,7 @@ it("can be shimmed", function() end end end) - ReactErrorUtils = require("./ReactErrorUtils") + ReactErrorUtils = require("../ReactErrorUtils") -- deviation: no need to wrap in try/finally since we don't need to -- undo the mock like we would with jest diff --git a/modules/shared/src/__tests__/ReactInstanceMap.roblox.spec.luau b/modules/shared/src/__tests__/ReactInstanceMap.roblox.spec.luau index 148757a4..96d8c194 100644 --- a/modules/shared/src/__tests__/ReactInstanceMap.roblox.spec.luau +++ b/modules/shared/src/__tests__/ReactInstanceMap.roblox.spec.luau @@ -1,7 +1,6 @@ -- ROBLOX deviation: we have a crash in production this deviant logic will help catch -- ROBLOX TODO: make this only pass in __DEV__ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe diff --git a/modules/shared/src/__tests__/ReactSymbols-internal.spec.luau b/modules/shared/src/__tests__/ReactSymbols-internal.spec.luau index d712b46b..f33ada61 100644 --- a/modules/shared/src/__tests__/ReactSymbols-internal.spec.luau +++ b/modules/shared/src/__tests__/ReactSymbols-internal.spec.luau @@ -9,7 +9,6 @@ ]] --!strict -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local it = JestGlobals.it @@ -48,7 +47,7 @@ it("numeric values should be unique", function() -- deviation: We don't use symbol anyways, so it's no use to -- override it. We also don't need to filter any values, since -- they're internal-only. - local ReactSymbols = require("./ReactSymbols") + local ReactSymbols = require("../ReactSymbols") expectToBeUnique(ReactSymbols) -- deviation: We comment out this chunk because we're not actually using diff --git a/modules/shared/src/__tests__/checkPropTypes.roblox.spec.luau b/modules/shared/src/__tests__/checkPropTypes.roblox.spec.luau index edf47b5f..0262f2d5 100644 --- a/modules/shared/src/__tests__/checkPropTypes.roblox.spec.luau +++ b/modules/shared/src/__tests__/checkPropTypes.roblox.spec.luau @@ -1,4 +1,3 @@ -local Packages = script.Parent.Parent.Parent local React local ReactNoop @@ -16,7 +15,7 @@ local Error = LuauPolyfill.Error describe("tests propTypes and validateProps behavior", function() beforeEach(function() jest.resetModules() - ReactNoop = require("@dev-packages/ReactNoop") + ReactNoop = require("@pkg/@jsdotlua/react-noop-renderer") Scheduler = require("@pkg/@jsdotlua/scheduler") React = require("@pkg/@jsdotlua/react") end) diff --git a/modules/shared/src/__tests__/getComponentName.roblox.spec.luau b/modules/shared/src/__tests__/getComponentName.roblox.spec.luau index 2087ef05..22f3cb30 100644 --- a/modules/shared/src/__tests__/getComponentName.roblox.spec.luau +++ b/modules/shared/src/__tests__/getComponentName.roblox.spec.luau @@ -1,4 +1,3 @@ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local beforeEach = JestGlobals.beforeEach local jestExpect = JestGlobals.expect diff --git a/modules/shared/src/__tests__/isValidElementType.roblox.spec.luau b/modules/shared/src/__tests__/isValidElementType.roblox.spec.luau index 312bf36e..a5be1ddc 100644 --- a/modules/shared/src/__tests__/isValidElementType.roblox.spec.luau +++ b/modules/shared/src/__tests__/isValidElementType.roblox.spec.luau @@ -1,4 +1,3 @@ -local Packages = script.Parent.Parent.Parent local JestGlobals = require("@pkg/@jsdotlua/jest-globals") local jestExpect = JestGlobals.expect local describe = JestGlobals.describe diff --git a/package.json b/package.json index fd57fe92..6f274005 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "clean": "rm -rf roblox build node_modules" }, "devDependencies": { + "@jsdotlua/jest": "^3.6.1-rc.2", + "@jsdotlua/jest-globals": "^3.6.1-rc.2", "commander": "^11.1.0", "npmluau": "^0.1.1" }, diff --git a/roblox-model/JestReact.luau b/roblox-model/JestReact.luau new file mode 100644 index 00000000..bd6b5320 --- /dev/null +++ b/roblox-model/JestReact.luau @@ -0,0 +1 @@ +return require("@pkg/@jsdotlua/jest-react") diff --git a/yarn.lock b/yarn.lock index a88b359e..986406a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,6 +14,13 @@ __metadata: languageName: node linkType: hard +"@jsdotlua/chalk@npm:^0.2.1": + version: 0.2.1 + resolution: "@jsdotlua/chalk@npm:0.2.1" + checksum: 10c0/4db0d7de47dae83daa8be4cb4acbb8cc54e81aa598a686529bd95e95900f365edab65fc354c6114be942cfc8c2f3efc47b78aebc528cd2079e0c67f7e4aeba8d + languageName: node + linkType: hard + "@jsdotlua/collections@npm:^1.2.6": version: 1.2.6 resolution: "@jsdotlua/collections@npm:1.2.6" @@ -33,6 +40,25 @@ __metadata: languageName: node linkType: hard +"@jsdotlua/diff-sequences@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/diff-sequences@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/8131dfffd336cfd7a2d38d974145156163c85c13bfc5dc4d36cb9d3735ffaa977751782dfca2d119dccc00badbf1120eef2d399586a5748329da7137030dda01 + languageName: node + linkType: hard + +"@jsdotlua/emittery@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/emittery@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + checksum: 10c0/b7093886298b74837a4fa265c197419579cab06e2d9353ce752f5013bd8a05e29be35865a6ef66258ea2d45af046c7c98e24520489ba54729b5ea682c22a8466 + languageName: node + linkType: hard + "@jsdotlua/es7-types@npm:^1.2.6": version: 1.2.6 resolution: "@jsdotlua/es7-types@npm:1.2.6" @@ -40,6 +66,23 @@ __metadata: languageName: node linkType: hard +"@jsdotlua/expect@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/expect@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-matcher-utils": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-message-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-snapshot": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/7733242b925f053095321427bf082a387c4d2220ea6f64830d8849837792c362cc7dc81ef8563905733aa4811ffb1dc6764f3093dc5bc2eb5a7850e53e8e5a84 + languageName: node + linkType: hard + "@jsdotlua/instance-of@npm:^1.2.6": version: 1.2.6 resolution: "@jsdotlua/instance-of@npm:1.2.6" @@ -47,6 +90,367 @@ __metadata: languageName: node linkType: hard +"@jsdotlua/jest-circus@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-circus@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/expect": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-each": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-environment": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-matcher-utils": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-message-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-runtime": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-snapshot": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-test-result": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + "@jsdotlua/promise": "npm:^3.5.0" + "@jsdotlua/throat": "npm:^3.6.1-rc.2" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/9afc7a29c871fd5e6ebf330dd9e428e3570b4d9581e248c24edae93a1e54fa917e41173cbd7672c1fea8fd6d7e4ee06b23fb8199bd5f87e726b50fd4d652fe49 + languageName: node + linkType: hard + +"@jsdotlua/jest-config@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-config@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-each": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-environment-roblox": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-message-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-validate": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/91cdb06da5681c05328cd1e0796c98b0685a7bc766fc5d3190718a79d6755b717598aee8189511947629e903568776e66fffc01bf4b2436c7df2a4fc611ee359 + languageName: node + linkType: hard + +"@jsdotlua/jest-console@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-console@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-each": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-message-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-mock": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/b3430756752f1b9df7682fe1bb8c4343e4638ebc0cff0251276049138232045f20f06ef2f3a029758c9d4c40c001b70904b80ebb798c5d251a2fabd90d5866a4 + languageName: node + linkType: hard + +"@jsdotlua/jest-core@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-core@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/emittery": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-config": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-console": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-message-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-reporters": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-runner": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-runtime": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-snapshot": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-test-result": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + "@jsdotlua/promise": "npm:^3.5.0" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/8294c3bd8328445ebced024d0094f11e427ffdcc3f4e19b4b0728d963ff44864edf90572d53d2f0d922554b72282439df76e2e74ce8357b98607c51483440c90 + languageName: node + linkType: hard + +"@jsdotlua/jest-diff@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-diff@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/diff-sequences": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + checksum: 10c0/e7bd52319e178212ca696bd3c47c3ced5251bf4e62ac57a0e4bfdda79c648c2ce815da34b0423ddcbe0fc260bc595ee5ea4ac1300e1052c8a60e0d3d23217ac5 + languageName: node + linkType: hard + +"@jsdotlua/jest-each@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-each@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/91d37f0a6e2fb291f229aabc5f7b0e839827e8751f3fd33a4754ffda51b325d9dd814d518753cb47c8dcad3ae249e3b881d0ffd0aa21a6af74afdb27a67a779d + languageName: node + linkType: hard + +"@jsdotlua/jest-environment-roblox@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-environment-roblox@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/jest-environment": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-fake-timers": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-mock": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + checksum: 10c0/0ad8b4fb6a140577091d188c4c441109532b638054380c6cd102276fcd835c771d807d6017d72aaa486ca390294adbc42afa6d8471c3ea826bec7914668bfe06 + languageName: node + linkType: hard + +"@jsdotlua/jest-environment@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-environment@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/jest-fake-timers": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-mock": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/9174d88955fd68380bae0118e8600547c62816d006ba070a7397a7d0cd70a88403e3d7c1407d5da1da0e5b6aa8799ca12e4c2ec92ec9796de29201a4c9e4acba + languageName: node + linkType: hard + +"@jsdotlua/jest-fake-timers@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-fake-timers@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-mock": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/5650e726c80be8fe04fa1b6bcd2a3aee66b146ebbccd102b1c5416516bee5dff284e13f098aba163e01672a82f4cd6a3254d0fb208b65dd9529258b437a8c43e + languageName: node + linkType: hard + +"@jsdotlua/jest-get-type@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-get-type@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/6216f048dc17275a321ff1f8c96788ec3bab39bb9c8894b216a2419fe7e468448e970a820751a2b64b2a60bb8ebbd5105425927a9895332c234744203659419f + languageName: node + linkType: hard + +"@jsdotlua/jest-globals@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-globals@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/expect": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-environment": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/d9324045c7adc930db71f586e7c886ec9b3165978b271e93d07ee0537dcb22126a414ed2efbf6b62f6aa1f7cedd687ce5b3d6f5ad55ff0470b6562421dee658d + languageName: node + linkType: hard + +"@jsdotlua/jest-matcher-utils@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-matcher-utils@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-diff": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/156c6fa299c10eb1bda2f1e15f4a9de8e1f9a3a0d8982a012b7e51c17dbd3a668c882bdfb07a6910f19018cb6610700289b83736d2a8ff6c9296d50777ab7081 + languageName: node + linkType: hard + +"@jsdotlua/jest-message-util@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-message-util@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/48d942b4de4f6b904851e7f2e74d41a211028209d2825cef8061f14d9d0c7c760f2de62037f1b5e7c84540919c30ddd4ae333a4b1d3f72bacf28fdf7ea9c1c59 + languageName: node + linkType: hard + +"@jsdotlua/jest-mock@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-mock@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/e77f12ac35925cb79ac7831fcf332ff3bd5dbafb016d53d77c0efa16098732a2b14f3a5b34b2be20d903ce683773dbd39ba57cde4bad7130d9fafd0931586625 + languageName: node + linkType: hard + +"@jsdotlua/jest-react@workspace:^, @jsdotlua/jest-react@workspace:modules/jest-react": + version: 0.0.0-use.local + resolution: "@jsdotlua/jest-react@workspace:modules/jest-react" + dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/shared": "workspace:^" + npmluau: "npm:^0.1.0" + languageName: unknown + linkType: soft + +"@jsdotlua/jest-reporters@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-reporters@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-console": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-message-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-mock": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-test-result": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/path": "npm:^3.6.1-rc.2" + checksum: 10c0/90e0d034084085ed873bd10b1a5742d08b0807da1bcfe380043e7dbdfcc3f4ad0048472c65ca73a13c40d182baa5e6596dea0ec6c2898df99a413b561864ea3d + languageName: node + linkType: hard + +"@jsdotlua/jest-roblox-shared@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-roblox-shared@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-mock": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/61c13286784a247ec8a0f17bd4f6a7740bd1f41277569e5dfad60072f6cdf40d5d163b67d0cbd5d1d0ca4a1c705a4eaa09e87a624709ff494c0b2c4e7af374ff + languageName: node + linkType: hard + +"@jsdotlua/jest-runner@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-runner@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/emittery": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-circus": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-console": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-environment": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-message-util": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-runtime": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-test-result": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-util": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + "@jsdotlua/promise": "npm:^3.5.0" + "@jsdotlua/throat": "npm:^3.6.1-rc.2" + checksum: 10c0/3615ea2cd7056731911bfea5d82f2e133fd6fb93676867d0850ccbb1cb23d1720fddbcd7e3436d3229fc159d592d32892472b8ce622c06e677abf08d57cc2c1a + languageName: node + linkType: hard + +"@jsdotlua/jest-runtime@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-runtime@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/emittery": "npm:^3.6.1-rc.2" + "@jsdotlua/expect": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-fake-timers": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-mock": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-snapshot": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + checksum: 10c0/280a8142a0aec3b86446b456764f536f9bf71523f564d17e4f65a6ea13d3da1fa820eeac181101370d725e3233aa22968ad4311a2c21df7db776655dbdffa444 + languageName: node + linkType: hard + +"@jsdotlua/jest-snapshot@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-snapshot@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-diff": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-matcher-utils": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/pretty-format": "npm:^3.6.1-rc.2" + "@jsdotlua/promise": "npm:^3.5.0" + checksum: 10c0/e6fef6faf7a2696aa9f032805eebb8b82c72742bdb423c9c91bea8c6ddd7ea625554d990c2ade294a108f87bea8cd7e9ad4d59f3283a97dd72087ec99833960c + languageName: node + linkType: hard + +"@jsdotlua/jest-test-result@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-test-result@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/f43d418941805671415c4f68581f068803079f73d4cc4757fb72f717783540c04ac02d0856d7faa7c28873d17898cf84417b695c7ca4b939bf5aa75e0353ef3f + languageName: node + linkType: hard + +"@jsdotlua/jest-types@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-types@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/8777716c40e76d7bab203db368af2b67cfba7fccef9acc36c91150b4c25628da06e85f99b5bf207449cb3d51ea5bd9cc9fb8ede5102afa9ea3f9854a7a66570e + languageName: node + linkType: hard + +"@jsdotlua/jest-util@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-util@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-types": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/picomatch": "npm:^0.4.0" + "@jsdotlua/promise": "npm:^3.5.0" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/b9a5d7ba8fe9f104922f84b493efe28a0f4622658c625a4b97d7fceb8e07651dd9b0fd20c9195c2c13c47e9569e9c6e60e081ed5cb17165d2fb51f28a7ac8ea3 + languageName: node + linkType: hard + +"@jsdotlua/jest-validate@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest-validate@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/50e51e5d3ae790bd51132d82797d0931ab8866b945fa64b5890649074bd4fc06c6e4f6afe207ab0c4817a90d8fd2159504e5c9acb2328396de7715cea4e5a854 + languageName: node + linkType: hard + +"@jsdotlua/jest@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/jest@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/jest-core": "npm:^3.6.1-rc.2" + checksum: 10c0/3359aca93518fa2b66c6f98034db4a6026b278a973256949ccd9cf3f8ae7f614976de79b7863d7387188bf3322036d2b4497ed35fc74801ece5099352fa079bb + languageName: node + linkType: hard + "@jsdotlua/luau-polyfill@npm:^1.2.6": version: 1.2.6 resolution: "@jsdotlua/luau-polyfill@npm:1.2.6" @@ -79,6 +483,40 @@ __metadata: languageName: node linkType: hard +"@jsdotlua/path@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/path@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + checksum: 10c0/60868d5161f3bfc263ebcddac8cbe83f6787f85409fc1a563ff350b9ccab05c88e934ccd7e3627ea77bd73f5e30b21dbe7d85e7a4d8445d3baf96cd42bab4877 + languageName: node + linkType: hard + +"@jsdotlua/picomatch@npm:^0.4.0": + version: 0.4.0 + resolution: "@jsdotlua/picomatch@npm:0.4.0" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/7ccc76cfe19974a91758adf62fc69529d05815575488c1ba31af052b0f25de24a9614fd47c6e5bf67f6c28aa8e84f3f32bb59f6cb59143bb05d41b925b3a2b0e + languageName: node + linkType: hard + +"@jsdotlua/pretty-format@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/pretty-format@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/chalk": "npm:^0.2.1" + "@jsdotlua/jest-get-type": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-roblox-shared": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/react-is": "npm:^17.1.0" + luau-regexp: "npm:^0.2.1" + checksum: 10c0/c82724cf7d9f84e4a12dd24fa8a13238649a76182537cc02e973a88720bf007a538d6ffea6fdb771cae6421ceea7aa221d58f126e1ab0b54f617294e7c455dfd + languageName: node + linkType: hard + "@jsdotlua/promise@npm:^3.5.0": version: 3.5.0 resolution: "@jsdotlua/promise@npm:3.5.0" @@ -86,12 +524,16 @@ __metadata: languageName: node linkType: hard -"@jsdotlua/react-cache@workspace:modules/react-cache": +"@jsdotlua/react-cache@workspace:^, @jsdotlua/react-cache@workspace:modules/react-cache": version: 0.0.0-use.local resolution: "@jsdotlua/react-cache@workspace:modules/react-cache" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-react": "workspace:^" "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" "@jsdotlua/react": "workspace:^" + "@jsdotlua/react-test-renderer": "workspace:^" "@jsdotlua/scheduler": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" @@ -102,8 +544,13 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/react-debug-tools@workspace:modules/react-debug-tools" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + "@jsdotlua/react": "workspace:^" "@jsdotlua/react-reconciler": "workspace:^" + "@jsdotlua/react-test-renderer": "workspace:^" + "@jsdotlua/scheduler": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" languageName: unknown @@ -113,10 +560,12 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/react-devtools-extensions@workspace:modules/react-devtools-extensions" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" "@jsdotlua/luau-polyfill": "npm:^1.2.6" "@jsdotlua/react": "workspace:^" "@jsdotlua/react-devtools-shared": "workspace:^" "@jsdotlua/react-roblox": "workspace:^" + "@jsdotlua/react-test-renderer": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" languageName: unknown @@ -126,21 +575,43 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/react-devtools-shared@workspace:modules/react-devtools-shared" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" "@jsdotlua/react": "workspace:^" "@jsdotlua/react-debug-tools": "workspace:^" "@jsdotlua/react-is": "workspace:^" "@jsdotlua/react-reconciler": "workspace:^" "@jsdotlua/react-roblox": "workspace:^" + "@jsdotlua/react-test-renderer": "workspace:^" + "@jsdotlua/scheduler": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" languageName: unknown linkType: soft -"@jsdotlua/react-is@workspace:^, @jsdotlua/react-is@workspace:modules/react-is": +"@jsdotlua/react-is@npm:^17.1.0, @jsdotlua/react-is@workspace:^, @jsdotlua/react-is@workspace:modules/react-is": version: 0.0.0-use.local resolution: "@jsdotlua/react-is@workspace:modules/react-is" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + "@jsdotlua/react": "workspace:^" + "@jsdotlua/react-roblox": "workspace:^" + "@jsdotlua/shared": "workspace:^" + npmluau: "npm:^0.1.0" + languageName: unknown + linkType: soft + +"@jsdotlua/react-noop-renderer@workspace:^, @jsdotlua/react-noop-renderer@workspace:modules/react-noop-renderer": + version: 0.0.0-use.local + resolution: "@jsdotlua/react-noop-renderer@workspace:modules/react-noop-renderer" + dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/react-reconciler": "workspace:^" + "@jsdotlua/scheduler": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" languageName: unknown @@ -150,9 +621,16 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/react-reconciler@workspace:modules/react-reconciler" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-react": "workspace:^" "@jsdotlua/luau-polyfill": "npm:^1.2.6" "@jsdotlua/promise": "npm:^3.5.0" "@jsdotlua/react": "workspace:^" + "@jsdotlua/react-cache": "workspace:^" + "@jsdotlua/react-devtools-shared": "workspace:^" + "@jsdotlua/react-noop-renderer": "workspace:^" + "@jsdotlua/react-roblox": "workspace:^" + "@jsdotlua/react-test-renderer": "workspace:^" "@jsdotlua/scheduler": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" @@ -163,7 +641,9 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/react-roblox@workspace:modules/react-roblox" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" "@jsdotlua/react": "workspace:^" "@jsdotlua/react-reconciler": "workspace:^" "@jsdotlua/scheduler": "workspace:^" @@ -176,6 +656,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/react-shallow-renderer@workspace:modules/react-shallow-renderer" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" "@jsdotlua/luau-polyfill": "npm:^1.2.6" "@jsdotlua/react": "workspace:^" "@jsdotlua/react-is": "workspace:^" @@ -184,13 +665,17 @@ __metadata: languageName: unknown linkType: soft -"@jsdotlua/react-test-renderer@workspace:modules/react-test-renderer": +"@jsdotlua/react-test-renderer@workspace:^, @jsdotlua/react-test-renderer@workspace:modules/react-test-renderer": version: 0.0.0-use.local resolution: "@jsdotlua/react-test-renderer@workspace:modules/react-test-renderer" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-react": "workspace:^" "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" "@jsdotlua/react": "workspace:^" "@jsdotlua/react-reconciler": "workspace:^" + "@jsdotlua/react-roblox": "workspace:^" "@jsdotlua/scheduler": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" @@ -201,7 +686,14 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/react@workspace:modules/react" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-react": "workspace:^" "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + "@jsdotlua/react-cache": "workspace:^" + "@jsdotlua/react-noop-renderer": "workspace:^" + "@jsdotlua/react-roblox": "workspace:^" + "@jsdotlua/react-test-renderer": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" languageName: unknown @@ -211,9 +703,11 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/roact-compat@workspace:modules/roact-compat" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" "@jsdotlua/luau-polyfill": "npm:^1.2.6" "@jsdotlua/react": "workspace:^" "@jsdotlua/react-roblox": "workspace:^" + "@jsdotlua/scheduler": "workspace:^" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" languageName: unknown @@ -223,6 +717,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/scheduler@workspace:modules/scheduler" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" "@jsdotlua/luau-polyfill": "npm:^1.2.6" "@jsdotlua/shared": "workspace:^" npmluau: "npm:^0.1.0" @@ -233,7 +728,12 @@ __metadata: version: 0.0.0-use.local resolution: "@jsdotlua/shared@workspace:modules/shared" dependencies: + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-react": "workspace:^" "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/react": "workspace:^" + "@jsdotlua/react-noop-renderer": "workspace:^" + "@jsdotlua/scheduler": "workspace:^" npmluau: "npm:^0.1.0" languageName: unknown linkType: soft @@ -248,6 +748,16 @@ __metadata: languageName: node linkType: hard +"@jsdotlua/throat@npm:^3.6.1-rc.2": + version: 3.6.1-rc.2 + resolution: "@jsdotlua/throat@npm:3.6.1-rc.2" + dependencies: + "@jsdotlua/luau-polyfill": "npm:^1.2.6" + "@jsdotlua/promise": "npm:^3.5.0" + checksum: 10c0/306215bdc4d7baf8ff79cece3b6038123ea7b9d4fa41eaaba4ec9f0c9c48a8ed2e82bdbc1a256b16257188a8236d84deac4131a9a15e0a40c48aa51e93e285a6 + languageName: node + linkType: hard + "@jsdotlua/timers@npm:^1.2.6": version: 1.2.6 resolution: "@jsdotlua/timers@npm:1.2.6" @@ -264,6 +774,13 @@ __metadata: languageName: node linkType: hard +"luau-regexp@npm:^0.2.1": + version: 0.2.1 + resolution: "luau-regexp@npm:0.2.1" + checksum: 10c0/7badc4e6f9ab7753d77e49db3012c525fb85dff70930c806754edd86893a39c1afb1aba51aba00b2f456f72d7f02c6a8812a160646a05986bc6d1bfae6251494 + languageName: node + linkType: hard + "npmluau@npm:^0.1.0, npmluau@npm:^0.1.1": version: 0.1.1 resolution: "npmluau@npm:0.1.1" @@ -294,6 +811,8 @@ __metadata: version: 0.0.0-use.local resolution: "workspace@workspace:." dependencies: + "@jsdotlua/jest": "npm:^3.6.1-rc.2" + "@jsdotlua/jest-globals": "npm:^3.6.1-rc.2" commander: "npm:^11.1.0" npmluau: "npm:^0.1.1" languageName: unknown