Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ampjs.org on amp.dev #6687

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion boilerplate/templates/files/ads.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<style amp4ads-boilerplate>body{visibility:hidden}</style>
<script async src="https://cdn.ampproject.org/amp4ads-v0.js"></script>
<script async src="https://ampjs.org/amp4ads-v0.js"></script>
{{> render-delaying/amp-experiment-preload.html }}
{{> render-delaying/amp-dynamic-css-classes-preload.html }}
{{> fonts/google-preconnect.html }}
Expand Down
2 changes: 1 addition & 1 deletion boilerplate/templates/files/email.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html ⚡4email data-css-strict>
<head>
<meta charset="utf-8">
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<style amp4email-boilerplate>body{visibility:hidden}</style>
<style amp-custom>
h1 {
Expand Down
2 changes: 1 addition & 1 deletion boilerplate/templates/files/serviceworkerJs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
importScripts('https://cdn.ampproject.org/sw/amp-sw.js');
importScripts('https://ampjs.org/sw/amp-sw.js');

AMP_SW.init({
\{{#serviceworker.assetCaching}}
Expand Down
8 changes: 4 additions & 4 deletions boilerplate/templates/files/stories.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<meta name="description" content="This is the AMP Boilerplate.">
<link rel="preload" as="script" href="https://cdn.ampproject.org/v0.js">
<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-story-1.0.js">
<link rel="preload" as="script" href="https://ampjs.org/v0.js">
<link rel="preload" as="script" href="https://ampjs.org/v0/amp-story-1.0.js">
{{> render-delaying/amp-experiment-preload.html }}
{{> render-delaying/amp-dynamic-css-classes-preload.html }}
{{> media/hero-image-preload.html }}
{{> media/hero-video-preload.html }}
{{> fonts/google-preconnect.html }}
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<script async custom-element="amp-story" src="https://ampjs.org/v0/amp-story-1.0.js"></script>
{{> render-delaying/amp-experiment-import.html }}
{{> render-delaying/amp-dynamic-css-classes-import.html }}
<!-- Import other AMP Extensions here -->
Expand Down
4 changes: 2 additions & 2 deletions boilerplate/templates/files/websites.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<meta name="description" content="This is the AMP Boilerplate.">
<link rel="preload" as="script" href="https://cdn.ampproject.org/v0.js">
<link rel="preload" as="script" href="https://ampjs.org/v0.js">
{{> render-delaying/amp-experiment-preload.html }}
{{> render-delaying/amp-dynamic-css-classes-preload.html }}
{{> media/hero-image-preload.html }}
{{> media/hero-video-preload.html }}
{{> fonts/google-preconnect.html }}
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
{{> render-delaying/amp-experiment-import.html }}
{{> render-delaying/amp-dynamic-css-classes-import.html }}
<!-- Import other AMP Extensions here -->
Expand Down
16 changes: 8 additions & 8 deletions boilerplate/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<link rel="preload" href="/static/fonts/noto-sans-v7-latin-700.woff2" as="font" crossorigin>
<link rel="preload" href="/static/fonts/poppins-v5-latin-700.woff2" as="font" crossorigin>
<link rel="preload" href="/static/fonts/fira-mono-v7-latin-500.woff2" as="font" crossorigin>
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async custom-element="amp-bind" src="https://cdn.ampproject.org/v0/amp-bind-0.1.js"></script>
<script async custom-element="amp-list" src="https://cdn.ampproject.org/v0/amp-list-0.1.js"></script>
<script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
<script async custom-element="amp-install-serviceworker" src="https://cdn.ampproject.org/v0/amp-install-serviceworker-0.1.js"></script>
<script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js"></script>
<script async custom-element="amp-position-observer" src="https://cdn.ampproject.org/v0/amp-position-observer-0.1.js"></script>
<script async custom-element="amp-animation" src="https://cdn.ampproject.org/v0/amp-animation-0.1.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<script async custom-element="amp-bind" src="https://ampjs.org/v0/amp-bind-0.1.js"></script>
<script async custom-element="amp-list" src="https://ampjs.org/v0/amp-list-0.1.js"></script>
<script async custom-element="amp-analytics" src="https://ampjs.org/v0/amp-analytics-0.1.js"></script>
<script async custom-element="amp-install-serviceworker" src="https://ampjs.org/v0/amp-install-serviceworker-0.1.js"></script>
<script async custom-template="amp-mustache" src="https://ampjs.org/v0/amp-mustache-0.2.js"></script>
<script async custom-element="amp-position-observer" src="https://ampjs.org/v0/amp-position-observer-0.1.js"></script>
<script async custom-element="amp-animation" src="https://ampjs.org/v0/amp-animation-0.1.js"></script>
<style amp-custom>
{{{ highlightTheme }}}
{{scss 'components/atoms/headline.scss' }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\{{#googleAnalytics.selected}}
<script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
<script async custom-element="amp-analytics" src="https://ampjs.org/v0/amp-analytics-0.1.js"></script>
\{{/googleAnalytics.selected}}
2 changes: 1 addition & 1 deletion boilerplate/templates/partials/media/amp-video-import.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\{{#heroVideo.selected}}
<script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
<script async custom-element="amp-video" src="https://ampjs.org/v0/amp-video-0.1.js"></script>
\{{/heroVideo.selected}}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\{{#serviceworker.selected}}
<script async custom-element="amp-install-serviceworker" src="https://cdn.ampproject.org/v0/amp-install-serviceworker-0.1.js"></script>
<script async custom-element="amp-install-serviceworker" src="https://ampjs.org/v0/amp-install-serviceworker-0.1.js"></script>
\{{/serviceworker.selected}}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\{{#ampDynamicCss.selected}}
<script async custom-element="amp-dynamic-css-classes" src="https://cdn.ampproject.org/v0/amp-dynamic-css-classes-0.1.js"></script>
<script async custom-element="amp-dynamic-css-classes" src="https://ampjs.org/v0/amp-dynamic-css-classes-0.1.js"></script>
\{{/ampDynamicCss.selected}}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\{{#ampDynamicCss.selected}}
<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-dynamic-css-classes-0.1.js">
<link rel="preload" as="script" href="https://ampjs.org/v0/amp-dynamic-css-classes-0.1.js">
\{{/ampDynamicCss.selected}}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\{{#ampExperiment.selected}}
<script async custom-element="amp-experiment" src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js"></script>
<script async custom-element="amp-experiment" src="https://ampjs.org/v0/amp-experiment-0.1.js"></script>
\{{/ampExperiment.selected}}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\{{#ampExperiment.selected}}
<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-experiment-0.1.js">
<link rel="preload" as="script" href="https://ampjs.org/v0/amp-experiment-0.1.js">
\{{/ampExperiment.selected}}
2 changes: 1 addition & 1 deletion contributing/samples.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ This works for elements in the `<head>` as well:
```html
<head>
<!-- Import the amp-youtube component -->
<script async custom-element="amp-youtube" src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>
<script async custom-element="amp-youtube" src="https://ampjs.org/v0/amp-youtube-0.1.js"></script>
...
</head>
```
Expand Down
4 changes: 2 additions & 2 deletions examples/api/cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ examples.get('/query', (request, response) => {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
${STYLE}
<link rel="canonical" href="${request.originalUrl}">
Expand All @@ -87,7 +87,7 @@ examples.get('/invalid-amp', (request, response) => {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<title>Invalid AMP</title>
${STYLE}
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<meta charset="utf-8">
<title> Hello World</title>
<!-- AMPHTML ads require a custom version of the AMP runtime.-->
<script async src="https://cdn.ampproject.org/amp4ads-v0.js"></script>
<script async src="https://ampjs.org/amp4ads-v0.js"></script>
<meta name="viewport" content="width=device-width">
<!--
The AMPHTML ads boilerplate which is shorter than the regular AMP boilerplate. -->
Expand Down
2 changes: 1 addition & 1 deletion examples/source/0.introduction/Hello_World.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<meta charset="utf-8">
<title> Hello World</title>
<!-- The AMP runtime must be loaded as the second child of the `<head>` tag.-->
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<!--
AMP HTML files require a canonical link pointing to the regular HTML. If no HTML version exists, it should point to itself.
-->
Expand Down
4 changes: 2 additions & 2 deletions examples/source/0.introduction/Hello_World_Email.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<!-- The charset definition must be the first child of the `<head>` tag. -->
<meta charset="utf-8">
<!-- The AMP runtime.-->
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<!-- The AMP for Email boilerplate. -->
<style amp4email-boilerplate>body{visibility:hidden}</style>
<!-- Import AMP components in the header, for example the `amp-carousel` component. -->
<script async custom-element="amp-carousel" src="https://cdn.ampproject.org/v0/amp-carousel-0.1.js"></script>
<script async custom-element="amp-carousel" src="https://ampjs.org/v0/amp-carousel-0.1.js"></script>
<!--
### Allowed CSS properties and selectors

Expand Down
6 changes: 3 additions & 3 deletions examples/source/0.introduction/Stories_in_AMP.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<html amp lang="en">
<head>
<meta charset="utf-8">
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<!-- ## Setup -->
<!-- AMP Stories are written using AMPHTML and they use their own AMP extension: `amp-story`. The first step is to import the `amp-story` in the header. -->
<script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
<script async custom-element="amp-story" src="https://ampjs.org/v0/amp-story-1.0.js"></script>
<!-- AMP Stories can make use of other AMP extensions such as `amp-video`. However, AMP Stories support only a subset of the available AMP extensions. You can find a full list of the supported extensions [here](/content/amp-dev/documentation/components/reference/amp-story.md#children-of-amp-story-grid-layer). -->
<script async custom-element="amp-video" src="https://cdn.ampproject.org/v0/amp-video-0.1.js"></script>
<script async custom-element="amp-video" src="https://ampjs.org/v0/amp-video-0.1.js"></script>
<title>Stories in AMP - Hello World</title>
<meta name="viewport" content="width=device-width">
<link rel="canonical" href="<% canonical %>">
Expand Down
4 changes: 2 additions & 2 deletions examples/source/1.components/amp-3d-gltf.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
<meta charset="utf-8">
<link rel="canonical" href="<% canonical %>">
<meta name="viewport" content="width=device-width">
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<title>amp-3d-gltf</title>
<!-- ## Setup -->
<!--
Import the `amp-3d-gltf` component in the header.
-->
<script async custom-element="amp-3d-gltf" src="https://cdn.ampproject.org/v0/amp-3d-gltf-0.1.js"></script>
<script async custom-element="amp-3d-gltf" src="https://ampjs.org/v0/amp-3d-gltf-0.1.js"></script>
<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
</head>
<body>
Expand Down
8 changes: 4 additions & 4 deletions examples/source/1.components/amp-access-laterpay.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<title>amp-access-laterpay</title>
<link rel="canonical" href="<% canonical %>">
<meta name="viewport" content="width=device-width">
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>

<!-- ## Setup -->
<!-- Import the `amp-access` component in the header. -->
<script async custom-element="amp-access" src="https://cdn.ampproject.org/v0/amp-access-0.1.js"></script>
<script async custom-element="amp-access" src="https://ampjs.org/v0/amp-access-0.1.js"></script>
<!-- `amp-access` requires `amp-analytics` to be imported as well. -->
<script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
<script async custom-element="amp-analytics" src="https://ampjs.org/v0/amp-analytics-0.1.js"></script>
<!-- And of course the `amp-access-laterpay` component. -->
<script async custom-element="amp-access-laterpay" src="https://cdn.ampproject.org/v0/amp-access-laterpay-0.2.js"></script>
<script async custom-element="amp-access-laterpay" src="https://ampjs.org/v0/amp-access-laterpay-0.2.js"></script>

<!-- Add the configuration which specifies the vendor, and vendor specific configuration for `amp-access` -->
<script id="amp-access" type="application/json">
Expand Down
8 changes: 4 additions & 4 deletions examples/source/1.components/amp-access.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
<head>
<meta charset="utf-8">
<title>amp-access</title>
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>

<!-- ## Setup -->
<!-- Import the `amp-access` component in the header. -->
<script async custom-element="amp-access" src="https://cdn.ampproject.org/v0/amp-access-0.1.js"></script>
<script async custom-element="amp-access" src="https://ampjs.org/v0/amp-access-0.1.js"></script>
<!-- `amp-access` requires `amp-analytics` to be imported as well. -->
<script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
<script async custom-element="amp-analytics" src="https://ampjs.org/v0/amp-analytics-0.1.js"></script>

<!-- Optionally, use the [`amp-mustache`](/content/amp-dev/documentation/components/reference/amp-mustache-v0.2.md) component to show text with values replaced from the authorization response -->
<script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js"></script>
<script async custom-template="amp-mustache" src="https://ampjs.org/v0/amp-mustache-0.2.js"></script>

<!-- Add the configuration for the `authorization` and the `login` endpoints. We provide two login endpoints, one for sign-in and one for sign-out. It is also possible to create a fallback response that will be used if the authorization fails with the `authorizationFallbackResponse` attribute.

Expand Down
4 changes: 2 additions & 2 deletions examples/source/1.components/amp-accordion.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<head>
<meta charset="utf-8">
<title>amp-accordion</title>
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<!-- ## Setup -->
<!--
Import the `amp-accordion` component.
-->
<script async custom-element="amp-accordion" src="https://cdn.ampproject.org/v0/amp-accordion-0.1.js"></script>
<script async custom-element="amp-accordion" src="https://ampjs.org/v0/amp-accordion-0.1.js"></script>
<link rel="canonical" href="<% canonical %>">
<meta name="viewport" content="width=device-width">
<style amp-boilerplate> body { -webkit-animation: -amp-start 8s steps(1, end) 0s 1 normal both; -moz-animation: -amp-start 8s steps(1, end) 0s 1 normal both; -ms-animation: -amp-start 8s steps(1, end) 0s 1 normal both; animation: -amp-start 8s steps(1, end) 0s 1 normal both } @-webkit-keyframes -amp-start { from { visibility: hidden } to { visibility: visible } } @-moz-keyframes -amp-start { from { visibility: hidden } to { visibility: visible } } @-ms-keyframes -amp-start { from { visibility: hidden } to { visibility: visible } } @-o-keyframes -amp-start { from { visibility: hidden } to { visibility: visible } } @keyframes -amp-start { from { visibility: hidden } to { visibility: visible } } </style><noscript> <style amp-boilerplate> body { -webkit-animation: none; -moz-animation: none; -ms-animation: none; animation: none } </style> </noscript>
Expand Down
4 changes: 2 additions & 2 deletions examples/source/1.components/amp-ad.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<head>
<meta charset="utf-8">
<title>amp-ad</title>
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async src="https://ampjs.org/v0.js"></script>
<!-- ## Setup -->
<!-- Import the `amp-ad` component in the header. -->
<script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
<script async custom-element="amp-ad" src="https://ampjs.org/v0/amp-ad-0.1.js"></script>
<link rel="canonical" href="<% canonical %>">
<meta name="viewport" content="width=device-width">
<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
Expand Down
Loading