Merge pull request #1923 from keymanapp/chore/merge-master-to-staging-b18s3

chore: Merge master to staging for Sprint B18S3

Author: darcywong00

.gitignore

@@ -9,6 +9,7 @@ node_modules/
 # Shared files are bootstrapped:
 resources/bootstrap.inc.sh
 resources/.bootstrap-version
+resources/.bootstrap-registry
 _common/
 
 # State files

_includes/2020/HelpKeymanComSentry.php

@@ -0,0 +1,19 @@
+<?php
+  declare(strict_types=1);
+
+  namespace Keyman\Site\com\keyman\help;
+
+  use Keyman\Site\Common\KeymanSentry;
+
+  require_once(__DIR__ . '/../../_common/KeymanSentry.php');
+
+  const SENTRY_DSN = 'https://fcc8fe39792f49f3a94ea831cad5c9d6@o1005580.ingest.sentry.io/5983515';
+
+  class HelpKeymanComSentry {
+    static function init() {
+      KeymanSentry::Init(SENTRY_DSN);
+    }
+    static function GetBrowserHTML() {
+      return KeymanSentry::GetBrowserHTML(SENTRY_DSN);
+    }
+  }

_includes/includes/__kmwheader.php

@@ -72,6 +72,7 @@ function get_kmwbuild()
     return $kmwbuild;
   }
 
+  // TODO: rewrite this -- it's kinda outdated
   // In case of no match, the defaults:
   switch($maj_version) {
     case 11:
@@ -81,8 +82,7 @@ function get_kmwbuild()
     case 2:
       return "2.0.473";
     default:
-      global $TestServer;
-      if($TestServer) {
+      if(KeymanHosts::Instance()->Tier() != KeymanHosts::TIER_PRODUCTION) {
         return false;   // We should never get this except briefly while documenting a new major version.
                         // Maybe we could get away with "$maj_version.0.1", but that wouldn't be as detectable of an error.
       } else {

_includes/includes/head.php

@@ -5,6 +5,7 @@
 
   require_once __DIR__ . '/../autoload.php';
   use Keyman\Site\Common\KeymanHosts;
+  use Keyman\Site\com\keyman\help\HelpKeymanComSentry;
 
   // Variables used to manage and trigger debugging tests.
   // Simply defining the variable below is enough to trigger debug mode.
@@ -45,21 +46,7 @@
     }
   ?>
   <title><?php echo htmlentities($title); ?></title>
-  <?php
-/* Our local CDN version is identical to this file:
-  <script
-    src="https://browser.sentry-cdn.com/5.28.0/bundle.min.js"
-    integrity="sha384-1HcgUzJmxPL9dRnZD2wMIj5+xsJfHS+WR+pT2yJNEldbOr9ESTzgHMQOcsb2yyDl"
-    crossorigin="anonymous"
-  ></script>*/
-  ?>
-  <script src="<?= cdn('js/sentry.bundle.5.28.0.min.js'); ?>"></script>
-  <script>
-    Sentry.init({
-      dsn: "https://fcc8fe39792f49f3a94ea831cad5c9d6@o1005580.ingest.sentry.io/5983515",
-      environment: location.host.match(/\.local$/) ? 'development' : location.host.match(/(^|\.)keyman-staging\.com$/) ? 'staging' : 'production',
-    });
-  </script>
+  <?= HelpKeymanComSentry::GetBrowserHTML() ?>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
   <link rel='shortcut icon' href="<?php echo $favicon; ?>">
   <?php if(!empty($canonicalLink)) echo "  <link rel=\"canonical\" href=\"$canonicalLink\">\n"; ?>

_includes/includes/servervars.php

@@ -23,20 +23,20 @@
     require_once($_SERVER['DOCUMENT_ROOT'].'/cdn/deploy/cdn.php');
   }
 
-  $keyman_com = \Keyman\Site\Common\KeymanHosts::Instance()->keyman_com;
+  use Keyman\Site\Common\KeymanHosts;
+
+  $keyman_com = KeymanHosts::Instance()->keyman_com;
 
   // $site_protocol is used only by util.php at this time.
   $site_protocol = (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) ? 'https://' : 'http://';
-
-  $TestServer = false;
-
   $site_tavultesoft = 'www.tavultesoft.com';
-  $site_securetavultesoft = 'secure.tavultesoft.com';
-  $downloadsDomain = "downloads.keyman.com";
 
   function cdn($file) {
-    global $cdn, $TestServer;
-    $use_cdn = !$TestServer || (isset($_REQUEST['cdn']) && $_REQUEST['cdn'] == 'force');
+    global $cdn;
+    $use_cdn =
+      KeymanHosts::Instance()->Tier() == KeymanHosts::TIER_PRODUCTION ||
+      KeymanHosts::Instance()->Tier() == KeymanHosts::TIER_STAGING ||
+      (isset($_REQUEST['cdn']) && $_REQUEST['cdn'] == 'force');
     if($use_cdn && $cdn && array_key_exists('/'.$file, $cdn)) {
       return "/cdn/deploy{$cdn['/'.$file]}";
     }

_includes/includes/template.php

@@ -1,9 +1,8 @@
 <?php
   require_once __DIR__ . '/../../vendor/autoload.php';
-  require_once __DIR__ . '/../../_common/KeymanSentry.php';
+  require_once __DIR__ . '/../2020/HelpKeymanComSentry.php';
 
-  const SENTRY_DSN = 'https://fcc8fe39792f49f3a94ea831cad5c9d6@o1005580.ingest.sentry.io/5983515';
-  \Keyman\Site\Common\KeymanSentry::init(SENTRY_DSN);
+  \Keyman\Site\com\keyman\help\HelpKeymanComSentry::init();
 
   require_once('includes/servervars.php');
   require_once('index-content.php');

build.sh

@@ -2,8 +2,8 @@
 ## START STANDARD SITE BUILD SCRIPT INCLUDE
 readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh"
-readonly BOOTSTRAP_VERSION=v0.17
-[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
+readonly BOOTSTRAP_VERSION=v0.20
+[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -H "Cache-Control: no-cache" -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
 ## END STANDARD SITE BUILD SCRIPT INCLUDE
 
 # TODO: these should probably all be moved to a common defines script too?

cdn/dev/js/bundle.min.js.map

@@ -0,0 +1,11 @@
+---
+title: KM020B1: ERROR_ContextExCannotReferenceIf
+---
+
+|            |           |
+|------------|---------- |
+| Message    | The offset in context\(\) points to a non\-character if\(\) statement in the context |
+| Module     | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) |
+| Identifier | `ERROR_ContextExCannotReferenceIf` |
+
+