core: resolve redirected script records #13751
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| </head> | ||
| <body> | ||
| <h1>I have a script that redirects</h1> | ||
| <script src="/simple-script.js?redirect=%2Funused-javascript.js%3Fgzip%3D1"></script> | ||
| <script> | ||
| Array.prototype.findIndex = function() {}; | ||
| </script> | ||
| </body> | ||
| </html> |
This file contains 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 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 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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /** | ||
| * @license Copyright 2020 The Lighthouse Authors. All Rights Reserved. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. | ||
| */ | ||
| 'use strict'; | ||
|
|
||
| /** @type {LH.Config.Json} */ | ||
| const config = { | ||
| extends: 'lighthouse:default', | ||
| settings: { | ||
| onlyAudits: [ | ||
| 'legacy-javascript', | ||
| 'unused-javascript', | ||
| ], | ||
| }, | ||
| }; | ||
|
|
||
| /** | ||
| * @type {Smokehouse.ExpectedRunnerResult} | ||
| */ | ||
| const expectations = { | ||
| lhr: { | ||
| runWarnings: [ | ||
| /The page may not be loading as expected/, | ||
| ], | ||
| requestedUrl: 'http://localhost:10200/online-only.html?redirect=/redirects-scripts.html', | ||
| finalUrl: 'http://localhost:10200/redirects-scripts.html', | ||
| audits: { | ||
| 'unused-javascript': { | ||
| details: { | ||
| items: [ | ||
| { | ||
| // A sourced script that redirects will use the value of the `src` attribute as it's script URL. | ||
| // This check ensures that we resolve the redirect and use the final redirect network request to compute savings. | ||
| // We can distinguish using totalBytes because the final request is compressed while the redirect request is not. | ||
| url: 'http://localhost:10200/simple-script.js?redirect=%2Funused-javascript.js%3Fgzip%3D1', | ||
| totalBytes: '285000 +/- 2000', | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| 'legacy-javascript': { | ||
| details: { | ||
| items: [ | ||
| { | ||
| // An inline script that in a document that redirects will take the destination URL as it's script URL. | ||
| url: 'http://localhost:10200/redirects-scripts.html', | ||
| subItems: { | ||
| items: [ | ||
| {signal: 'Array.prototype.findIndex'}, | ||
| ], | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }; | ||
|
|
||
| export default { | ||
| id: 'redirects-scripts', | ||
| expectations, | ||
| config, | ||
| }; |
This file contains 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 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 |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ const ByteEfficiencyAudit = require('./byte-efficiency-audit.js'); | |
| const JsBundles = require('../../computed/js-bundles.js'); | ||
| const i18n = require('../../lib/i18n/i18n.js'); | ||
| const thirdPartyWeb = require('../../lib/third-party-web.js'); | ||
| const {getRequestForScript} = require('../../lib/script-helpers.js'); | ||
|
|
||
| const UIStrings = { | ||
| /** Title of a Lighthouse audit that tells the user about legacy polyfills and transforms used on the page. This is displayed in a list of audit titles that Lighthouse generates. */ | ||
|
|
@@ -372,11 +372,8 @@ class LegacyJavascript extends ByteEfficiencyAudit { | |
| let transferRatio = transferRatioByUrl.get(url); | ||
| if (transferRatio !== undefined) return transferRatio; | ||
|
|
||
|
There was a problem hiding this comment. Using I think it makes more sense to just get the main document record using the script URL like any other script in this case. For timespan/snapshot, There was a problem hiding this comment. yup! and this would very much be a bug for inline scripts in iframes. not sure why we (Read: I) did it this way 🤔 |
||
| const script = artifacts.Scripts.find(script => script.url === url); | ||
| const networkRecord = getRequestForScript(networkRecords, script); | ||
|
|
||
| if (!script || script.content === null) { | ||
| // Can't find content, so just use 1. | ||
|
|
||
This file contains 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 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 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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /** | ||
| * @license Copyright 2022 The Lighthouse Authors. All Rights Reserved. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. | ||
| */ | ||
| 'use strict'; | ||
|
|
||
| /** | ||
| * @param {LH.Artifacts.NetworkRequest[]} networkRecords | ||
| * @param {LH.Artifacts.Script|undefined} script | ||
| * @return {LH.Artifacts.NetworkRequest|undefined} | ||
| */ | ||
| function getRequestForScript(networkRecords, script) { | ||
| if (!script) return; | ||
| let networkRequest = networkRecords.find(request => request.url === script.url); | ||
| while (networkRequest?.redirectDestination) { | ||
| networkRequest = networkRequest.redirectDestination; | ||
| } | ||
| return networkRequest; | ||
| } | ||
|
|
||
| module.exports = {getRequestForScript}; |
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.
could
const urlbe removed?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.
It's still used in multiple places, I think we can leave it.