-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
core: resolve redirected script records (#13751)
- Loading branch information
Showing
11 changed files
with
124 additions
and
13 deletions.
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> |
Large diffs are not rendered by default.
Oops, something went wrong.
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
66 changes: 66 additions & 0 deletions
66
lighthouse-cli/test/smokehouse/test-definitions/redirects-scripts.js
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
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}; |