Unverified Commit 2757826c authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Use `<script defer>` by default, matching `<script type=module>` (#9966)

* Use `<script defer>` by default, matching `<script module>` behavior

* remove old test
parent dea80b85
...@@ -673,9 +673,6 @@ export default async function getBaseWebpackConfig( ...@@ -673,9 +673,6 @@ export default async function getBaseWebpackConfig(
'process.env.__NEXT_EXPORT_TRAILING_SLASH': JSON.stringify( 'process.env.__NEXT_EXPORT_TRAILING_SLASH': JSON.stringify(
config.exportTrailingSlash config.exportTrailingSlash
), ),
'process.env.__NEXT_DEFER_SCRIPTS': JSON.stringify(
config.experimental.deferScripts
),
'process.env.__NEXT_MODERN_BUILD': JSON.stringify( 'process.env.__NEXT_MODERN_BUILD': JSON.stringify(
config.experimental.modern && !dev config.experimental.modern && !dev
), ),
......
...@@ -48,7 +48,6 @@ const defaultConfig: { [key: string]: any } = { ...@@ -48,7 +48,6 @@ const defaultConfig: { [key: string]: any } = {
plugins: false, plugins: false,
profiling: false, profiling: false,
sprFlushToDisk: true, sprFlushToDisk: true,
deferScripts: false,
reactMode: 'legacy', reactMode: 'legacy',
workerThreads: false, workerThreads: false,
basePath: '', basePath: '',
......
...@@ -566,8 +566,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -566,8 +566,7 @@ export class NextScript extends Component<OriginProps> {
return ( return (
<script <script
defer={process.env.__NEXT_DEFER_SCRIPTS as any} defer
async={!process.env.__NEXT_DEFER_SCRIPTS as any}
key={bundle.file} key={bundle.file}
src={`${assetPrefix}/_next/${encodeURI( src={`${assetPrefix}/_next/${encodeURI(
bundle.file bundle.file
...@@ -608,8 +607,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -608,8 +607,7 @@ export class NextScript extends Component<OriginProps> {
file file
)}${_devOnlyInvalidateCacheQueryString}`} )}${_devOnlyInvalidateCacheQueryString}`}
nonce={this.props.nonce} nonce={this.props.nonce}
defer={process.env.__NEXT_DEFER_SCRIPTS as any} defer
async={!process.env.__NEXT_DEFER_SCRIPTS as any}
crossOrigin={this.props.crossOrigin || process.crossOrigin} crossOrigin={this.props.crossOrigin || process.crossOrigin}
{...modernProps} {...modernProps}
/> />
...@@ -662,7 +660,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -662,7 +660,7 @@ export class NextScript extends Component<OriginProps> {
__NEXT_DATA__, __NEXT_DATA__,
bodyTags, bodyTags,
} = this.context._documentProps } = this.context._documentProps
const deferScripts: any = process.env.__NEXT_DEFER_SCRIPTS
const { _devOnlyInvalidateCacheQueryString } = this.context const { _devOnlyInvalidateCacheQueryString } = this.context
if (inAmpMode) { if (inAmpMode) {
...@@ -718,8 +716,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -718,8 +716,7 @@ export class NextScript extends Component<OriginProps> {
const pageScript = [ const pageScript = [
<script <script
defer={deferScripts} defer
async={!deferScripts}
data-next-page={page} data-next-page={page}
key={page} key={page}
src={ src={
...@@ -733,8 +730,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -733,8 +730,7 @@ export class NextScript extends Component<OriginProps> {
/>, />,
process.env.__NEXT_MODERN_BUILD && ( process.env.__NEXT_MODERN_BUILD && (
<script <script
defer={deferScripts} defer
async={!deferScripts}
data-next-page={page} data-next-page={page}
key={`${page}-modern`} key={`${page}-modern`}
src={ src={
...@@ -753,8 +749,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -753,8 +749,7 @@ export class NextScript extends Component<OriginProps> {
const appScript = [ const appScript = [
<script <script
defer={deferScripts} defer
async={!deferScripts}
data-next-page="/_app" data-next-page="/_app"
src={ src={
assetPrefix + assetPrefix +
...@@ -768,8 +763,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -768,8 +763,7 @@ export class NextScript extends Component<OriginProps> {
/>, />,
process.env.__NEXT_MODERN_BUILD && ( process.env.__NEXT_MODERN_BUILD && (
<script <script
defer={deferScripts} defer
async={!deferScripts}
data-next-page="/_app" data-next-page="/_app"
src={ src={
assetPrefix + assetPrefix +
......
module.exports = {
onDemandEntries: {
// Make sure entries are not getting disposed.
maxInactiveAge: 1000 * 60 * 60,
},
experimental: {
deferScripts: true,
},
}
export default () => <h1>Hello World</h1>
/* eslint-env jest */
/* global jasmine */
import { join } from 'path'
import {
nextServer,
runNextCommand,
startApp,
stopApp,
renderViaHTTP,
} from 'next-test-utils'
import cheerio from 'cheerio'
const appDir = join(__dirname, '../')
let appPort
let server
let app
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 5
const context = {}
describe('Defer Scripts', () => {
beforeAll(async () => {
await runNextCommand(['build', appDir])
app = nextServer({
dir: join(__dirname, '../'),
dev: false,
quiet: true,
})
server = await startApp(app)
context.appPort = appPort = server.address().port
})
afterAll(() => stopApp(server))
it('should have defer on all script tags', async () => {
const html = await renderViaHTTP(appPort, '/')
const $ = cheerio.load(html)
let missing = false
for (const script of $('script').toArray()) {
const { defer, type, src } = script.attribs
// application/json doesn't need defer
// polyfills cannot be deferred or async'd
if (type === 'application/json' || src.includes('polyfills')) {
continue
}
if (defer !== '') {
missing = true
}
}
expect(missing).toBe(false)
})
})
...@@ -678,7 +678,7 @@ describe('Production Usage', () => { ...@@ -678,7 +678,7 @@ describe('Production Usage', () => {
} }
}) })
it('should have async on all script tags', async () => { it('should have defer on all script tags', async () => {
const html = await renderViaHTTP(appPort, '/') const html = await renderViaHTTP(appPort, '/')
const $ = cheerio.load(html) const $ = cheerio.load(html)
let missing = false let missing = false
...@@ -692,7 +692,7 @@ describe('Production Usage', () => { ...@@ -692,7 +692,7 @@ describe('Production Usage', () => {
continue continue
} }
if (script.attribs.async !== '') { if (script.attribs.async === '' || script.attribs.defer !== '') {
missing = true missing = true
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment