docs(en): merge developer.chrome.com/main into developer.chrome.com/main @ 006bf169

.cloudbuild/deploy.yaml

@@ -17,10 +17,6 @@ steps:
     env:
       - 'NODE_OPTIONS="--max_old_space_size=8192"' # https://github.com/GoogleChrome/developer.chrome.com/issues/2439
 
-  - name: node:16.14.2
-    entrypoint: npm
-    args: ['run', 'algolia']
-
   - name: 'gcr.io/cloud-builders/gcloud'
     entrypoint: 'bash'
     args:

.cloudbuild/external.yaml

@@ -9,11 +9,6 @@ steps:
     entrypoint: npm
     args: ['ci']
 
-  - name: node:16.14.2
-    id: 'Configure secrets'
-    entrypoint: npm
-    args: ['run', 'cloud-secrets']
-
   - name: node:16.14.2
     id: 'Build external data'
     entrypoint: npm
@@ -34,6 +29,8 @@ steps:
   - name: node:16.14.2
     id: 'Build eleventy in dev mode to confirm'
     entrypoint: npm
+    env:
+      - 'NODE_OPTIONS="--max_old_space_size=8192"'
     args: ['run', 'eleventy']
     # This does NOT set `NODE_ENV=production`, as we don't need the full build.
 
@@ -49,3 +46,15 @@ options:
   env:
     - 'PROJECT_ID=$PROJECT_ID'
     - 'NODE_OPTIONS=--unhandled-rejections=strict'
+  secretEnv: ['GITHUB_APP_ID', 'GITHUB_APP_KEY', 'GITHUB_APP_INSTALLATION_ID', 'YOUTUBE_API_KEY']
+
+availableSecrets:
+  secretManager:
+    - versionName: projects/chrome-apps-doc/secrets/GITHUB_APP_ID/versions/1
+      env: 'GITHUB_APP_ID'
+    - versionName: projects/chrome-apps-doc/secrets/GITHUB_APP_KEY/versions/4
+      env: 'GITHUB_APP_KEY'
+    - versionName: projects/chrome-apps-doc/secrets/GITHUB_APP_INSTALLATION_ID/versions/1
+      env: 'GITHUB_APP_INSTALLATION_ID'
+    - versionName: projects/chrome-apps-doc/secrets/YOUTUBE_API_KEY/versions/1
+      env: 'YOUTUBE_API_KEY'

.cloudbuild/stage.yaml

@@ -1,12 +1,12 @@
 timeout: 2700s # Set build timeout to 45 mins
 steps:
   - id: 'install'
-    name: node:18
+    name: node:16
     entrypoint: npm
     args: ['ci']
 
   - id: 'prepare'
-    name: node:18
+    name: node:16
     entrypoint: bash
     args:
       - '-c'
@@ -15,7 +15,7 @@ steps:
         npm run stage:github announceDeploymentStart
 
   - id: 'build'
-    name: node:18
+    name: node:16
     env:
       - 'CI=true'
       - 'NODE_OPTIONS="--max_old_space_size=8192"'
@@ -52,7 +52,7 @@ steps:
         fi
 
   - id: 'finalize'
-    name: node:18
+    name: node:16
     entrypoint: bash
     args:
       - '-c'

.cloudbuild/stagingCleanUp.yaml

@@ -0,0 +1,25 @@
+# Runs in dcc-staging and cleans up stale instances and bucket items by comparing open
+# PRs to currently deployed instances/folders
+timeout: 2700s
+steps:
+  - id: 'install'
+    name: node:18
+    entrypoint: npm
+    args: ['ci']
+
+  - id: 'clean'
+    name: node:18
+    entrypoint: bash
+    args:
+      - '-c'
+      - |
+        npm run stage:github cleanUpGoogleCloud
+
+availableSecrets:
+  secretManager:
+    - versionName: projects/dcc-staging/secrets/GITHUB_APP_ID/versions/1
+      env: 'GITHUB_APP_ID'
+    - versionName: projects/dcc-staging/secrets/GITHUB_APP_KEY/versions/1
+      env: 'GITHUB_APP_KEY'
+    - versionName: projects/dcc-staging/secrets/GITHUB_APP_INSTALLATION_ID/versions/1
+      env: 'GITHUB_APP_INSTALLATION_ID'

.cloudbuild/updateAlgoliaIndex.yaml

@@ -0,0 +1,21 @@
+timeout: 600s # set build timeout to 10 mins
+steps:
+  - name: node:16.14.2
+    entrypoint: npm
+    args: ['ci']
+
+  - name: node:16.14.2
+    entrypoint: npm
+    args: ['run', 'cloud-secrets']
+
+  - name: node:16.14.2
+    entrypoint: npm
+    args: ['run', 'algolia']
+
+substitutions:
+  _EXTRA_GCLOUD_ARGS: # default empty
+
+options:
+  machineType: 'E2_HIGHCPU_32'
+  env:
+    - 'PROJECT_ID=$PROJECT_ID'

.eleventy.js

@@ -28,6 +28,7 @@ const {DetailsSummary} = require('./site/_shortcodes/DetailsSummary');
 const {Empty} = require('./site/_shortcodes/Empty');
 const {IFrame} = require('./site/_shortcodes/IFrame');
 const {Glitch} = require('./site/_shortcodes/Glitch');
+const {AndroidBrowserSupportTable} = require('./site/_shortcodes/AndroidBrowserSupportTable');
 const {Hreflang} = require('./site/_shortcodes/Hreflang');
 const {Img} = require('./site/_shortcodes/Img');
 const {Label} = require('./site/_shortcodes/Label');
@@ -133,6 +134,7 @@ module.exports = eleventyConfig => {
   eleventyConfig.addNunjucksAsyncFilter('minifyHtml', minifyHtml);
 
   // Add shortcodes
+  eleventyConfig.addShortcode('AndroidBrowserSupportTable', AndroidBrowserSupportTable);
   eleventyConfig.addShortcode('InlineCss', InlineCss);
   eleventyConfig.addShortcode('Codepen', Codepen);
   eleventyConfig.addShortcode('IFrame', IFrame);

.github/chrome-devrel-bot.json

@@ -5,15 +5,15 @@
         "check_name" : "Content team approval",
         "teams" : [],
         "users" : [
+          "PaulKinlan",
           "malchata",
           "rachelandrew",
           "heyawhite",
           "jpmedley",
           "mihajlija",
           "sofiayem",
-          "AaronForinton",
+          "nancymic2",
           "anusmitaray",
-          "IanStanion-google",
           "AmySteam"
         ],
         "paths" : [
@@ -26,35 +26,38 @@
         "users" : [
           "PaulKinlan",
           "matthiasrohmer",
-          "devnook"
+          "devnook",
+          "tunetheweb"
         ],
         "paths" : [
-          "*.js",
-          "*.json",
-          "*.css",
-          "*.scss",
-          "*.html",
-          "*.htm",
-          "*.njk",
-          "*.toml",
-          "*.sh"
+          "**/*.js",
+          "**/*.json",
+          "**/*.css",
+          "**/*.scss",
+          "**/*.html",
+          "**/*.htm",
+          "**/*.njk",
+          "**/*.toml",
+          "**/*.sh"
         ]
       },
       {
         "check_name" : "Eng or Content team approval",
         "teams" : [],
         "users" : [
           "PaulKinlan",
-          "jeffposnick",
-          "devnook",
           "malchata",
           "rachelandrew",
           "heyawhite",
           "jpmedley",
           "mihajlija",
           "sofiayem",
-          "AaronForinton",
-          "matthiasrohmer"
+          "nancymic2",
+          "anusmitaray",
+          "AmySteam",
+          "matthiasrohmer",
+          "devnook",
+          "tunetheweb"
         ],
         "paths" : [
           "site/_data/**.yml",
@@ -64,9 +67,18 @@
         ]
       },
       {
-        "check_name" : "Content (es) team approval",
+        "check_name" : "Content team or Spanish reader approval",
         "teams" : [],
         "users" : [
+          "malchata",
+          "rachelandrew",
+          "heyawhite",
+          "jpmedley",
+          "mihajlija",
+          "sofiayem",
+          "nancymic2",
+          "anusmitaray",
+          "AmySteam",
           "tropicadri"
         ],
         "paths" : [

.huskyrc.js

@@ -1,5 +1,5 @@
 module.exports = {
   hooks: {
-    "pre-push": "npm run lint"
+    "pre-commit": "npx lint-staged"
   }
 };

.lintstagedrc.json

@@ -0,0 +1,6 @@
+{
+  "*.scss": "npm run lint:scss",
+  "*.ts": "npm run lint:types",
+  "*.md": "npm run lint:md",
+  "*.js": "npm run lint:js"
+}

algolia.js

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 require('dotenv').config();
+
 const {default: algoliasearch} = require('algoliasearch');
-const fs = require('fs');
+const {default: fetch} = require('node-fetch');
 const {sizeof} = require('sizeof');
 
+const algoliaIndexSource = 'https://developers.chrome.com/algolia.json';
+
 const maxChunkSizeInBytes = 10000000; // 10,000,000
 
 /**
@@ -53,8 +56,14 @@ async function index() {
     return;
   }
 
-  const raw = fs.readFileSync('dist/algolia.json', 'utf-8');
-  const algoliaData = JSON.parse(raw);
+  let algoliaData = [];
+  try {
+    const raw = await fetch(algoliaIndexSource);
+    algoliaData = await raw.json();
+  } catch (err) {
+    console.error('Could not load algolia index from prod.', err);
+    return;
+  }
 
   // Set date of when object is being added to algolia
   algoliaData.map(e => {