Skip to content
This repository was archived by the owner on Jan 22, 2026. It is now read-only.

Commit a34a3ae

Browse files
ediaminsamourirenovate[bot]dmanekestherkim
authored
Fix ref issue in DisplayAsWithRef component (#5)
* tickevents: remove unused enum values (ampproject#36159) * tickevents: remove unused enum values * Remove dupe of CLS, fidv, lj1,lj2 * format * 📦 Update cimg/openjdk Docker tag to v17 (ampproject#36172) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency rollup to v2.57.0 (ampproject#36134) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency @octokit/graphql to v4.7.0 (ampproject#35844) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * ♻️ Migrate `observeWithSharedInOb` to `observeIntersections` (ampproject#36106) * 🏗 Make setup-node step consistent across gh actions (ampproject#36175) * Partially revert "🏗 Parallelize `dist` steps (ampproject#35943)" (ampproject#36176) * Revert "🏗 Parallelize `dist` steps (ampproject#35943)" This reverts commit 1e2c808. * Partially allow parallelization for smaller tasks * Also include `compileAllJs` in the parallelized part * (amp-lightbox-gallery): opens to selected image, resolve ampproject#35920 (ampproject#36103) removed a unlayout call that would cause the image to default to the first slide * ♻️ preact inob: small cleanup (ampproject#36177) * preact inob: small cleanup * also remove current * build-system: only write version.txt once per dir (ampproject#36162) * build-system: only write version.txt once * output full set of * sort the paths * write files...not directories * succinct format * bind-impl: missing ampStateEl is a user error (ampproject#36113) * Update Yandex & ADFOX amp-ad codes (ampproject#35442) * 🧪Update OT token for attribution-reporting (ampproject#36181) * 🏗 Add `exports` for stylesheets to `package.json` (ampproject#36027) * Add styles.css export to package.json * Conditionally add export * Use `fast-glob` * Add separate export entry for each stylesheet * window support * sort for lint Co-authored-by: Jake Fried <samouri@users.noreply.github.com> * ✨ [bento][amp-iframe] Add validator rules for 1.0 (ampproject#36182) * 🚮 Sweep experiments older than 2021-02-01 (ampproject#35486) Sweep experiments last flipped globally up to 2021-02-01: - (2021-01-20, a9e2778) `adsense-ad-size-optimization`: 1 * UTF8 encoding/decoding library to deprecated utf8 functions in strings.h|cc (ampproject#36184) library. PiperOrigin-RevId: 398102411 Co-authored-by: Amaltas Bohra <amaltas@google.com> * Validator rollup (ampproject#36185) * cl/398081751 Use the proto message number instead of index for enums. * cl/398323481 Two-way sync for PR ampproject#36085. No-op, or fixes merge conflicts, if any. Co-authored-by: honeybadgerdontcare <sedano@google.com> * 📦 Update dependency @octokit/rest to v18.11.2 (ampproject#36180) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * deps: bump bento-compiler (ampproject#36191) * 📦 Update dependency @jest/core to v27.2.3 (ampproject#36189) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency esbuild to v0.12.25 (ampproject#35928) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update linting devDependencies (ampproject#36119) * 📦 Update linting devDependencies * Fix lint errors Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> Co-authored-by: Raghu Simha <rsimha@amp.dev> * 📦 Update dependency axios to 0.21.2 [SECURITY] (ampproject#35999) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency esbuild to v0.13.3 (ampproject#36198) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency tar to v6.1.9 [SECURITY] (ampproject#35509) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * performance-impl: cant check ampdoc vis hidden while null (ampproject#36197) * performance-impl: cant check ampdoc vis hidden before initted * Add unit test * 🏗 Add nice colors to release tagger logs (ampproject#36200) * log * comment * 📦 Update core devDependencies (ampproject#36196) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency @ampproject/worker-dom to v0.32.0 (ampproject#36138) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency google-closure-library to v20210808 (ampproject#35617) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * SwG Release 0.1.22.186 (ampproject#36202) * 📦 Update dependency chromedriver to v94 (ampproject#35951) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> Co-authored-by: Raghu Simha <rsimha@amp.dev> * 📦 Update dependency tar to v6.1.11 (ampproject#36203) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📖 `bento-facebook` Documentation (ampproject#36038) * [`bento-facebook`] Update the amp-facebook.md file for both 0.1 and 1.0. Add a README.md for 1.0 bento mode. * [`bento-facebook`] Add documentation to describe the amp-facebook usage outside of valid AMP docs. * [`bento-facebook`] Add readme.md for BentoFacebook. * [`bento-facebook`] Address PR comments to update some attribute names. * [`bento-facebook`] Update CDN link to bento-facebook-1.0.js. * [`bento-facebook`] Prettify amp-facebook.md. * [`bento-facebook`] Update dead link to FB documentation to a real link. * [`bento-facebook`] Update dead links to be valid. * 🚮 Clean up dead amp-sidebar code within stories (ampproject#36178) * Remove amp-sidebar code from extensions/amp-story * Remove amp-sidebar visual tests from examples/visual-tests/amp-story * Remove reference to amp-sidebar from amp-story-interactive README * Remove remaining amp-sidebar logic from extensions/amp-story * Remove amp-sidebar logic from amp-story-system-layer code * Remove amp-sidebar code from amp-story-store-service.js * Remove amp-sidebar storybook JS files * A few missed deletions in test-amp-story and build-system/ caught by linter * Revert extensions/amp-sidebar/*/storybook removal from forbidden terms * Add back the amp-sidebar storybook files * Add newline at end of each storybook file * Run amp get-zindex --fix * 🐛 [amp-story-panning-media] Set width on amp-img el (ampproject#36217) * Set width on amp-img el. * Add height * 📦 Update dependency @octokit/rest to v18.11.3 (ampproject#36212) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency eslint-plugin-react to v7.26.1 (ampproject#36214) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency @ampproject/bento-compiler to v0.0.9 (ampproject#36225) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * ♻️Don't fetch crypto signature verifier in no-signing (ampproject#36187) * 🐛 Force transfer of `amp-consent` element to the `FixedLayer` (ampproject#36223) Fixes ampproject#36063 `amp-consent` explicitly adds itself to the `FixedLayer`, transferring itself before the iframe is loaded. On a later pass, `FixedLayer` decides that `amp-consent` is not transferrable, so it returns it to the original `<body>` element. Enabling `forceTransfer` causes the return reparenting to not occur, thus preventing the iframe from loading a second time. * 📦 Update core dependencies (ampproject#35061) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency rollup to v2.58.0 (ampproject#36232) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * 📦 Update dependency @octokit/rest to v18.11.4 (ampproject#36227) Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> * [bento][amp-iframe] Add README (ampproject#36210) * [bento][amp-iframe] changes to publish to npm (ampproject#36190) * 🐛 fix broken link to Preact/React component section in various README (ampproject#36222) * 🏗 release: Update self-hosting support to use amp release (ampproject#36165) * Update self-host to use amp release `amp release` copies static files and downloaded resources to supplement an `amp dist` runtime. Support custom release flavor definitions and update the amp-framework-hosting documentation. * Fix typo in documentation * Prefer accessing argv instead of passing value * Skip cleaning custom configs by default * Review suggestions * [amp-iframe] iframe viewability (ampproject#36131) * bento amp-iframe: guard effect from running without a win (ampproject#36241) * 🚀 babel/terser: rename all amp privates with sentinel suffix (ampproject#36143) * configs: Separate user configs from output files (ampproject#36236) Identify user configuration files under build-system/global-configs as distinct from generated output. This will help avoid accidentally including them in the cleanup script in the future. * Fix ref issue in DisplayAsWithRef component * Update the fix Co-authored-by: Jake Fried <samouri@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <renovate[bot]@users.noreply.github.com> Co-authored-by: dmanek <506183+dmanek@users.noreply.github.com> Co-authored-by: Esther Kim <44627152+estherkim@users.noreply.github.com> Co-authored-by: Daniel Rozenberg <rodaniel@amp.dev> Co-authored-by: William Johnson <dethstrobe@gmail.com> Co-authored-by: Mikhail Troshev <mishanga@yandex-team.ru> Co-authored-by: Caleb Cordry <ccordry@google.com> Co-authored-by: Pascal Birchler <pascalb@google.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Allan Banaag <banaag@google.com> Co-authored-by: Amaltas Bohra <amaltas@google.com> Co-authored-by: honeybadgerdontcare <sedano@google.com> Co-authored-by: Raghu Simha <rsimha@amp.dev> Co-authored-by: qidonna <968756+qidonna@users.noreply.github.com> Co-authored-by: rebeccanthomas <64608436+rebeccanthomas@users.noreply.github.com> Co-authored-by: Corey Masanto <masanto@google.com> Co-authored-by: Philip Bell <philipbell@google.com> Co-authored-by: Alan Orozco <alanorozco@users.noreply.github.com> Co-authored-by: Matt Mower <mdmower@cmphys.com> Co-authored-by: Anurag Vasanwala <75766877+AnuragVasanwala@users.noreply.github.com>
1 parent 4d8699b commit a34a3ae

113 files changed

Lines changed: 3485 additions & 1739 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ executors:
6060
resource_class: xlarge
6161
jdk-docker-xlarge:
6262
docker:
63-
- image: cimg/openjdk:16.0-node
63+
- image: cimg/openjdk:17.0-node
6464
resource_class: xlarge
6565
macos-medium:
6666
macos:
@@ -125,7 +125,6 @@ commands:
125125
steps:
126126
- browser-tools/install-chrome:
127127
replace-existing: true
128-
chrome-version: 93.0.4577.63
129128
- browser-tools/install-chromedriver
130129
install_firefox:
131130
steps:

‎.eslintignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ build-system/dist
1313
build-system/server/new-server/transforms/dist
1414
build-system/tasks/performance/cache
1515
build-system/tasks/performance/results.json
16-
build-system/global-configs/custom-config.json
1716
dist
1817
dist.3p
1918
dist.tools
@@ -28,6 +27,11 @@ test/coverage-e2e
2827
validator/**/dist
2928
validator/export
3029

30+
# User configuration files
31+
# Keep this list in sync with .gitignore, .prettierignore, and build-system/tasks/clean.js
32+
build-system/global-configs/custom-config.json
33+
build-system/global-configs/custom-flavors-config.json
34+
3135
# Files and directories explicitly ignored by eslint
3236
**/node_modules/**
3337
build-system/babel-plugins/**/fixtures/**/*.js

‎.github/workflows/cut-nightly.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
fetch-depth: 100
2222

2323
- name: Set Up Node
24-
uses: actions/setup-node@v2.4.0
24+
uses: actions/setup-node@v2
25+
with:
26+
node-version: lts/*
2527

2628
- name: Set Up Environment
2729
run: sudo chown -R $(whoami) $(npm config get prefix)/{lib/node_modules,bin,share}

‎.github/workflows/publish-npm-packages.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ jobs:
3838
ref: ${{ github.events.inputs.ampversion }}
3939
- uses: actions/setup-node@v2
4040
with:
41-
check-latest: true
42-
registry-url: https://registry.npmjs.org
41+
node-version: lts/*
4342
- name: Get latest scripts
4443
run: |
4544
wget -q "https://raw.githubusercontent.com/ampproject/amphtml/main/build-system/npm-publish/utils.js" -O ./build-system/npm-publish/utils.js

‎.github/workflows/sweep-experiments.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
fetch-depth: 0
2222

2323
- name: Set Up Node
24-
uses: actions/setup-node@v2.4.0
24+
uses: actions/setup-node@v2
25+
with:
26+
node-version: lts/*
2527

2628
- name: Set Up Environment
2729
run: sudo chown -R $(whoami) $(npm config get prefix)/{lib/node_modules,bin,share}

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ build-system/dist
1313
build-system/server/new-server/transforms/dist
1414
build-system/tasks/performance/cache
1515
build-system/tasks/performance/results.json
16-
build-system/global-configs/custom-config.json
1716
dist
1817
dist.3p
1918
dist.tools
@@ -28,6 +27,11 @@ test/coverage-e2e
2827
validator/**/dist
2928
validator/export
3029

30+
# User configuration files
31+
# Keep this list in sync with .eslintignore, .prettierignore, and build-system/tasks/clean.js
32+
build-system/global-configs/custom-config.json
33+
build-system/global-configs/custom-flavors-config.json
34+
3135
# OS level files
3236
.DS_Store
3337
.g4ignore

‎.prettierignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ build-system/dist
1313
build-system/server/new-server/transforms/dist
1414
build-system/tasks/performance/cache
1515
build-system/tasks/performance/results.json
16-
build-system/global-configs/custom-config.json
1716
dist
1817
dist.3p
1918
dist.tools
@@ -28,6 +27,11 @@ test/coverage-e2e
2827
validator/**/dist
2928
validator/export
3029

30+
# User configuration files
31+
# Keep this list in sync with .gitignore, .eslintignore, and build-system/tasks/clean.js
32+
build-system/global-configs/custom-config.json
33+
build-system/global-configs/custom-flavors-config.json
34+
3135
# Files and directories explicitly ignored by prettier
3236
**/package*.json
3337
**/node_modules/**

‎ads/_config.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ const adConfig = jsonConfiguration({
100100
'adform': {},
101101

102102
'adfox': {
103-
prefetch: 'https://yastatic.net/pcode/adfox/loader.js',
103+
prefetch: 'https://yandex.ru/ads/system/context.js',
104+
preconnect: ['https://yastatic.net/'],
104105
renderStartImplemented: true,
105106
},
106107

@@ -1378,7 +1379,8 @@ const adConfig = jsonConfiguration({
13781379
},
13791380

13801381
'yandex': {
1381-
prefetch: 'https://an.yandex.ru/system/context_amp.js',
1382+
prefetch: 'https://yandex.ru/ads/system/context.js',
1383+
preconnect: ['https://yastatic.net/'],
13821384
renderStartImplemented: true,
13831385
},
13841386

‎ads/google/a4a/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const CDN_PROXY_REGEXP =
100100

101101
/** @const {string} */
102102
export const TOKEN_VALUE =
103-
'A560Vqrj/cxoDr3Ldu+cN8qcpkaPx5Yh67pvGScX0kOke10st2EAEQmfQrDKSlVJtF+oZ0WqUYbPLmY6nRQq5wAAAACVeyJvcmlnaW4iOiJodHRwczovL2FtcHByb2plY3Qub3JnOjQ0MyIsImZlYXR1cmUiOiJDb252ZXJzaW9uTWVhc3VyZW1lbnQiLCJleHBpcnkiOjE2MzE2NjM5OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWUsInVzYWdlIjoic3Vic2V0In0=';
103+
'A2dINGotLJuPqM6Wgp0s4V3te749O/VZEHqN0YsG4pfY+1pcjS5UaX1Bvcyz4aiShd8ZXPcT5spJazIzrbi5AwUAAACVeyJvcmlnaW4iOiJodHRwczovL2FtcHByb2plY3Qub3JnOjQ0MyIsImZlYXR1cmUiOiJDb252ZXJzaW9uTWVhc3VyZW1lbnQiLCJleHBpcnkiOjE2MzQwODMxOTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWUsInVzYWdlIjoic3Vic2V0In0=';
104104

105105
/**
106106
* Inserts origin-trial token for `attribution-reporting` if not already

‎ads/vendors/adfox.js‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,35 @@
11
import {loadScript, validateData} from '#3p/3p';
2-
import {yandex} from './yandex';
32

43
/**
54
* @param {!Window} global
65
* @param {!Object} data
76
*/
87
export function adfox(global, data) {
98
validateData(data, ['adfoxParams', 'ownerId']);
10-
loadScript(global, 'https://yastatic.net/pcode/adfox/loader.js', () =>
11-
initAdFox(global, data)
9+
loadScript(global, 'https://yandex.ru/ads/system/context.js', () =>
10+
renderAdFox(global, data)
1211
);
1312
}
1413

1514
/**
1615
* @param {!Window} global
17-
* @param {Object} data
16+
* @param {!Object} data
1817
*/
19-
function initAdFox(global, data) {
20-
const params = JSON.parse(data.adfoxParams);
18+
function renderAdFox(global, data) {
19+
const renderTo = 'adfox_container';
2120

22-
createContainer(global, 'adfox_container');
21+
createContainer(global, renderTo);
2322

2423
global.Ya.adfoxCode.create({
2524
ownerId: data.ownerId,
26-
containerId: 'adfox_container',
27-
params,
28-
onLoad: (data, onRender, onError) => {
29-
checkLoading(global, data, onRender, onError);
30-
},
25+
containerId: renderTo,
26+
params: JSON.parse(data.adfoxParams),
3127
onRender: () => global.context.renderStart(),
3228
onError: () => global.context.noContentAvailable(),
3329
onStub: () => global.context.noContentAvailable(),
3430
});
3531
}
3632

37-
/**
38-
* @param {!Window} global
39-
* @param {!Object} data
40-
* @param {!Object} onRender
41-
* @param {!Object} onError
42-
* @return {boolean}
43-
*/
44-
function checkLoading(global, data, onRender, onError) {
45-
if (data.bundleName === 'banner.direct') {
46-
const dblParams = {
47-
blockId: data.bundleParams.blockId,
48-
data: data.bundleParams.data,
49-
onRender,
50-
onError,
51-
};
52-
53-
yandex(global, dblParams);
54-
return false;
55-
}
56-
return true;
57-
}
58-
5933
/**
6034
* @param {!Window} global
6135
* @param {string} id

0 commit comments

Comments
 (0)