archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add dropping of custom scripts in AMP mode (#6830)

Browse source 
Drops user `<script>` tags and shows a warning in AMP mode. Right now they are only dropped in production mode and left in dev mode so the validator shows its warning since it looks like conflicting props log messages are being cleared causing them to not show. 

Closes: #6688
This commit is contained in:
JJ Kasper 2019-03-29 11:20:12 -05:00 committed by Tim Neutkens
parent b6b0db186a
commit 26a4eb827c
3 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/next/pages/_document.js
View file

@ -186,6 +186,12 @@ export class Head extends Component {
badProp = 'name="viewport"'
} else if (type === 'link' && props.rel === 'canonical') {
badProp = 'rel="canonical"'
} else if (type === 'script') {
badProp = '<script'
Object.keys(props).forEach(prop => {
badProp += ` ${prop}="${props[prop]}"`
})
badProp += '/>'
}
if (badProp) {

13
test/integration/amphtml/pages/custom-scripts.js Normal file
View file

@ -0,0 +1,13 @@
import Head from 'next/head'
export default () => (
<div>
<Head>
<script src='/im-not-allowed.js' type='text/javascript' />
<script dangerouslySetInnerHTML={{
__html: `console.log("I'm not either :p")`
}} />
</Head>
<p>We only allow AMP scripts now</p>
</div>
)

6
test/integration/amphtml/test/index.test.js
View file

@ -107,6 +107,12 @@ describe('AMP Usage', () => {
'amp-boilerplate'
])
})
it('should drop custom scripts', async () => {
const html = await renderViaHTTP(appPort, '/custom-scripts')
expect(html).not.toMatch(/src='\/im-not-allowed\.js'/)
expect(html).not.toMatch(/console\.log("I'm not either :p")'/)
})
})
describe('With AMP context', () => {