Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/utils/hydrateWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ export const hydrateWrapper = (Component) => {
}

// @ts-expect-error ts-migrate(2531) FIXME: Object is possibly 'null'.
const viewData = JSON.parse(document.getElementById('view-data').getAttribute('data-json'));
const viewData = JSON.parse(document.getElementById('view-data')?.innerText);
const chunkName = JSON.parse(
// @ts-expect-error ts-migrate(2531) FIXME: Object is possibly 'null'.
document.getElementById('chunk-name').getAttribute('data-json'),
document.getElementById('chunk-name').innerText,
);
if (!isLocalEnv(window)) {
setupHeap(initialData);
Expand Down
2 changes: 1 addition & 1 deletion client/utils/initialData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let initialData;
export const getClientInitialData = () => {
if (!initialData) {
// @ts-expect-error ts-migrate(2531) FIXME: Object is possibly 'null'.
initialData = JSON.parse(document.getElementById('initial-data').getAttribute('data-json'));
initialData = JSON.parse(document.getElementById('initial-data').innerText);
}
return initialData;
};
15 changes: 8 additions & 7 deletions server/Html.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import path from 'path';
import React from 'react';
import classNames from 'classnames';
import App from 'containers/App/App';
import { CustomScripts, InitialData } from 'types';
import type { CustomScripts, InitialData } from 'types';

const manifest = require(path.join(
__dirname,
Expand Down Expand Up @@ -123,19 +123,20 @@ const Html = (props: Props) => {
/>
<script
id="initial-data"
type="text/plain"
data-json={JSON.stringify(props.initialData)}
type="application/json"
dangerouslySetInnerHTML={{ __html: JSON.stringify(props.initialData) }}
/>
<script
id="view-data"
type="text/plain"
data-json={JSON.stringify(props.viewData)}
type="application/json"
dangerouslySetInnerHTML={{ __html: JSON.stringify(props.viewData) }}
/>
<script
id="chunk-name"
type="text/plain"
data-json={JSON.stringify(props.chunkName)}
type="application/json"
dangerouslySetInnerHTML={{ __html: JSON.stringify(props.chunkName) }}
/>

<script src={getPath('vendor', 'js')} />
<script src={getPath('main', 'js')} />
{customScripts?.js && (
Expand Down