Skip to content

feat(server): add integrity attribute to JSX elements #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leovalette wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(server): add integrity attribute to JSX elements #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/server/__fixtures__/stats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"errors": [],
"warnings": [],
"hash": "6cacb38ddc45b9bbd140",
"hash": "993926e214fb7781ad85",
"publicPath": "/dist/node/",
"outputPath": "../../examples/server-side-rendering/public/dist/node",
"assetsByChunkName": {
Expand Down
3 changes: 3 additions & 0 deletions packages/server/src/ChunkExtractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ function assetToScriptElement(asset, extraProps) {
async
data-chunk={asset.chunk}
src={asset.url}
integrity={asset.integrity || undefined}
{...handleExtraProps(asset, extraProps)}
/>
)
Expand Down Expand Up @@ -128,6 +129,7 @@ function assetToStyleElement(asset, extraProps) {
data-chunk={asset.chunk}
rel="stylesheet"
href={asset.url}
integrity={asset.integrity || undefined}
{...handleExtraProps(asset, extraProps)}
/>
)
Expand Down Expand Up @@ -175,6 +177,7 @@ function assetToLinkElement(asset, extraProps) {
rel: asset.linkType,
as: asset.scriptType,
href: asset.url,
integrity: asset.integrity || undefined,
...handleExtraProps(asset, extraProps),
}
return <link {...props} />
Expand Down
148 changes: 148 additions & 0 deletions packages/server/src/ChunkExtractor.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,61 @@ describe('ChunkExtrator', () => {
]
`)
})

it('should add integrity if available in stats', () => {
const testExtractor = new ChunkExtractor({
stats: {
...stats,
namedChunkGroups: {
...stats.namedChunkGroups,
main: {
...stats.namedChunkGroups.main,
assets: stats.namedChunkGroups.main.assets.map(name => ({
name,
// pseudo hash - reversed name
integrity: name
.split('')
.reverse()
.join(''),
})),
},
},
},
outputPath: targetPath,
})
expect(testExtractor.getScriptElements({ crossorigin: 'anonymous' }))
.toMatchInlineSnapshot(`
Array [
<script
crossorigin="anonymous"
dangerouslySetInnerHTML={
Object {
"__html": "[]",
}
}
id="__LOADABLE_REQUIRED_CHUNKS__"
type="application/json"
/>,
<script
crossorigin="anonymous"
dangerouslySetInnerHTML={
Object {
"__html": "{\\"namedChunks\\":[]}",
}
}
id="__LOADABLE_REQUIRED_CHUNKS___ext"
type="application/json"
/>,
<script
async={true}
crossorigin="anonymous"
data-chunk="main"
integrity="sj.niam"
src="/dist/node/main.js"
/>,
]
`)
})
})

describe('#getStyleTags', () => {
Expand Down Expand Up @@ -617,6 +672,41 @@ describe('ChunkExtrator', () => {
]
`)
})

it('should add integrity if available in stats', () => {
const testExtractor = new ChunkExtractor({
stats: {
...stats,
namedChunkGroups: {
...stats.namedChunkGroups,
main: {
...stats.namedChunkGroups.main,
assets: stats.namedChunkGroups.main.assets.map(name => ({
name,
// pseudo hash - reversed name
integrity: name
.split('')
.reverse()
.join(''),
})),
},
},
},
outputPath: targetPath,
})
expect(testExtractor.getStyleElements({ crossorigin: 'anonymous' }))
.toMatchInlineSnapshot(`
Array [
<link
crossorigin="anonymous"
data-chunk="main"
href="/dist/node/main.css"
integrity="ssc.niam"
rel="stylesheet"
/>,
]
`)
})
})

describe('#getInlineStyleElements', () => {
Expand Down Expand Up @@ -921,6 +1011,64 @@ describe('ChunkExtrator', () => {
]
`)
})

it('should add integrity if available in stats', () => {
const testExtractor = new ChunkExtractor({
stats: {
...stats,
namedChunkGroups: {
...stats.namedChunkGroups,
main: {
...stats.namedChunkGroups.main,
assets: stats.namedChunkGroups.main.assets.map(name => ({
name,
// pseudo hash - reversed name
integrity: name
.split('')
.reverse()
.join(''),
})),
},
},
},
outputPath: targetPath,
})
expect(testExtractor.getLinkElements({ crossorigin: 'anonymous' }))
.toMatchInlineSnapshot(`
Array [
<link
as="style"
crossorigin="anonymous"
data-chunk="main"
href="/dist/node/main.css"
integrity="ssc.niam"
rel="preload"
/>,
<link
as="script"
crossorigin="anonymous"
data-chunk="main"
href="/dist/node/main.js"
integrity="sj.niam"
rel="preload"
/>,
<link
as="script"
crossorigin="anonymous"
data-parent-chunk="main"
href="/dist/node/letters-C.js"
rel="preload"
/>,
<link
as="script"
crossorigin="anonymous"
data-parent-chunk="main"
href="/dist/node/letters-D.js"
rel="prefetch"
/>,
]
`)
})
})

describe('#requireEntryPoint', () => {
Expand Down