Skip to content

♻️ Define helper for hash params and drop barely-used getMode().log#35628

Merged
rcebulko merged 11 commits intoampproject:mainfrom
rcebulko:hash-params
Aug 12, 2021
Merged

♻️ Define helper for hash params and drop barely-used getMode().log#35628
rcebulko merged 11 commits intoampproject:mainfrom
rcebulko:hash-params

Conversation

@rcebulko
Copy link
Copy Markdown
Contributor

It's only used in log.js, so we move the parsing etc. there.

@rcebulko rcebulko marked this pull request as ready for review August 11, 2021 21:53
@rcebulko rcebulko requested a review from samouri August 11, 2021 21:53
@amp-owners-bot amp-owners-bot bot requested a review from lannka August 11, 2021 21:53
@amp-owners-bot
Copy link
Copy Markdown

Hey @jridgewell! These files were changed:

src/core/types/string/url.js

Copy link
Copy Markdown
Contributor Author

@rcebulko rcebulko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

owners bump

@rcebulko rcebulko enabled auto-merge (squash) August 12, 2021 18:27
src/log.js Outdated
defaultLevelWithFunc_(win) {
// Delegate to the specific resolver.
return this.levelFunc_(getMode().log, getMode().development);
return this.levelFunc_(logHashParam(win), getMode().development);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this is incorrect. Previously we always used the global window (the root AMP doc) and checked it for the hash. The global window is constant (it's per script evaluation), even when we create a log constructor for the embed window. That means the embed iframe doesn't need the #log=foo hash, because only the root window's hash matters.

With this change, we'll be using the embed iframe's window when we create the embed iframe's log. Now the embed iframe needs the #log hash, too.

Suggested change
return this.levelFunc_(logHashParam(win), getMode().development);
return this.levelFunc_(logHashParam(), getMode().development);

* @private
*/
defaultLevelWithFunc_() {
defaultLevelWithFunc_(opt_win) {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jridgewell Updated this so the Window param to defaultLevelWithFunc_ is optional, and is not passed in by defaultLevel_ but the test can still pass it in. I plan to simplify it all further eventually, but not in this PR.

@rcebulko rcebulko merged commit b9e41a2 into ampproject:main Aug 12, 2021
@rcebulko rcebulko deleted the hash-params branch August 12, 2021 21:05
zoharnyego added a commit to apester-dev/amphtml that referenced this pull request Aug 12, 2021
commit b9e41a2
Author: Ryan Cebulko <ryan@cebulko.com>
Date:   Thu Aug 12 16:47:01 2021 -0400

    ♻️ Define helper for hash params and drop barely-used `getMode().log` (ampproject#35628)

    * Add getHashParams helper

    * Add win param

    * Update mode.js to use helper

    * Add tests

    * Update callsites

    * Remove getMode().log uses

    * Remove log from ModeDef type

    * Lint fixes

    * Fix tests

    * Split up isModeDevelopment

commit 0e66e28
Author: Alan Orozco <alanorozco@users.noreply.github.com>
Date:   Thu Aug 12 13:25:34 2021 -0700

    🚮 Remove `<amp-story>` check for `<amp-audio>` actions (ampproject#35643)

    Removes check from `<amp-audio>` that prevents actions when descending from an `<amp-story>` element.

    `<amp-story>` now has an action allowlist, so the check was redundant. The action is still prevented, triggering the message '[Action] "AMP-AUDIO.play" is not allowlisted []'.

commit 6b46842
Author: honeybadgerdontcare <honeybadgerdontcare@users.noreply.github.com>
Date:   Thu Aug 12 13:19:24 2021 -0700

    Update link to modifications best practices (ampproject#35647)

    * Update link to modifications best practices

    * Update dead links

commit a59d776
Author: Raghu Simha <rsimha@amp.dev>
Date:   Thu Aug 12 14:31:55 2021 -0400

    🏗 Move Edge testing from GH Actions to CircleCI (ampproject#35630)

commit b6476c3
Author: Khoi Doan <khoid@google.com>
Date:   Thu Aug 12 13:47:16 2021 -0400

    ✨ Add bitness to User Agent Client Hint Params in ad requests (ampproject#35612)

    * Add User Agent Client Hint Params to Google Ads.

    * Update the param names.

    * Add timeout for UACH promise (1 second).

    * Use fake timers for timeout test.

    * Lint

    * Add exception for dependency on promise.js.

    * Add bitness field to User Agent Client Hints params

    * Fix merge

    * Fix merge again

    * Lint

commit 87d5d14
Author: Ryan Cebulko <ryan@cebulko.com>
Date:   Thu Aug 12 13:43:51 2021 -0400

    ♻️  Remove `version` from legacy mode object (ampproject#35624)

    * Remove `version` from legacy mode object

    * Restore version to mode-object for now

    * Remove version entirely

    * Lint fixes

    * Fix transformer test fixtures

    * Fix test

commit 00b8e7e
Author: Brandon Suen <brandonbsuen@google.com>
Date:   Thu Aug 12 10:31:56 2021 -0700

    📖 [Story interactive] Add Documentation for Image Quizzes and Polls (ampproject#35618)

    * Documentation text added

    * Add images and source code

    * Reorganize in alphabetical order

    * Reordering

    * Add additional attributes

    * Fix typo

    * Fix typo

    * Fix typo

    * Update screenshots

    * Add note about image sizes

    * Revise note about image size

commit 9813cea
Author: Ryan Cebulko <ryan@cebulko.com>
Date:   Thu Aug 12 13:27:55 2021 -0400

    ♻️ #core form, modal, amp-element-helpers ("real" diff in desc) (ampproject#35608)

    * Update src/form code

    * Update src/modal code

    * Update src/video-interface code

    * Move src/{form,modal,amp-element-helpers} -> #core/dom

    * Fix types

    * update dep-check config

    * Remove bad assert

    * Update imports of form,modal,amp-element-helpers

    * Fix rebase error

commit 4ed4b92
Author: Philip Bell <philip.hunter.bell@gmail.com>
Date:   Thu Aug 12 12:38:05 2021 -0400

    Null check on orientation lock. (ampproject#35639)

commit 5ff32ad
Author: Chris Antaki <ChrisAntaki@gmail.com>
Date:   Wed Aug 11 15:12:58 2021 -0700

    SwG Release 0.1.22.179 (ampproject#35629)

commit 2106624
Author: Matias Szylkowski <mszylkowski@google.com>
Date:   Wed Aug 11 17:13:54 2021 -0400

    📖 [Story sidebar] Removed sidebar from docs (ampproject#35616)

    * removed sidebar and bookend docs

    * removed unused import

    * revert test removals

    * Add newline on visual test html

commit d21ecc0
Author: Ryan Cebulko <ryan@cebulko.com>
Date:   Wed Aug 11 17:01:02 2021 -0400

    ♻️ #core: error helpers (ampproject#35621)

    * Define core/error helpers

    * Drop createErrorVargs

    * Restore name assignment in Log#error

    * Typechecking/extern

    * Remove unused error_ helper

    * Typo

    * Add @ returns

commit 6404407
Author: Brandon Suen <brandonbsuen@google.com>
Date:   Wed Aug 11 13:33:02 2021 -0700

    ✅ [Story interactive] Rename Example Image Quiz and Poll Stories to Use .amp.html Extension (ampproject#35511)

    * Rename examples to use .amp.html extension

    * Remove confetti from results
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants