Add leaflet key and update build script

yext · Feb 8, 2024 · 7031d63 · 7031d63
1 parent 9938708
commit 7031d63
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/acceptance_headless.yml b/.github/workflows/acceptance_headless.yml
@@ -7,8 +7,8 @@ jobs:
     name: Chrome Acceptance Tests (Headless)
     runs-on: ubuntu-latest
     env: 
-      MAPBOX_KEY: ${{ secrets.MAPBOX_KEY }}
-      GOOGLE_KEY: ${{ secrets.GOOGLE_KEY }}
+      MAPBOX_KEY: ${{ secrets.MAPBOX_API_KEY }}
+      GOOGLE_KEY: ${{ secrets.GOOGLE_API_KEY }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -15,5 +15,4 @@ jobs:
       test_script: npx jest tests/static/ --coverage
       comparison_branch: master
     secrets:
-      caller_github_token: ${{ secrets.GITHUB_TOKEN }}
-
+      caller_github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,6 +9,4 @@ jobs:
   call_run_tests:
     uses: yext/slapshot-reusable-workflows/.github/workflows/run_tests.yml@v1
     with:
-      build_script: ''
-    secrets:
-      MAPBOX_KEY: ${{ secrets.MAPBOX_KEY }}
+      build_script: ''
diff --git a/static/js/default-map-api-key.js b/static/js/default-map-api-key.js
@@ -11,9 +11,9 @@ export function getDefaultMapApiKey(mapProvider) {
     }
     switch (mapProvider.toLowerCase()) {
       case 'google':
-        return process.env.GOOGLE_KEY;
+        return process.env.GOOGLE_API_KEY;
       case 'mapbox':
-        return process.env.MAPBOX_KEY;
+        return process.env.MAPBOX_API_KEY;
       default:
         throw new Error(
           `Given mapProvider: '${mapProvider}' is invalid. Expects either 'google' or 'mapbox'.`

diff --git a/static/js/theme-map/Maps/Providers/Baidu.js b/static/js/theme-map/Maps/Providers/Baidu.js
@@ -307,7 +307,7 @@ class BaiduPin extends ProviderPin {
 
 // Load Function
 
-const yextAPIKey = process.env.BAIDU_KEY;
+const yextAPIKey = process.env.BAIDU_API_KEY;
 const baseUrl = 'https://api.map.baidu.com/getscript';
 
 /**

diff --git a/static/js/theme-map/Maps/Providers/Leaflet.js b/static/js/theme-map/Maps/Providers/Leaflet.js
@@ -119,7 +119,7 @@ class LeafletPin extends ProviderPin {
 
 // Load Function
 
-const yextAPIKey = process.env.MAPBOX_KEY;
+const yextAPIKey = process.env.LEAFLET_API_KEY;
 const baseUrl = 'https://unpkg.com/leaflet@1.6.0/dist/leaflet';
 
 /**

diff --git a/static/js/theme-map/Maps/Providers/Mapbox.js b/static/js/theme-map/Maps/Providers/Mapbox.js
@@ -175,7 +175,7 @@ class MapboxPin extends ProviderPin {
 
 // Load Function
 
-const yextAPIKey = process.env.MAPBOX_KEY;
+const yextAPIKey = process.env.MAPBOX_API_KEY;
 
 /**
  * This function is called when calling {@link MapProvider#load} on {@link module:Maps/Providers/Mapbox.MapboxMaps}.

diff --git a/static/sample.env b/static/sample.env
@@ -1,2 +1,4 @@
-MAPBOX_KEY=[[REPLACE_ME]]
-BAIDU_KEY=[[REPLACE_ME]]
+MAPBOX_API_KEY=[[REPLACE_ME]]
+BAIDU_API_KEY=[[REPLACE_ME]]
+GOOGLE_API_KEY=[[REPLACE_ME]]
+LEAFLET_API_KEY=[[REPLACE_ME]]
diff --git a/static/webpack-config.js b/static/webpack-config.js
@@ -73,9 +73,10 @@ module.exports = function () {
     ...htmlPlugins,
     new webpack.DefinePlugin({
       'process.env.JAMBO_INJECTED_DATA': JSON.stringify(jamboInjectedData),
-      'process.env.MAPBOX_KEY': JSON.stringify(process.env.MAPBOX_KEY) || 'REPLACE_ME',
-      'process.env.BAIDU_KEY': JSON.stringify(process.env.BAIDU_KEY) || 'REPLACE_ME',
-      'process.env.GOOGLE_KEY': JSON.stringify(process.env.GOOGLE_KEY) || 'REPLACE_ME',
+      'process.env.MAPBOX_API_KEY': JSON.stringify(process.env.MAPBOX_API_KEY) || 'REPLACE_ME',
+      'process.env.BAIDU_API_KEY': JSON.stringify(process.env.BAIDU_API_KEY) || 'REPLACE_ME',
+      'process.env.GOOGLE_API_KEY': JSON.stringify(process.env.GOOGLE_API_KEY) || 'REPLACE_ME',
+      'process.env.LEAFLET_API_KEY': JSON.stringify(process.env.LEAFLET_API_KEY) || 'REPLACE_ME',
     }),
     new RemovePlugin({
       after: {

diff --git a/test-site/sample.env b/test-site/sample.env
@@ -1,2 +1,4 @@
-MAPBOX_KEY=[[REPLACE_ME]]
-BAIDU_KEY=[[REPLACE_ME]]
+MAPBOX_API_KEY=[[REPLACE_ME]]
+BAIDU_API_KEY=[[REPLACE_ME]]
+GOOGLE_API_KEY=[[REPLACE_ME]]
+LEAFLET_API_KEY=[[REPLACE_ME]]
diff --git a/test-site/scripts/build.sh b/test-site/scripts/build.sh
@@ -7,6 +7,4 @@ set_working_dir_to_test_site () {
 
 set_working_dir_to_test_site
 
-npx jambo build
-chmod u+x ./public/static/node_modules/esbuild/bin/esbuild
-npx grunt webpack
+npx jambo build && npx grunt webpack