fixup! chore: deploy docs|code .angularjs.org to Firebase via Travis

Author: Narretz

.gitignore

@@ -9,8 +9,7 @@ performance/temp*.html
 *~
 *.swp
 angular.js.tmproj
-/node_modules/
-/scripts/code.angularjs.org-firebase/functions/node_modules/
+node_modules/
 bower_components/
 angular.xcodeproj
 .idea

.travis.yml

@@ -1,47 +1,49 @@
 language: node_js
 sudo: false
 node_js:
-- '6'
+  - '6'
 cache:
   yarn: true
   directories:
-  - bower_components
+    - bower_components
 branches:
   except:
-  - "/^g3_.*$/"
+    - "/^g3_.*$/"
 env:
   matrix:
-  - JOB=ci-checks
-  - JOB=unit BROWSER_PROVIDER=saucelabs
-  - JOB=docs-e2e BROWSER_PROVIDER=saucelabs
-  - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
-  - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
+    - JOB=ci-checks
+    - JOB=unit BROWSER_PROVIDER=saucelabs
+    - JOB=docs-e2e BROWSER_PROVIDER=saucelabs
+    - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
+    - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
   global:
-  - CXX=g++-4.8
-  - SAUCE_USERNAME=angular-ci
-  - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
-  - LOGS_DIR=/tmp/angular-build/logs
-  - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
-  - secure: oTBjhnOKhs0qDSKTf7fE4f6DYiNDPycvB7qfSF5QRIbJK/LK/J4UtFwetXuXj79HhUZG9qnoT+5e7lPaiaMlpsIKn9ann7ffqFWN1E8TMtpJF+AGigx3djYElwfgf5nEnFUFhwjFzvbfpZNnxVGgX5YbIZpe/WUbHkP4ffU0Wks=
+    # node 4 likes the G++ v4.8 compiler
+    # see https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
+    - CXX=g++-4.8
+    - SAUCE_USERNAME=angular-ci
+    - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
+    - LOGS_DIR=/tmp/angular-build/logs
+    - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
+    - secure: oTBjhnOKhs0qDSKTf7fE4f6DYiNDPycvB7qfSF5QRIbJK/LK/J4UtFwetXuXj79HhUZG9qnoT+5e7lPaiaMlpsIKn9ann7ffqFWN1E8TMtpJF+AGigx3djYElwfgf5nEnFUFhwjFzvbfpZNnxVGgX5YbIZpe/WUbHkP4ffU0Wks=
 addons:
   apt:
     sources:
-    - ubuntu-toolchain-r-test
+      - ubuntu-toolchain-r-test
     packages:
-    - g++-4.8
+      - g++-4.8
 before_script:
-- du -sh ./node_modules ./bower_components/ || true
-- "./scripts/travis/before_build.sh"
+  - du -sh ./node_modules ./bower_components/ || true
+  - "./scripts/travis/before_build.sh"
 script:
- - "./scripts/travis/build.sh"
+  - "./scripts/travis/build.sh"
 after_script:
-- "./scripts/travis/tear_down_browser_provider.sh"
-- "./scripts/travis/print_logs.sh"
+  - "./scripts/travis/tear_down_browser_provider.sh"
+  - "./scripts/travis/print_logs.sh"
 notifications:
   webhooks:
     urls:
-    - https://webhooks.gitter.im/e/d2120f3f2bb39a4531b2
-    - http://104.197.9.155:8484/hubot/travis/activity
+      - https://webhooks.gitter.im/e/d2120f3f2bb39a4531b2
+      - http://104.197.9.155:8484/hubot/travis/activity
     on_success: always
     on_failure: always
     on_start: always
@@ -52,7 +54,7 @@ jobs:
         - JOB=deploy
       before_script: skip
       script:
-       - "./scripts/travis/build.sh"
+        - "./scripts/travis/build.sh"
       # Work around the 10min Travis timeout so the code.angularjs firebase+gcs code deploy can complete
       before_deploy: |
         function keep_alive() {

firebase.json

@@ -2,22 +2,19 @@
   "hosting": {
     "public": "build/docs",
     "ignore": [
+      "/index.html",
       "/index-debug.html",
       "/index-jquery.html"
     ],
-    "redirects": [
+    "rewrites": [
       {
         "source": "/",
-        "destination": "/index-production.html",
-        "type": 301
+        "destination": "/index-production.html"
       },
       {
         "source": "/index.html",
-        "destination": "/index-production.html",
-        "type": 301
-      }
-    ],
-    "rewrites": [
+        "destination": "/index-production.html"
+      },
       {
         "source": "**/*!(.jpg|.jpeg|.gif|.png|.html|.js|.json|.css|.svg|.ttf|.woff|.woff2|.eot)",
         "destination": "/index-production.html"

readme.firebase.docs.md

@@ -5,3 +5,6 @@ The docs are deployed to Google Firebase hosting via Travis deployment config, w
 firebase.json and .firebaserc in the repository root.
 
 See travis.yml for the complete deployment config.
+
+See /scripts/code.angularjs.org-firebase/readme.firebase.code.md for the firebase deployment to
+code.angularjs.org

scripts/code.angularjs.org-firebase/functions/index.js

@@ -4,18 +4,25 @@ const functions = require('firebase-functions');
 const gcs = require('@google-cloud/storage')();
 const path = require('path');
 
-const gcsBucket = 'code-angularjs-org-338b8.appspot.com';
+const gcsBucketId = `${process.env.GCLOUD_PROJECT}.appspot.com`;
 const LOCAL_TMP_FOLDER = '/tmp/';
 
+const BROWSER_CACHE_DURATION = 300;
+const CDN_CACHE_DURATION = 600;
+
 function sendStoredFile(request, response) {
   let filePathSegments = request.path.split('/').filter((segment) => {
+    // Remove empty leading or trailing path parts
     return segment !== '';
   });
 
   const version = filePathSegments[0];
   const isDocsPath = filePathSegments[1] === 'docs';
   const lastSegment = filePathSegments[filePathSegments.length - 1];
-  let downloadPath;
+  const bucket = gcs.bucket(gcsBucketId);
+
+  let downloadSource;
+  let downloadDestination;
   let fileName;
 
   if (isDocsPath && filePathSegments.length === 2) {
@@ -25,16 +32,17 @@ function sendStoredFile(request, response) {
     fileName = lastSegment;
   }
 
-  downloadPath = path.join.apply(null, filePathSegments);
+  downloadSource = path.join.apply(null, filePathSegments);
+  downloadDestination = `${LOCAL_TMP_FOLDER}${fileName}`;
 
-  const bucket = gcs.bucket(gcsBucket);
-
-  downloadAndSend().catch(error => {
+  downloadAndSend(downloadSource, downloadDestination).catch(error => {
     if (isDocsPath && error.code === 404) {
       fileName = 'index.html';
       filePathSegments = [version, 'docs', fileName];
-      downloadPath = path.join.apply(null, filePathSegments);
-      return downloadAndSend();
+      downloadSource = path.join.apply(null, filePathSegments);
+      downloadDestination = `${LOCAL_TMP_FOLDER}${fileName}`;
+
+      return downloadAndSend(downloadSource, downloadDestination);
     }
 
     return Promise.reject(error);
@@ -51,15 +59,15 @@ function sendStoredFile(request, response) {
     return response.status(error.code).send(message);
   });
 
-  function downloadAndSend() {
-    return bucket.file(downloadPath).download({
-      destination: `/tmp/${fileName}`
+  function downloadAndSend(downloadSource, downloadDestination) {
+    return bucket.file(downloadSource).download({
+      destination: downloadDestination
     }).then(() => {
       return response.status(200)
         .set({
-          'Cache-Control': 'public, max-age=300, s-maxage=600'
+          'Cache-Control': `public, max-age=${BROWSER_CACHE_DURATION}, s-maxage=${CDN_CACHE_DURATION}`
         })
-        .sendFile(`${LOCAL_TMP_FOLDER}${fileName}`);
+        .sendFile(downloadDestination);
     });
   }
 }

scripts/code.angularjs.org-firebase/readme.firebase.code.md

@@ -8,3 +8,5 @@ in functions/index.js that serves the docs from the Firebase Google Cloud Storag
 
 The deployment to the Google Cloud Storage bucket happens automatically via Travis. See the travis.yml
 file in the repository root.
+
+See /readme.firebase.docs.md for the firebase deployment to docs.angularjs.org