Skip to content

Commit

Permalink
Merge branch 'main' of github.com:ampproject/amphtml into add/amp-fac…
Browse files Browse the repository at this point in the history
…ebook-like-bento-version

* 'main' of github.com:ampproject/amphtml: (23 commits)
  `amp-story-desktop-one-panel` Update demo with usecases (ampproject#34867)
  🚮 Remove src/purifier.js rollup config (ampproject#34876)
  Validator Rollup (ampproject#34769)
  ✨ `amp-story-desktop-one-panel` Check UI type to get page dimension on tap (ampproject#34875)
  Refactor: move getRealChildNodes and getRealChildren to core (ampproject#34813)
  🏗📖 Fix some example files that do not validate (ampproject#34835)
  🏗Add `#test` and `#testing` to alias list (ampproject#34853)
  Add css files for missing components (ampproject#34861)
  Apply bulk transform to html tags (ampproject#34836)
  🐛 amp-ima-video: Fix duration label on livestreams (ampproject#34865)
  ♻️  Extract `applyFillContent` into a standalone function (ampproject#34858)
  Give script tag closing tag (ampproject#34832)
  🏗 Refinements to renovate config (ampproject#34862)
  Bento: Enable `SocialShare` for npm publishing (ampproject#34817)
  🏗 Use aliased paths in generated extensions (ampproject#34860)
  ✨ `amp-story-desktop-one-panel` Position distance="2" page below viewport (ampproject#34834)
  🏗 Set `wrapper` on generated Bento extensions (ampproject#34843)
  🧪[story-ads] Allow viewer to set progress bar segment experiment. (ampproject#34827)
  🏗 Allow extension bundles to specify their own wrapper (ampproject#34845)
  🏗🚀 Speed up validated example grouping ~45x (ampproject#34837)
  ...
  • Loading branch information
westonruter committed Jun 16, 2021
2 parents 4870eef + d5e752a commit a7e72f4
Show file tree
Hide file tree
Showing 1,987 changed files with 8,054 additions and 7,711 deletions.
5 changes: 5 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = {
'import',
'jsdoc',
'local',
'module-resolver',
'notice',
'prettier',
'react',
Expand Down Expand Up @@ -189,6 +190,10 @@ module.exports = {
'local/unused-private-field': 2,
'local/vsync': 0,
'local/window-property-name': 2,
'module-resolver/use-alias': [
'error',
{'alias': getImportResolver().alias},
],
'no-alert': 2,
'no-cond-assign': 2,
'no-debugger': 2,
Expand Down
40 changes: 20 additions & 20 deletions .renovaterc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@
{
"groupName": "subpackage devDependencies",
"matchPaths": ["**/*"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "build-system devDependencies",
"matchPaths": ["build-system/**"],
"labels": ["WG: infra"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "validator devDependencies",
"matchPaths": ["validator/**"],
"labels": ["WG: caching"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "validator webui",
Expand All @@ -47,60 +47,60 @@
"groupName": "core devDependencies",
"matchFiles": ["package.json"],
"labels": ["WG: infra"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "linting devDependencies",
"matchFiles": ["package.json"],
"matchPackagePatterns": ["\\b(prettier|eslint)\\b"],
"labels": ["WG: infra"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "babel devDependencies",
"matchFiles": ["package.json"],
"matchPackagePatterns": ["\\bbabel"],
"major": {"automerge": false, "assignAutomerge": false},
"labels": ["WG: infra", "WG: performance"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "esbuild devDependencies",
"matchFiles": ["package.json"],
"matchPackagePatterns": ["\\besbuild\\b"],
"labels": ["WG: infra", "WG: performance"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "ampproject devDependencies",
"matchFiles": ["package.json"],
"matchPackagePatterns": ["^@ampproject/"],
"matchDepTypes": ["devDependencies"],
"labels": ["WG: bento", "WG: components", "WG: performance"],
"automerge": true,
"assignAutomerge": true
"rebaseWhen": "never",
"automerge": true
},
{
"groupName": "ampproject dependencies",
"matchFiles": ["package.json"],
"matchPackagePatterns": ["^@ampproject/"],
"matchDepTypes": ["dependencies"],
"labels": ["WG: bento", "WG: components", "WG: performance"],
"automerge": false,
"assignAutomerge": false
"rebaseWhen": "never",
"automerge": false
},
{
"groupName": "core dependencies",
"matchFiles": ["package.json"],
"excludePackagePatterns": ["^@ampproject/"],
"matchDepTypes": ["dependencies"],
"labels": ["WG: bento", "WG: components", "WG: performance"],
"automerge": false,
"assignAutomerge": false
"rebaseWhen": "never",
"automerge": false
}
]
}
8 changes: 4 additions & 4 deletions 3p/3d-gltf/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/

import {dict} from '../../src/core/types/object';
import {listenParent, nonSensitiveDataPostMessage} from '../messaging';
import {loadScript} from '../3p';
import {parseJson} from '../../src/core/types/object/json';
import {dict} from '#core/types/object';
import {listenParent, nonSensitiveDataPostMessage} from '#3p/messaging';
import {loadScript} from '#3p/3p';
import {parseJson} from '#core/types/object/json';
import {user} from '../../src/log';

import GltfViewer from './viewer';
Expand Down
2 changes: 1 addition & 1 deletion 3p/3d-gltf/viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

/* global THREE */

import {setStyle} from '../../src/core/dom/style';
import {setStyle} from '#core/dom/style';
import AnimationLoop from './animation-loop';

const CAMERA_DISTANCE_FACTOR = 1;
Expand Down
6 changes: 3 additions & 3 deletions 3p/3p.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
// Note: loaded by 3p system. Cannot rely on babel polyfills.

import {devAssert, userAssert} from '../src/log';
import {hasOwn, map} from '../src/core/types/object';
import {isArray} from '../src/core/types';
import {rethrowAsync} from '../src/core/error';
import {hasOwn, map} from '#core/types/object';
import {isArray} from '#core/types';
import {rethrowAsync} from '#core/error';

/** @typedef {function(!Window, !Object)} */
let ThirdPartyFunctionDef;
Expand Down
2 changes: 1 addition & 1 deletion 3p/ampcontext-integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import {AbstractAmpContext} from './ampcontext';
import {computeInMasterFrame} from './3p';
import {dev, user, userAssert} from '../src/log';
import {dict} from '../src/core/types/object';
import {dict} from '#core/types/object';

/**
* Returns the "master frame" for all widgets of a given type.
Expand Down
10 changes: 5 additions & 5 deletions 3p/ampcontext.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {AmpEvents} from '../src/core/constants/amp-events';
import {Deferred} from '../src/core/data-structures/promise';
import {AmpEvents} from '#core/constants/amp-events';
import {Deferred} from '#core/data-structures/promise';
import {IframeMessagingClient} from './iframe-messaging-client';
import {MessageType} from '../src/3p-frame-messaging';
import {dev, devAssert} from '../src/log';
import {dict, map} from '../src/core/types/object';
import {isObject} from '../src/core/types';
import {dict, map} from '#core/types/object';
import {isObject} from '#core/types';
import {parseUrlDeprecated} from '../src/url';
import {tryParseJson} from '../src/core/types/object/json';
import {tryParseJson} from '#core/types/object/json';

export class AbstractAmpContext {
/**
Expand Down
2 changes: 1 addition & 1 deletion 3p/beopinion.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import {loadScript} from './3p';
import {setStyles} from '../src/core/dom/style';
import {setStyles} from '#core/dom/style';

/**
* Produces the Twitter API object for the passed in callback. If the current
Expand Down
6 changes: 3 additions & 3 deletions 3p/bodymovinanimation.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/

import {dict} from '../src/core/types/object';
import {dict} from '#core/types/object';
import {getData} from '../src/event-helper';
import {loadScript} from './3p';
import {parseJson} from '../src/core/types/object/json';
import {setStyles} from '../src/core/dom/style';
import {parseJson} from '#core/types/object/json';
import {setStyles} from '#core/dom/style';

const libSourceUrl = dict({
'canvas':
Expand Down
4 changes: 2 additions & 2 deletions 3p/embedly.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

import {hasOwn} from '../src/core/types/object';
import {hasOwn} from '#core/types/object';
import {loadScript} from './3p';
import {setStyle} from '../src/core/dom/style';
import {setStyle} from '#core/dom/style';

/**
* Embedly platform library url to create cards.
Expand Down
8 changes: 4 additions & 4 deletions 3p/facebook.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*/

import {dashToUnderline} from '../src/core/types/string';
import {dashToUnderline} from '#core/types/string';
import {devAssert} from '../src/log';
import {dict} from '../src/core/types/object';
import {isEnumValue} from '../src/core/types/enum';
import {dict} from '#core/types/object';
import {isEnumValue} from '#core/types/enum';
import {loadScript} from './3p';
import {setStyle} from '../src/core/dom/style';
import {setStyle} from '#core/dom/style';

/** @const @enum {string} */
export const FacebookEmbedType = {
Expand Down
6 changes: 3 additions & 3 deletions 3p/frame-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/

import {dev} from '../src/log';
import {dict} from '../src/core/types/object';
import {dict} from '#core/types/object';
import {getMode} from '../src/mode';
import {once} from '../src/core/types/function';
import {parseJson} from '../src/core/types/object/json';
import {once} from '#core/types/function';
import {parseJson} from '#core/types/object/json';
import {parseUrlDeprecated} from '../src/url';

/**
Expand Down
4 changes: 2 additions & 2 deletions 3p/iframe-messaging-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import {
listen,
serializeMessage,
} from '../src/3p-frame-messaging';
import {Observable} from '../src/core/data-structures/observable';
import {Observable} from '#core/data-structures/observable';
import {dev} from '../src/log';
import {dict, map} from '../src/core/types/object';
import {dict, map} from '#core/types/object';
import {getData} from '../src/event-helper';
import {getMode} from '../src/mode';

Expand Down
2 changes: 1 addition & 1 deletion 3p/iframe-transport-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import {IframeMessagingClient} from './iframe-messaging-client';
import {MessageType} from '../src/3p-frame-messaging';
import {dev, devAssert, user, userAssert} from '../src/log';
import {tryParseJson} from '../src/core/types/object/json';
import {tryParseJson} from '#core/types/object/json';

/** @private @const {string} */
const TAG_ = 'iframe-transport-client';
Expand Down
6 changes: 3 additions & 3 deletions 3p/integration-lib.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

import {IntegrationAmpContext} from './ampcontext-integration';
import {dict} from '../src/core/types/object';
import {endsWith} from '../src/core/types/string';
import {dict} from '#core/types/object';
import {endsWith} from '#core/types/string';
import {getAmpConfig, getEmbedType, getLocation} from './frame-metadata';
import {getSourceUrl, isProxyOrigin, parseUrlDeprecated} from '../src/url';
import {
Expand All @@ -27,7 +27,7 @@ import {
} from '../src/log';
import {installEmbedStateListener, manageWin} from './environment';
import {internalRuntimeVersion} from '../src/internal-version';
import {parseJson} from '../src/core/types/object/json';
import {parseJson} from '#core/types/object/json';
import {run, setExperimentToggles} from './3p';
import {urls} from '../src/config';

Expand Down
Loading

0 comments on commit a7e72f4

Please sign in to comment.