@codecademy/brand 3.36.2-alpha.e9c6fd8276.0 → 3.36.2

package/dist/AppHeader/Search/SearchWorker/index.js

@@ -3,70 +3,22 @@ let workerPromise;
 const initErr = 'Search worker not initialized';
 export const searchWorker = {
   init() {
-    // eslint-disable-next-line no-console
-    console.log('[searchWorker.init] Initializing search worker');
     if (!workerPromise) {
-      // eslint-disable-next-line no-console
-      console.log('[searchWorker.init] Creating new worker promise');
       workerPromise = (async () => {
-        try {
-          // eslint-disable-next-line no-console
-          console.log('[searchWorker.init] Importing worker module');
-          // lazy load worker
-          const {
-            createSearchWorker
-          } = await import('./worker');
-          // eslint-disable-next-line no-console
-          console.log('[searchWorker.init] Worker module imported, creating worker');
-          const worker = createSearchWorker();
-          // eslint-disable-next-line no-console
-          console.log('[searchWorker.init] Worker created successfully');
-          return worker;
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.error('[searchWorker.init] Error creating worker:', error);
-          throw error;
-        }
+        // lazy load worker
+        const {
+          createSearchWorker
+        } = await import('./worker');
+        return createSearchWorker();
       })();
-    } else {
-      // eslint-disable-next-line no-console
-      console.log('[searchWorker.init] Worker already initialized');
     }
   },
   async autocomplete(query) {
-    // eslint-disable-next-line no-console
-    console.log('[searchWorker.autocomplete] Query:', query);
     if (!workerPromise) throw new Error(initErr);
-    try {
-      const worker = await workerPromise;
-      // eslint-disable-next-line no-console
-      console.log('[searchWorker.autocomplete] Worker ready, calling with query:', query);
-      const result = await worker(SearchAction.Autocomplete, query);
-      // eslint-disable-next-line no-console
-      console.log('[searchWorker.autocomplete] Result received:', result);
-      return result;
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error('[searchWorker.autocomplete] Error:', error);
-      throw error;
-    }
+    return (await workerPromise)(SearchAction.Autocomplete, query);
   },
   async searchAsYouType(query) {
-    // eslint-disable-next-line no-console
-    console.log('[searchWorker.searchAsYouType] Query:', query);
     if (!workerPromise) throw new Error(initErr);
-    try {
-      const worker = await workerPromise;
-      // eslint-disable-next-line no-console
-      console.log('[searchWorker.searchAsYouType] Worker ready, calling with query:', query);
-      const result = await worker(SearchAction.SearchAsYouType, query);
-      // eslint-disable-next-line no-console
-      console.log('[searchWorker.searchAsYouType] Result received:', result);
-      return result;
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error('[searchWorker.searchAsYouType] Error:', error);
-      throw error;
-    }
+    return (await workerPromise)(SearchAction.SearchAsYouType, query);
   }
 };

package/dist/AppHeader/Search/SearchWorker/src.js

@@ -28,6 +28,9 @@ function getPortalOrigin() {
   // for standard envs, use portal app in the same env
   if (envs.some(s => `https://${s}.codecademy.com` === origin)) return origin;
 
+  // for PR envs (e.g. pr-40229-monolith.dev-eks.codecademy.com)
+  if (origin.includes('.dev-eks.codecademy.com')) return origin;
+
   // for local, use local portal-app, replace if origin port is monolith or le
   if (origin.includes('localhost')) return origin.replace(/:\d{4}/, ':3100');
 
@@ -35,45 +38,15 @@ function getPortalOrigin() {
   return 'https://staging.codecademy.com';
 }
 export function serializeSearchWorkerSrc() {
-  // eslint-disable-next-line no-console
-  console.log('[serializeSearchWorkerSrc] Starting serialization');
-  try {
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] Getting portal origin');
-    const BASE_URL = `${getPortalOrigin()}/api/portal/search`;
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] BASE_URL:', BASE_URL);
-
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] Converting worker function to string');
-    const fnAsStr = worker.toString().trim();
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] Worker function string length:', fnAsStr.length);
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] Full worker function:', fnAsStr);
+  const BASE_URL = `${getPortalOrigin()}/api/portal/search`;
+  const fnAsStr = worker.toString().trim();
 
-    // in a prod build, webpack will handle removing comments
+  // in a prod build, webpack will handle removing comments
 
-    const startIndex = fnAsStr.indexOf('{');
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] Start index of first {:', startIndex);
-    const result = fnAsStr.slice(fnAsStr.indexOf('{') + 1, -1) // remove wrapping function, which may have been renamed by minification
-    .replaceAll('  ', '') // remove indentation
-    .replaceAll('{BASE_URL}', BASE_URL) // interpolate base url
-    .replaceAll('{SEARCH}', window.location.search); // interpolate search query
-
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] Serialization complete, result length:', result.length);
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] First 500 chars of result:', result.substring(0, 500));
-    // eslint-disable-next-line no-console
-    console.log('[serializeSearchWorkerSrc] Full result:', result);
-    return result;
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error('[serializeSearchWorkerSrc] Error during serialization:', error);
-    throw error;
-  }
+  return fnAsStr.slice(fnAsStr.indexOf('{') + 1, -1) // remove wrapping function, which may have been renamed by minification
+  .replaceAll('  ', '') // remove indentation
+  .replaceAll('{BASE_URL}', BASE_URL) // interpolate base url
+  .replaceAll('{SEARCH}', window.location.search); // interpolate search query
 }
 
 /*
@@ -82,11 +55,7 @@ export function serializeSearchWorkerSrc() {
  * the worker via onmessage and passed back to the main thread via postMessage.
  */
 function worker() {
-  const preloadTitlesPromise = (async () => {
-    const f = await fetch('{BASE_URL}/autocomplete-preload{SEARCH}');
-    const rawTitles = await f.json();
-    return rawTitles.map(preparseTitle);
-  })();
+  const preloadTitlesPromise = fetch('{BASE_URL}/autocomplete-preload{SEARCH}').then(f => f.json()).then(rawTitles => rawTitles.map(preparseTitle));
   function preparseTitle({
     value,
     popularity
@@ -138,41 +107,43 @@ function worker() {
     };
   }
   const maxResults = 5;
-  async function autocompleteHandler(q) {
-    const titles = await preloadTitlesPromise;
-    const scoredTitles = titles.map(t => getScoredTitle(q, t));
-    const topAutocompleteTitles = scoredTitles.filter(x => x.score > 0).sort((a, b) => a.score > b.score ? -1 : 1).slice(0, maxResults).map(t => ({
-      title: t.title,
-      segments: getHighlightSegments(t.title, t.charScores)
-    }));
-    postMessage({
-      query: q.query,
-      result: topAutocompleteTitles,
-      action: 'autocomplete'
+  function autocompleteHandler(q) {
+    preloadTitlesPromise.then(titles => {
+      const scoredTitles = titles.map(t => getScoredTitle(q, t));
+      const topAutocompleteTitles = scoredTitles.filter(x => x.score > 0).sort((a, b) => a.score > b.score ? -1 : 1).slice(0, maxResults).map(t => ({
+        title: t.title,
+        segments: getHighlightSegments(t.title, t.charScores)
+      }));
+      postMessage({
+        query: q.query,
+        result: topAutocompleteTitles,
+        action: 'autocomplete'
+      });
     });
   }
-  async function searchAsYouTypeHandler(q) {
-    const f = await fetch('{BASE_URL}/search-as-you-type{SEARCH}', {
+  function searchAsYouTypeHandler(q) {
+    fetch('{BASE_URL}/search-as-you-type{SEARCH}', {
       body: JSON.stringify({
         query: q.query,
         max: maxResults
       }),
       method: 'POST'
-    });
-    const searchAsYouTypeResults = await f.json();
-    for (const entry of searchAsYouTypeResults.top) {
-      const t = preparseTitle({
-        value: entry.title,
-        popularity: 0
+    }).then(f => f.json()).then(searchAsYouTypeResults => {
+      for (let i = 0; i < searchAsYouTypeResults.top.length; i++) {
+        const entry = searchAsYouTypeResults.top[i];
+        const t = preparseTitle({
+          value: entry.title,
+          popularity: 0
+        });
+        const charScores = getCharScores(q, t);
+        entry.segments = getHighlightSegments(entry.title, charScores);
+        entry.key = q.query + ':' + entry.title;
+      }
+      postMessage({
+        query: q.query,
+        result: searchAsYouTypeResults,
+        action: 'search-as-you-type'
       });
-      const charScores = getCharScores(q, t);
-      entry.segments = getHighlightSegments(entry.title, charScores);
-      entry.key = q.query + ':' + entry.title;
-    }
-    postMessage({
-      query: q.query,
-      result: searchAsYouTypeResults,
-      action: 'search-as-you-type'
     });
   }
 
@@ -187,17 +158,17 @@ function worker() {
   // Bonus scores are includes in certain cases
   function getTotalScore(q, t, charScores) {
     let fromChars = 0;
-    for (const s of charScores) {
-      fromChars += s;
+    for (let i = 0; i < charScores.length; i++) {
+      fromChars += charScores[i];
     }
     const fromPopularity = (t.popularity || 0) * popularityStrength;
     let bonus = 0;
     // for each complete word present in both the title and query
-    for (const qw of q.words) {
+    q.words.forEach(qw => {
       if (t.words.has(qw)) {
         bonus += 100;
       }
-    }
+    });
 
     // if the title starts with the query
     if (t.lower.startsWith(q.query)) {
@@ -321,9 +292,11 @@ function worker() {
     // "authentication" or other words ending in "ion"
     const minMatchLength = Math.ceil(avgQueryWordLength ** 0.65);
     const charScores = [];
-    for (const cmcs of cmcsForTitleChars) {
+    for (let i = 0; i < cmcsForTitleChars.length; i++) {
+      const cmcs = cmcsForTitleChars[i];
       let score = 0;
-      for (const cmc of cmcs) {
+      for (let j = 0; j < cmcs.length; j++) {
+        const cmc = cmcs[j];
         // if the string of consecutive matching chars meets the minMatchLength
         // or if it's a standalone word in the query (e.g "C")
         if (cmc.value.length >= minMatchLength || q.words.has(cmc.value)) {

package/dist/AppHeader/Search/SearchWorker/worker.js

@@ -5,74 +5,27 @@ const mockWorker = () => ({
   postMessage: () => null
 });
 export function createSearchWorker() {
-  // eslint-disable-next-line no-console
-  console.log('[createSearchWorker] Starting worker creation');
-  try {
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Serializing worker source');
-    const src = serializeSearchWorkerSrc();
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Worker source serialized, length:', src.length);
-
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Creating blob');
-    const blob = new Blob([src], {
-      type: 'text/javascript'
-    });
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Blob created');
-
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Creating object URL');
-    const dataUrl = URL.createObjectURL?.(blob);
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Object URL created:', dataUrl);
-
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Checking Worker availability');
-    const w = typeof Worker === 'undefined' ? mockWorker() : new Worker(dataUrl);
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Worker instance created');
-    const results = new PromiseLookup({
-      onKeyInit: (action, query) => {
-        // eslint-disable-next-line no-console
-        console.log('[createSearchWorker.onKeyInit] Posting message to worker:', {
-          action,
-          query
-        });
-        w.postMessage({
-          action,
-          query
-        });
-      }
-    });
-    w.onmessage = ({
-      data
-    }) => {
-      // eslint-disable-next-line no-console
-      console.log('[createSearchWorker.onmessage] Received message from worker:', data);
-      const {
-        query,
-        result,
-        action
-      } = data;
-      results.resolve(action, query, result);
-    };
-
-    // Add error handler for the worker
-    if ('onerror' in w) {
-      w.onerror = error => {
-        // eslint-disable-next-line no-console
-        console.error('[createSearchWorker] Worker error:', error);
-      };
-    }
-
-    // eslint-disable-next-line no-console
-    console.log('[createSearchWorker] Worker fully configured');
-    return (action, query) => results.get(action, query);
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error('[createSearchWorker] Error creating worker:', error);
-    throw error;
-  }
+  const src = serializeSearchWorkerSrc();
+  const blob = new Blob([src], {
+    type: 'text/javascript'
+  });
+  const dataUrl = URL.createObjectURL?.(blob);
+  const w = typeof Worker === 'undefined' ? mockWorker() : new Worker(dataUrl);
+  const results = new PromiseLookup({
+    onKeyInit: (action, query) => w.postMessage({
+      action,
+      query
+    })
+  });
+  w.onmessage = ({
+    data
+  }) => {
+    const {
+      query,
+      result,
+      action
+    } = data;
+    results.resolve(action, query, result);
+  };
+  return (action, query) => results.get(action, query);
 }

package/dist/AppHeader/Search/safelyRedirect.js

@@ -5,31 +5,14 @@
 
 import { ALLOWED_HOSTS } from './consts';
 export function safelyRedirect(url) {
-  // eslint-disable-next-line no-console
-  console.log('[safelyRedirect] Attempting to redirect to:', url);
   try {
-    // eslint-disable-next-line no-console
-    console.log('[safelyRedirect] Sanitizing URL');
     const sanitizedURL = sanitizeURL(url);
-    // eslint-disable-next-line no-console
-    console.log('[safelyRedirect] Sanitized URL:', sanitizedURL);
-    const isRelative = isRelativeUrl(sanitizedURL);
-    // eslint-disable-next-line no-console
-    console.log('[safelyRedirect] Is relative URL:', isRelative);
-    const hasAllowed = hasAllowedHost(sanitizedURL);
-    // eslint-disable-next-line no-console
-    console.log('[safelyRedirect] Has allowed host:', hasAllowed);
-    if (isRelative || hasAllowed) {
-      // eslint-disable-next-line no-console
-      console.log('[safelyRedirect] Redirecting to:', sanitizedURL);
+    if (isRelativeUrl(sanitizedURL) || hasAllowedHost(sanitizedURL)) {
       window.location.assign(sanitizedURL);
     } else {
       throw new Error(`Invalid redirect url: ${sanitizedURL}`);
     }
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error('[safelyRedirect] Error during redirect:', error);
-  }
+  } catch (error) {}
 }
 function hasAllowedHost(url) {
   const parsedUrl = new URL(url);
@@ -54,35 +37,13 @@ function isRelativeUrl(url) {
 // supports already encoded urls by decoding and re-encoding.
 // params are handled separately to allow for the encoding of / characters
 function sanitizeURL(url) {
-  // eslint-disable-next-line no-console
-  console.log('[sanitizeURL] Input URL:', url);
-  try {
-    const [path, params] = url.split('?', 2);
-    // eslint-disable-next-line no-console
-    console.log('[sanitizeURL] Path:', path, 'Params:', params);
-    const sanitizedPath = encodeURI(decodeURI(path));
-    // eslint-disable-next-line no-console
-    console.log('[sanitizeURL] Sanitized path:', sanitizedPath);
-    if (!params) return sanitizedPath;
-
-    // eslint-disable-next-line no-console
-    console.log('[sanitizeURL] Creating URLSearchParams with:', params);
-    const urlParams = new URLSearchParams(params);
-    // eslint-disable-next-line no-console
-    console.log('[sanitizeURL] URLSearchParams created');
-    urlParams.forEach((value, key) => {
-      // eslint-disable-next-line no-console
-      console.log('[sanitizeURL] Processing param:', key, '=', value);
-      const decoded = decodeURIComponent(value);
-      urlParams.set(key, decoded);
-    });
-    const result = `${sanitizedPath}?${urlParams.toString()}`;
-    // eslint-disable-next-line no-console
-    console.log('[sanitizeURL] Final result:', result);
-    return result;
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error('[sanitizeURL] Error sanitizing URL:', error);
-    throw error;
-  }
+  const [path, params] = url.split('?', 2);
+  const sanitizedPath = encodeURI(decodeURI(path));
+  if (!params) return sanitizedPath;
+  const urlParams = new URLSearchParams(params);
+  urlParams.forEach((value, key) => {
+    const decoded = decodeURIComponent(value);
+    urlParams.set(key, decoded);
+  });
+  return `${sanitizedPath}?${urlParams.toString()}`;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/brand",
   "description": "Brand component library for Codecademy",
-  "version": "3.36.2-alpha.e9c6fd8276.0",
+  "version": "3.36.2",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "dependencies": {
     "@emotion/is-prop-valid": "^1.2.1",