chore(static site) ensure API_ROOT env key overrides app.api_root con…

…fig key

build-utils/config-loader.js

@@ -41,6 +41,14 @@ module.exports = function(source) {
     }
   });
 
+  // The API root is defined in the config. In most cases this will be set to 
+  // point to the dev API. If the .env defines a different API root, use that
+  // value here. Use the API_ROOT key in the .env to set a new API root. Note
+  // that this replaces the old SITE_URL key.
+  if (process.env.API_ROOT) {
+    config.app.api_root = process.env.API_ROOT;
+  }
+
   // Strip out gettext syntax; we don't perform any localization of the config
   // in this loader. Full localization is performed by the production build.
   walk(config, (val, prop, obj) => {
@@ -49,10 +57,9 @@ module.exports = function(source) {
         val = val
           .replace(configGettextRegex, "")
           .replace(/\)$/, "");
+        obj[prop] = val;
       }
     }
-
-    obj[prop] = val;
   });
 
   const templateSource = fs.readFileSync(

src/flavors/bogtobay/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/central-puget-sound/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/defaultflavor/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/duwamish-watershed/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/duwamish_flavor/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # Fallback image to use for sharing on social services if no model image is present

src/flavors/greensboropb/config.yml

@@ -9,7 +9,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   district:

src/flavors/greenways/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/gtopenspace/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/lakewashington/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/madrid/config.yml

@@ -17,6 +17,11 @@ app:
   # Optional. List view is supported by default. Set to false to disable.
   # list_enabled: false
 
+  # This should be set to the root of an api server from which you'd like to draw
+  # permissions information for logged-in users. This value can be overridden
+  # using the API_ROOT environment variable. Note the trailing slash.
+  api_root: https://dev-api.heyduwamish.org/api/v2/
+
 # languages:
 #   - code: en
 #     label: I Speak English

src/flavors/pboakland/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/pugetsound/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/rail/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/raingardens/config.yml

@@ -13,7 +13,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/snoqualmie/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/trees/config.yml

@@ -13,7 +13,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/waterfront/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

src/flavors/willamette/config.yml

@@ -11,7 +11,7 @@ app:
 
   # This should be set to the root of an api server from which you'd like to draw
   # permissions information for logged-in users. This value can be overridden
-  # using the SITE_KEY environment variable. Note the trailing slash.
+  # using the API_ROOT environment variable. Note the trailing slash.
   api_root: https://dev-api.heyduwamish.org/api/v2/
 
   # When the map loads, existing places will be loaded in chunks. By default,

static-build.js

@@ -73,7 +73,7 @@ if (!flavor) {
 
 // This version number is only used for cache-busting on our bundle.js
 // and bundle.css files.
-const bundleVersion = "0.7.5.7";
+const bundleVersion = "0.7.5.9";
 
 const flavorBasePath = path.resolve(
   __dirname,
@@ -266,6 +266,13 @@ activeLanguages.forEach((language) => {
     }
   });
 
+  // The API root is defined in the config. In most cases this will be set to 
+  // point to the dev API. If the .env defines a different API root, use that
+  // value here. Use the API_ROOT key in the .env to set a new API root. Note
+  // that this replaces the old SITE_URL key.
+  if (process.env.API_ROOT) {
+    thisConfig.app.api_root = process.env.API_ROOT;
+  }
 
   // (5a) Copy all jstemplates and flavor pages to a working directory from
   //      which the templates can be localized and precompiled. Also resolve