Skip to content

Commit ffba8f0

Browse files
committed
Merge branch 'master' into enhancement/add-extra-data
2 parents 73ae5cf + a5b64c5 commit ffba8f0

File tree

594 files changed

+30583
-6125
lines changed

Some content is hidden

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

594 files changed

+30583
-6125
lines changed

.eslintrc

+58-42
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"es6": true,
1616
"browser": true
1717
},
18-
"parserOptions": {
18+
"parserOptions": {
1919
"ecmaVersion": 6,
2020
"sourceType": "module"
2121
},
@@ -33,7 +33,7 @@
3333
"file": "fileoverview",
3434
"returns": "return"
3535
},
36-
"allowOverrideWithoutParam" : true
36+
"allowOverrideWithoutParam": true
3737
}
3838
},
3939
"rules": {
@@ -43,25 +43,28 @@
4343
"curly": 2,
4444
"google-camelcase/google-camelcase": 2,
4545
"jsdoc/check-param-names": 2,
46-
"jsdoc/check-tag-names": [2, {
47-
"definedTags": [
48-
"closurePrimitive",
49-
"deprecated",
50-
"dict",
51-
"export",
52-
"final",
53-
"nocollapse",
54-
"noinline",
55-
"package",
56-
"record",
57-
"restricted",
58-
"struct",
59-
"suppress",
60-
"template",
61-
"visibleForTesting"
62-
]
63-
}],
64-
"jsdoc/check-types": [2, { "noDefaults": true }],
46+
"jsdoc/check-tag-names": [
47+
2,
48+
{
49+
"definedTags": [
50+
"closurePrimitive",
51+
"deprecated",
52+
"dict",
53+
"export",
54+
"final",
55+
"nocollapse",
56+
"noinline",
57+
"package",
58+
"record",
59+
"restricted",
60+
"struct",
61+
"suppress",
62+
"template",
63+
"visibleForTesting"
64+
]
65+
}
66+
],
67+
"jsdoc/check-types": [2, {"noDefaults": true}],
6568
"jsdoc/require-param": 2,
6669
"jsdoc/require-param-name": 2,
6770
"jsdoc/require-param-type": 2,
@@ -111,7 +114,7 @@
111114
"no-eval": 2,
112115
"no-extend-native": 2,
113116
"no-extra-bind": 2,
114-
"no-implicit-coercion": [2, { "boolean": false }],
117+
"no-implicit-coercion": [2, {"boolean": false}],
115118
"no-implied-eval": 2,
116119
"no-iterator": 2,
117120
"no-lone-blocks": 2,
@@ -123,16 +126,23 @@
123126
"no-sequences": 2,
124127
"no-throw-literal": 2,
125128
"no-unused-expressions": 0,
126-
"no-unused-vars": [2, {
127-
"argsIgnorePattern": "^(var_args$|opt_|unused)",
128-
"varsIgnorePattern": "(AmpElement|Def|Interface)$"
129-
}],
129+
"no-unused-vars": [
130+
2,
131+
{
132+
"argsIgnorePattern": "^(var_args$|opt_|unused)",
133+
"varsIgnorePattern": "(AmpElement|Def|Interface)$"
134+
}
135+
],
130136
"no-useless-call": 2,
131137
"no-useless-concat": 2,
132138
"no-undef": 2,
133139
"no-var": 2,
134-
"no-warning-comments": [2, { "terms": ["do not submit"], "location": "anywhere" }],
135-
"notice/notice": [2,
140+
"no-warning-comments": [
141+
2,
142+
{"terms": ["do not submit"], "location": "anywhere"}
143+
],
144+
"notice/notice": [
145+
2,
136146
{
137147
"mustMatch": "Copyright 20\\d{2} The AMP HTML Authors\\.",
138148
"templateFile": "build-system/common/LICENSE-TEMPLATE.txt",
@@ -141,24 +151,30 @@
141151
}
142152
}
143153
],
144-
"object-shorthand": [2, "properties", { "avoidQuotes": true }],
154+
"object-shorthand": [2, "properties", {"avoidQuotes": true}],
145155
"prefer-const": 2,
146156
"prettier/prettier": 2,
147157
"radix": 2,
148-
"require-jsdoc": [2, {
149-
"require": {
150-
"FunctionDeclaration": true,
151-
"MethodDefinition": true,
152-
"ClassDeclaration": false,
153-
"ArrowFunctionExpression": false,
154-
"FunctionExpression": false
158+
"require-jsdoc": [
159+
2,
160+
{
161+
"require": {
162+
"FunctionDeclaration": true,
163+
"MethodDefinition": true,
164+
"ClassDeclaration": false,
165+
"ArrowFunctionExpression": false,
166+
"FunctionExpression": false
167+
}
168+
}
169+
],
170+
"sort-imports-es6-autofix/sort-imports-es6": [
171+
2,
172+
{
173+
"ignoreCase": false,
174+
"ignoreMemberSort": false,
175+
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
155176
}
156-
}],
157-
"sort-imports-es6-autofix/sort-imports-es6": [2, {
158-
"ignoreCase": false,
159-
"ignoreMemberSort": false,
160-
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
161-
}],
177+
],
162178
"sort-requires/sort-requires": 2
163179
},
164180
"overrides": [

.github/ISSUE_TEMPLATE/intent-to-implement--i2i-.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ A clear and concise description of any alternative solutions or features you've
3636
<!--
3737
Add any other information that may help people understand your I2I.
3838
-->
39-
39+
## Launch tracker
40+
<!--
41+
The launch tracker is meant to be an easy way of sharing a project's status with others on the AMP Project.
42+
You should add a link to the launch tracker for this work here if applicable. One ideal template and instructions can be found here: bit.ly/amp-launch-tracker
43+
-->
4044

4145
<!--
4246
Add anyone to this cc line that you want to notify about this I2I, including a reviewer once you have found one. See https://github.com/ampproject/amphtml/blob/master/CONTRIBUTING.md for help in finding a reviewer.

.github/OWNERS

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
{
55
rules: [
66
{
7-
owners: [
8-
{ name: 'ampproject/wg-outreach' },
9-
{ name: 'ampproject/wg-infra' }
10-
]
11-
}
12-
]
7+
owners: [{name: 'ampproject/wg-outreach'}, {name: 'ampproject/wg-infra'}],
8+
},
9+
],
1310
}

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ npm-debug.log
1212
.idea
1313
.tm_properties
1414
.settings
15-
.vscode
1615
typings
1716
typings.json
1817
build-system/runner/dist
@@ -22,8 +21,6 @@ test/coverage
2221
*.swp
2322
*.swo
2423
yarn-error.log
25-
PERCY_BUILD_ID
26-
chromedriver.log
2724
sc-*-linux*
2825
sc-*-osx*
2926
sauce_connect_*

.lando.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,35 @@ tooling:
4343
service: appserver
4444
gulp:
4545
service: appserver
46-
cmd: "yarn gulp"
46+
cmd: 'yarn gulp'
4747
watch:
4848
service: appserver
49-
cmd: "yarn gulp watch"
50-
description: "Watches for changes in files, re-builds when detected"
49+
cmd: 'yarn gulp watch'
50+
description: 'Watches for changes in files, re-builds when detected'
5151
lint:
5252
service: appserver
53-
cmd: "yarn gulp lint"
54-
description: "Validates against Google Closure Linter"
53+
cmd: 'yarn gulp lint'
54+
description: 'Validates against Google Closure Linter'
5555
check-types:
5656
service: appserver
57-
cmd: "yarn gulp check-types"
58-
description: "Check source code for JS type errors"
57+
cmd: 'yarn gulp check-types'
58+
description: 'Check source code for JS type errors'
5959
dist:
6060
service: appserver
61-
cmd: "yarn gulp dist"
62-
description: "Build production binaries"
61+
cmd: 'yarn gulp dist'
62+
description: 'Build production binaries'
6363
unit:
6464
service: appserver
65-
cmd: "yarn gulp unit"
66-
description: "Run unit tests"
65+
cmd: 'yarn gulp unit'
66+
description: 'Run unit tests'
6767
integration:
6868
service: appserver
69-
cmd: "yarn gulp integration"
70-
description: "Run integration tests"
69+
cmd: 'yarn gulp integration'
70+
description: 'Run integration tests'
7171
e2e:
7272
service: appserver
73-
cmd: "yarn gulp e2e"
74-
description: "Runs e2e tests"
73+
cmd: 'yarn gulp e2e'
74+
description: 'Runs e2e tests'
7575

7676
proxy:
7777
appserver:

.lgtm.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
path_classifiers:
22
docs:
3-
- "**/*.md"
3+
- '**/*.md'
44
test:
5-
- "**/test/**/*.js"
6-
- "**/testing/**/*.js"
5+
- '**/test/**/*.js'
6+
- '**/testing/**/*.js'
77
third_party:
8-
- "third_party/**/*.*"
8+
- 'third_party/**/*.*'
99
externs:
10-
- "**/*.extern.js"
10+
- '**/*.extern.js'
1111
build-system:
12-
- "build-system/**/*.*"
12+
- 'build-system/**/*.*'
1313
extraction:
1414
javascript:
1515
index:

.prettierrc

+15-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,19 @@
22
"bracketSpacing": false,
33
"singleQuote": true,
44
"trailingComma": "es5",
5-
"quoteProps": "preserve"
5+
"quoteProps": "preserve",
6+
"overrides": [
7+
{
8+
"files": "OWNERS",
9+
"options": {"parser": "json5"}
10+
},
11+
{
12+
"files": [".eslintrc", ".prettierrc", ".renovaterc.json", "*.json"],
13+
"options": {"parser": "json"}
14+
},
15+
{
16+
"files": [".codecov.yml", ".lando.yml", ".lgtm.yml", ".travis.yml"],
17+
"options": {"parser": "yaml"}
18+
}
19+
]
620
}

.renovaterc.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
2-
"extends": [
3-
"config:base"
4-
],
2+
"extends": ["config:base"],
53
"node": {
6-
"supportPolicy": [
7-
"lts_active"
8-
]
4+
"supportPolicy": ["lts_active"]
95
},
106
"statusCheckVerify": true,
117
"commitMessagePrefix": "📦",

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ jobs:
9090
env:
9191
- CACHE_NAME=E2EJOB
9292
- stage: experiment
93-
name: "Experiment A Tests"
93+
name: 'Experiment A Tests'
9494
script:
9595
- unbuffer node build-system/pr-check/experiment-tests.js --experiment=experimentA
9696
- stage: experiment
97-
name: "Experiment B Tests"
97+
name: 'Experiment B Tests'
9898
script:
9999
- unbuffer node build-system/pr-check/experiment-tests.js --experiment=experimentB
100100
- stage: experiment
101-
name: "Experiment C Tests"
101+
name: 'Experiment C Tests'
102102
script:
103103
- unbuffer node build-system/pr-check/experiment-tests.js --experiment=experimentC
104104
before_cache:

tools/OWNERS .vscode/OWNERS

+3-7
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
{
55
rules: [
66
{
7-
owners: [
8-
{ name: 'ampproject/wg-infra' },
9-
{ name: 'ampproject/runtime' },
10-
{ name: 'ampproject/performance' }
11-
]
12-
}
13-
]
7+
owners: [{name: 'ampproject/wg-infra'}, {name: 'rsimha', notify: true}],
8+
},
9+
],
1410
}

.vscode/settings.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"files.associations": {
3+
// Enable JSON5 syntax highlighting and auto-formatting for OWNERS files.
4+
// Until VS Code adds native JSON5 support, this needs
5+
// https://marketplace.visualstudio.com/items?itemName=mrmlnc.vscode-json5
6+
"OWNERS": "json5",
7+
8+
// Enable JSON auto-formatting for these files.
9+
".eslintrc": "json",
10+
".prettierrc": "json",
11+
".renovaterc.json": "json",
12+
".codecov.yml": "yaml",
13+
".lando.yml": "yaml",
14+
".lgtm.yml": "yaml",
15+
".travis.yml": "yaml"
16+
},
17+
18+
// Auto-fix JS files with ESLint using amphtml's custom settings. Needs
19+
// https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint
20+
"eslint.autoFixOnSave": true,
21+
"[js]": {"editor.formatOnSave": false},
22+
23+
// Auto-fix non-JS files with Prettier using amphtml's custom settings. Needs
24+
// https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode
25+
"[yaml]": {"editor.formatOnSave": true},
26+
"[json]": {"editor.formatOnSave": true},
27+
"[json5]": {"editor.formatOnSave": true}
28+
}

3p/OWNERS

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
rules: [
66
{
7-
owners: [{ name: 'ampproject/wg-ads' }]
8-
}
9-
]
7+
owners: [{name: 'ampproject/wg-ads'}],
8+
},
9+
],
1010
}

0 commit comments

Comments
 (0)