Merge master (v2.5.1) into develop (#261)

Merge master (v2.5.1) into develop
yext · Jan 30, 2024 · 97ee3a7 · 97ee3a7
1 parent 669785c
commit 97ee3a7
Show file tree

Hide file tree

Showing 7 changed files with 882 additions and 849 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yext/search-core",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Typescript Networking Library for the Yext Search API",
   "main": "./dist/commonjs/src/index.js",
   "module": "./dist/esm/src/index.js",
@@ -74,7 +74,7 @@
     "jest-environment-jsdom": "^28.1.0",
     "ts-loader": "^8.4.0",
     "typescript": "^4.0.3",
-    "webpack": "^5.73.0",
+    "webpack": "^5.90.0",
     "webpack-cli": "^4.4.0"
   },
   "dependencies": {

diff --git a/test-site/package-lock.json b/test-site/package-lock.json
diff --git a/test-site/package.json b/test-site/package.json
@@ -6,7 +6,7 @@
   "devDependencies": {
     "ts-loader": "^9.2.6",
     "typescript": "^4.4.3",
-    "webpack": "^5.58.1",
+    "webpack": "^5.90.0",
     "webpack-cli": "^4.9.0"
   },
   "scripts": {

diff --git a/test-site/src/js/index.js b/test-site/src/js/index.js
@@ -6,7 +6,7 @@ import questionRequest from './requests/questionRequest';
 import { univeralAutocompleteRequest, verticalAutocompleteRequest, filterSearchRequest } from './requests/autocompleteRequests';
 
 const coreConfig = {
-  apiKey: 'df4b24f4075800e5e9705090c54c6c13',
+  apiKey: process.env.API_KEY,
   experienceKey: 'rosetest',
   locale: 'en',
   experienceVersion: 'PRODUCTION',
@@ -62,13 +62,13 @@ export async function filterSearch() {
 }
 
 function loadingSpinner() {
-  element.innerHTML = 'Loading...';
+  element.textContent = 'Loading...';
 }
 
 function updateUI(data, startTime, msg) {
   const latency = new Date().getTime() - startTime + 'ms';
   const dataString = JSON.stringify(data, undefined, 2);
-  element.innerHTML = latency + '\n' + dataString;
+  element.textContent = latency + '\n' + dataString;
 
   console.log(msg);
   console.log(data);

diff --git a/test-site/src/ts/index.ts b/test-site/src/ts/index.ts
@@ -6,7 +6,7 @@ import { univeralAutocompleteRequest, verticalAutocompleteRequest, filterSearchR
 import initDirectAnswers from './initDirectAnswers';
 
 const coreConfig: SearchConfig = {
-  apiKey: '2d8c550071a64ea23e263118a2b0680b',
+  apiKey: process.env.API_KEY,
   experienceKey: 'slanswers',
   locale: 'en',
   experienceVersion: 'PRODUCTION',
@@ -72,13 +72,13 @@ export async function filterSearch(): Promise<void> {
 }
 
 function loadingSpinner() {
-  element.innerHTML = 'Loading...';
+  element.textContent = 'Loading...';
 }
 
 function updateUI(data: unknown, startTime: number, msg: string) {
   const latency = new Date().getTime() - startTime + 'ms';
   const dataString = JSON.stringify(data, undefined, 2);
-  element.innerHTML = latency + '\n' + dataString;
+  element.textContent = latency + '\n' + dataString;
 
   console.log(msg);
   console.log(data);

diff --git a/test-site/webpack.config.js b/test-site/webpack.config.js
@@ -1,4 +1,9 @@
 const path = require('path');
+const webpack = require('webpack');
+
+const webpackPlugin = new webpack.DefinePlugin({
+  'process.env.API_KEY': JSON.stringify(process.env.API_KEY),
+});
 
 module.exports = [{
   mode: 'development',
@@ -20,6 +25,7 @@ module.exports = [{
     path: path.resolve(__dirname, 'dist'),
     libraryTarget: 'window'
   },
+  plugins: [webpackPlugin],
 }, {
   mode: 'development',
   entry: './src/js/index.js',
@@ -32,4 +38,5 @@ module.exports = [{
     libraryTarget: 'window'
   },
   target: ['web', 'es5'],
+  plugins: [webpackPlugin],
 }];