Phase 3: Prepare core package for workspace structure #1830
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ tmp/ | |
| node_modules | ||
|
|
||
| /node_package/lib | ||
| /packages/*/lib | ||
|
|
||
| yarn-debug.* | ||
| yarn-error.* | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { createStore } from 'redux'; | ||
|
|
||
| import * as StoreRegistry from '../../packages/react-on-rails/src/pro/StoreRegistry.ts'; | ||
|
|
||
| function reducer() { | ||
| return {}; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import buildConsoleReplay, { consoleReplay } from '../../packages/react-on-rails/src/buildConsoleReplay.ts'; | ||
|
|
||
| describe('consoleReplay', () => { | ||
| it('does not throw an exception if no console.history object', () => { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,7 +1,7 @@ | ||||||||||||||||||||
| import { Readable, PassThrough } from 'stream'; | ||||||||||||||||||||
| import { RailsContextWithServerStreamingCapabilities } from '../../packages/react-on-rails/src/types/index.ts'; | ||||||||||||||||||||
| import injectRSCPayload from '../../packages/react-on-rails/src/pro/injectRSCPayload.ts'; | ||||||||||||||||||||
| import RSCRequestTracker from '../../packages/react-on-rails/src/pro/RSCRequestTracker.ts'; | ||||||||||||||||||||
|
||||||||||||||||||||
| import { RailsContextWithServerStreamingCapabilities } from '../../packages/react-on-rails/src/types/index.ts'; | |
| import injectRSCPayload from '../../packages/react-on-rails/src/pro/injectRSCPayload.ts'; | |
| import RSCRequestTracker from '../../packages/react-on-rails/src/pro/RSCRequestTracker.ts'; | |
| // node_package/tests/injectRSCPayload.test.ts | |
| -import { RailsContextWithServerStreamingCapabilities } from '../../packages/react-on-rails/src/types/index.ts'; | |
| -import injectRSCPayload from '../../packages/react-on-rails/src/pro/injectRSCPayload.ts'; | |
| import { RailsContextWithServerStreamingCapabilities } from 'react-on-rails/src/types/index.ts'; | |
| import injectRSCPayload from 'react-on-rails/src/pro/injectRSCPayload.ts'; | |
| import RSCRequestTracker from 'react-on-rails/src/pro/RSCRequestTracker.ts'; |
🧰 Tools
🪛 ESLint
[error] 2-2: Relative import from another package is not allowed. Use react-on-rails/src/types/index.ts instead of ../../packages/react-on-rails/src/types/index.ts
(import/no-relative-packages)
[error] 3-3: Relative import from another package is not allowed. Use react-on-rails/src/pro/injectRSCPayload.ts instead of ../../packages/react-on-rails/src/pro/injectRSCPayload.ts
(import/no-relative-packages)
[error] 4-4: Relative import from another package is not allowed. Use react-on-rails/src/pro/RSCRequestTracker.ts instead of ../../packages/react-on-rails/src/pro/RSCRequestTracker.ts
(import/no-relative-packages)
🤖 Prompt for AI Agents
In node_package/tests/injectRSCPayload.test.ts lines 2-4, the test currently
imports three modules via cross-package relative paths which violate the lint
rule; replace the three relative imports with the package's published workspace
alias (the react-on-rails package entry points) so the imports read from the
package name (e.g., react-on-rails or its scoped workspace name) instead of
'../../packages/react-on-rails/src/...', updating all three imports to use the
package alias.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -23,11 +23,11 @@ if (typeof window !== 'undefined') { | |||||||||||||||||||||||||||
| // Node's fetch and polyfills like jest-fetch-mock return Node's Readable stream, | ||||||||||||||||||||||||||||
| // so we convert it to a web-standard ReadableStream for consistency | ||||||||||||||||||||||||||||
| // Note: Node's Readable stream exists in node 'stream' built-in module, can be imported as `import { Readable } from 'stream'` | ||||||||||||||||||||||||||||
| jest.mock('../../packages/react-on-rails/src/utils', () => ({ | ||||||||||||||||||||||||||||
| ...jest.requireActual('../../packages/react-on-rails/src/utils'), | ||||||||||||||||||||||||||||
| fetch: (...args) => | ||||||||||||||||||||||||||||
| jest | ||||||||||||||||||||||||||||
| .requireActual('../../packages/react-on-rails/src/utils') | ||||||||||||||||||||||||||||
| .fetch(...args) | ||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
| jest.mock('../../packages/react-on-rails/src/utils', () => ({ | |
| ...jest.requireActual('../../packages/react-on-rails/src/utils'), | |
| fetch: (...args) => | |
| jest | |
| .requireActual('../src/utils') | |
| .requireActual('../../packages/react-on-rails/src/utils') | |
| .fetch(...args) | |
| jest.mock('react-on-rails/src/utils', () => ({ | |
| ...jest.requireActual('react-on-rails/src/utils'), | |
| fetch: (...args) => | |
| jest | |
| .requireActual('react-on-rails/src/utils') | |
| .fetch(...args) |
🤖 Prompt for AI Agents
In node_package/tests/jest.setup.js around lines 26-31, the jest.mock and
jest.requireActual calls use forbidden relative paths like
'../../packages/react-on-rails/src/utils'; update those paths to use the
repository's configured package alias (the package import name used in
tsconfig/webpack/jest moduleNameMapper, e.g. 'react-on-rails/src/utils' or the
exact alias your project uses) for both jest.mock and jest.requireActual calls,
and scan other test files for any remaining '../../packages/...' usages and
replace them with the same alias so ESLint passes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| */ | ||
|
|
||
| // Mock the turbolinksUtils module before importing pageLifecycle | ||
| jest.mock('../../packages/react-on-rails/src/turbolinksUtils.ts', () => ({ | ||
| debugTurbolinks: jest.fn(), | ||
| turbolinksInstalled: jest.fn(() => false), | ||
| turbolinksSupported: jest.fn(() => false), | ||
|
|
@@ -29,7 +29,7 @@ describe('pageLifecycle', () => { | |
| // We use require here instead of a global import at the top because we need to dynamically reload the module in each test. | ||
| // This allows us to reset the module state between tests using jest.resetModules(), ensuring test isolation and preventing state leakage. | ||
| // eslint-disable-next-line global-require | ||
| const importPageLifecycle = () => require('../../packages/react-on-rails/src/pageLifecycle.ts'); | ||
|
|
||
| // Helper function to create navigation library mock | ||
| const createNavigationMock = (overrides = {}) => ({ | ||
|
|
@@ -109,15 +109,15 @@ describe('pageLifecycle', () => { | |
|
|
||
| describe('with Turbo navigation library', () => { | ||
| beforeEach(() => { | ||
| jest.doMock('../../packages/react-on-rails/src/turbolinksUtils.ts', () => | ||
| createNavigationMock({ | ||
| turboInstalled: jest.fn(() => true), | ||
| }), | ||
| ); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| jest.dontMock('../../packages/react-on-rails/src/turbolinksUtils.ts'); | ||
| }); | ||
|
|
||
| it('should set up Turbo event listeners when Turbo is installed', () => { | ||
|
|
@@ -137,7 +137,7 @@ describe('pageLifecycle', () => { | |
|
|
||
| describe('with Turbolinks 5 navigation library', () => { | ||
| beforeEach(() => { | ||
| jest.doMock('../../packages/react-on-rails/src/turbolinksUtils.ts', () => | ||
| createNavigationMock({ | ||
| turbolinksInstalled: jest.fn(() => true), | ||
| turbolinksSupported: jest.fn(() => true), | ||
|
|
@@ -147,7 +147,7 @@ describe('pageLifecycle', () => { | |
| }); | ||
|
|
||
| afterEach(() => { | ||
| jest.dontMock('../../packages/react-on-rails/src/turbolinksUtils.ts'); | ||
| }); | ||
|
|
||
| it('should set up Turbolinks 5 event listeners when Turbolinks 5 is installed', () => { | ||
|
|
@@ -167,7 +167,7 @@ describe('pageLifecycle', () => { | |
|
|
||
| describe('with Turbolinks 2 navigation library', () => { | ||
| beforeEach(() => { | ||
| jest.doMock('../../packages/react-on-rails/src/turbolinksUtils.ts', () => | ||
| createNavigationMock({ | ||
| turbolinksInstalled: jest.fn(() => true), | ||
| turbolinksSupported: jest.fn(() => true), | ||
|
|
@@ -176,7 +176,7 @@ describe('pageLifecycle', () => { | |
| }); | ||
|
|
||
| afterEach(() => { | ||
| jest.dontMock('../../packages/react-on-rails/src/turbolinksUtils.ts'); | ||
| }); | ||
|
|
||
| it('should set up Turbolinks 2 event listeners when Turbolinks 2 is installed', () => { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,9 +10,9 @@ import '@testing-library/jest-dom'; | |
| import * as path from 'path'; | ||
| import * as fs from 'fs'; | ||
| import { createNodeReadableStream, getNodeVersion } from './testUtils.js'; | ||
| import ReactOnRails from '../../packages/react-on-rails/src/ReactOnRails.client.ts'; | ||
| import registerServerComponent from '../../packages/react-on-rails/src/pro/registerServerComponent/client.tsx'; | ||
| import { clear as clearComponentRegistry } from '../../packages/react-on-rails/src/pro/ComponentRegistry.ts'; | ||
|
|
||
| enableFetchMocks(); | ||
|
|
||
|
|
@@ -44,7 +44,7 @@ enableFetchMocks(); | |
|
|
||
| expect(() => { | ||
| // Re-import to trigger the check | ||
| jest.requireActual('../../packages/react-on-rails/src/pro/wrapServerComponentRenderer/client.tsx'); | ||
| }).toThrow('React.use is not defined'); | ||
| }); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ | |
| import * as React from 'react'; | ||
| import * as createReactClass from 'create-react-class'; | ||
|
|
||
| import isRenderFunction from '../../packages/react-on-rails/src/isRenderFunction.ts'; | ||
|
||
|
|
||
| describe('isRenderFunction', () => { | ||
| it('returns false for a ES5 React Component', () => { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import scriptSanitizedVal from '../../packages/react-on-rails/src/scriptSanitizedVal.ts'; | ||
|
|
||
| describe('scriptSanitizedVal', () => { | ||
| it('returns no </script if spaces, uppercase 1', () => { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| import * as React from 'react'; | ||
| import serverRenderReactComponent from '../../packages/react-on-rails/src/serverRenderReactComponent.ts'; | ||
| import * as ComponentRegistry from '../../packages/react-on-rails/src/pro/ComponentRegistry.ts'; | ||
|
||
| import type { | ||
| RenderParams, | ||
| RenderResult, | ||
| RailsContext, | ||
| RenderFunction, | ||
| RenderFunctionResult, | ||
| } from '../../packages/react-on-rails/src/types/index.ts'; | ||
|
|
||
| const assertIsString: (value: unknown) => asserts value is string = (value: unknown) => { | ||
| if (typeof value !== 'string') { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -4,9 +4,9 @@ | |||||||||||||
|
|
||||||||||||||
| import * as React from 'react'; | ||||||||||||||
| import * as PropTypes from 'prop-types'; | ||||||||||||||
| import streamServerRenderedReactComponent from '../../packages/react-on-rails/src/pro/streamServerRenderedReactComponent.ts'; | ||||||||||||||
| import * as ComponentRegistry from '../../packages/react-on-rails/src/pro/ComponentRegistry.ts'; | ||||||||||||||
| import ReactOnRails from '../../packages/react-on-rails/src/ReactOnRails.node.ts'; | ||||||||||||||
|
||||||||||||||
| import streamServerRenderedReactComponent from '../../packages/react-on-rails/src/pro/streamServerRenderedReactComponent.ts'; | |
| import * as ComponentRegistry from '../../packages/react-on-rails/src/pro/ComponentRegistry.ts'; | |
| import ReactOnRails from '../../packages/react-on-rails/src/ReactOnRails.node.ts'; | |
| import streamServerRenderedReactComponent from 'react-on-rails/src/pro/streamServerRenderedReactComponent.ts'; | |
| import * as ComponentRegistry from 'react-on-rails/src/pro/ComponentRegistry.ts'; | |
| import ReactOnRails from 'react-on-rails/src/ReactOnRails.node.ts'; |
🧰 Tools
🪛 ESLint
[error] 7-7: Relative import from another package is not allowed. Use react-on-rails/src/pro/streamServerRenderedReactComponent.ts instead of ../../packages/react-on-rails/src/pro/streamServerRenderedReactComponent.ts
(import/no-relative-packages)
[error] 8-8: Relative import from another package is not allowed. Use react-on-rails/src/pro/ComponentRegistry.ts instead of ../../packages/react-on-rails/src/pro/ComponentRegistry.ts
(import/no-relative-packages)
[error] 9-9: Relative import from another package is not allowed. Use react-on-rails/src/ReactOnRails.node.ts instead of ../../packages/react-on-rails/src/ReactOnRails.node.ts
(import/no-relative-packages)
🤖 Prompt for AI Agents
In node_package/tests/streamServerRenderedReactComponent.test.jsx around lines
7-9, the test imports use relative paths into packages which triggers
import/no-relative-packages; update each import to reference the workspace
package entrypoint instead (use the package name defined in that package's
package.json), e.g. replace the three relative imports with imports from the
workspace package name (pointing to the pro entry points exported by the
package) so tests import via the package alias rather than ../../packages/...,
and save the file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { enableFetchMocks } from 'jest-fetch-mock'; | ||
|
|
||
| import { fetch } from '../../packages/react-on-rails/src/utils.ts'; | ||
| import { createNodeReadableStream, getNodeVersion } from './testUtils.js'; | ||
|
|
||
| enableFetchMocks(); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Build before yalc publish to ensure lib exists
The workflow publishes via yalc without building first. Insert a build step before publishing.
📝 Committable suggestion
🤖 Prompt for AI Agents