chore: upgrade mustache and other deps (#508)

* chore: ignore pdf.js lib in public/assets * chore: upgrade mustache and other deps * chore: upgrade rollup TS plugin * chore: upgrade ts-loader
watson-developer-cloud · Apr 26, 2023 · 11c1f93 · 11c1f93
1 parent 1fe45d8
commit 11c1f93
Show file tree

Hide file tree

Showing 19 changed files with 205 additions and 200 deletions.
diff --git a/examples/discovery-search-app/.gitignore b/examples/discovery-search-app/.gitignore
@@ -1,3 +1,4 @@
-build
 ibm-credentials.env
 .env.local
+build
+public/assets/**
diff --git a/package.json b/package.json
@@ -22,15 +22,15 @@
     "@commitlint/config-conventional": "^11.0.0",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^11.2.7",
-    "@testing-library/react-hooks": "^7.0.2",
+    "@testing-library/react-hooks": "^8.0.1",
     "@types/babel__preset-env": "^7.9.2",
     "@types/classnames": "^2.2.9",
     "@types/debounce": "^1.2.0",
     "@types/dompurify": "^3.0.2",
     "@types/jest": "^24.0.18",
     "@types/lodash": "^4.14.141",
     "@types/md5": "2.3.2",
-    "@types/mustache": "^0.8.32",
+    "@types/mustache": "^4.2.2",
     "@types/node": "^16.18.23",
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
@@ -74,7 +74,7 @@
     "regenerator-runtime": "^0.13.3",
     "seedrandom": "^3.0.5",
     "source-map-explorer": "2.0.1",
-    "ts-loader": "^6.2.1",
+    "ts-loader": "^9.4.2",
     "typescript": "^3.8.2",
     "vue": "^2.6.11",
     "webpack": "5.72.1",

diff --git a/packages/discovery-react-components/package.json b/packages/discovery-react-components/package.json
@@ -33,13 +33,13 @@
   "dependencies": {
     "@react-hook/size": "^2.1.2",
     "buffer": "^6.0.3",
-    "classnames": "^2.2.6",
-    "debounce": "^1.2.0",
+    "classnames": "^2.3.2",
+    "debounce": "^1.2.1",
     "dompurify": "^3.0.2",
-    "entities": "^4.4.0",
+    "entities": "^4.5.0",
     "htmlparser2": "^4.0.0",
     "lodash": "^4.17.21",
-    "mustache": "^3.1.0",
+    "mustache": "^4.2.0",
     "pdfjs-dist": "2.6.347",
     "react-error-boundary": "^1.2.5",
     "react-resize-detector": "^4.2.1",
@@ -73,7 +73,7 @@
     "rollup": "^2.57.0",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.30.0",
+    "rollup-plugin-typescript2": "^0.34.1",
     "sass-embedded": "^1.52.2",
     "sass-loader": "^12.3.0",
     "style-loader": "^1.3.0",

diff --git a/packages/discovery-react-components/rollup.config.js b/packages/discovery-react-components/rollup.config.js
@@ -59,7 +59,6 @@ const COMMON_PLUGINS = [
     include: [pdfWorkerRegex]
   }),
   typescript({
-    rollupCommonJSResolveHack: true,
     clean: true,
     tsconfig: 'tsconfig.prod.json'
   })

diff --git a/packages/discovery-react-components/src/components/CIDocument/types.ts b/packages/discovery-react-components/src/components/CIDocument/types.ts
@@ -48,13 +48,13 @@ export interface ItemMap {
 
 export type EnrichedHtml = EnrichedHtmlContract | EnrichedHtmlInvoice | EnrichedHtmlPurchaseOrder;
 
-interface EnrichedHtmlContract {
+export interface EnrichedHtmlContract {
   contract: Contract;
 }
-interface EnrichedHtmlInvoice {
+export interface EnrichedHtmlInvoice {
   invoice: Invoice;
 }
-interface EnrichedHtmlPurchaseOrder {
+export interface EnrichedHtmlPurchaseOrder {
   purchase_order: PurchaseOrder;
 }
 

diff --git a/...overy-react-components/src/components/CIDocument/utils/__tests__/elementFromPoint.spec.ts b/...overy-react-components/src/components/CIDocument/utils/__tests__/elementFromPoint.spec.ts
@@ -42,7 +42,7 @@ describe('elementFromPoint returns expected mock element', () => {
   });
 
   it('runs elementsFromPoint function for standard web browsers', () => {
-    document.elementsFromPoint = (x: number, y: number): Element[] => {
+    document.elementsFromPoint = (_x: number, _y: number): Element[] => {
       return mockElements as unknown as Element[];
     };
 
@@ -51,7 +51,7 @@ describe('elementFromPoint returns expected mock element', () => {
   });
 
   it('runs elementFromPointMs function for MS Edge browser', () => {
-    (document as MsDocument).msElementsFromPoint = (x: number, y: number): HTMLElement[] => {
+    (document as MsDocument).msElementsFromPoint = (_x: number, _y: number): HTMLElement[] => {
       return mockElements as unknown as HTMLElement[];
     };
 
@@ -61,7 +61,7 @@ describe('elementFromPoint returns expected mock element', () => {
 
   it('runs elementFromPointFallback function for older browsers', () => {
     let nextElementIndex = 0;
-    document.elementFromPoint = (x: number, y: number): Element | null => {
+    document.elementFromPoint = (_x: number, _y: number): Element | null => {
       return nextElementIndex < mockElements.length
         ? (mockElements[nextElementIndex++] as unknown as Element)
         : null;
@@ -73,7 +73,7 @@ describe('elementFromPoint returns expected mock element', () => {
 
   it('runs elementFromPointFallback and fails to find element', () => {
     let nextElementIndex = 0;
-    document.elementFromPoint = (x: number, y: number): Element | null => {
+    document.elementFromPoint = (_x: number, _y: number): Element | null => {
       return nextElementIndex < mockElements.length
         ? (mockElements[nextElementIndex++] as unknown as Element)
         : null;

diff --git a/...covery-react-components/src/components/DocumentPreview/__tests__/DocumentPreview.test.tsx b/...covery-react-components/src/components/DocumentPreview/__tests__/DocumentPreview.test.tsx
@@ -190,7 +190,7 @@ describe('DocumentPreview', () => {
       const results = {
         matching_results: 1,
         results: [selectedResult]
-      };
+      } as unknown as DiscoveryV2.QueryResponse;
 
       render(
         <DiscoverySearch
@@ -239,7 +239,7 @@ describe('DocumentPreview', () => {
         const results = {
           matching_results: 1,
           results: [selectedResult]
-        };
+        } as unknown as DiscoveryV2.QueryResponse;
 
         render(
           <DiscoverySearch
@@ -289,7 +289,7 @@ describe('DocumentPreview', () => {
       const results = {
         matching_results: 1,
         results: [selectedResult]
-      };
+      } as unknown as DiscoveryV2.QueryResponse;
 
       render(
         <DiscoverySearch

diff --git a/...nts/src/components/DocumentPreview/components/PdfHighlight/utils/common/TextNormalizer.ts b/...nts/src/components/DocumentPreview/components/PdfHighlight/utils/common/TextNormalizer.ts
@@ -145,7 +145,7 @@ function normalizeText(text: string): string {
 export class TextNormalizer {
   readonly rawText: string;
   readonly normalizedText: string;
-  private readonly normalizationMappings: SpanMapping[];
+  readonly normalizationMappings: SpanMapping[];
 
   constructor(rawText: string) {
     this.rawText = rawText;

diff --git a/...rc/components/DocumentPreview/components/SimpleDocument/__tests__/SimpleDocument.test.tsx b/...rc/components/DocumentPreview/components/SimpleDocument/__tests__/SimpleDocument.test.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
 import { act, render, BoundFunction, GetByText } from '@testing-library/react';
+import DiscoveryV2 from 'ibm-watson/discovery/v2';
 import 'utils/test/createRange.mock';
-import SimpleDocument from '../SimpleDocument';
+import { wrapWithContext } from 'utils/testingUtils';
 import docArrayJson from 'components/DocumentPreview/__fixtures__/ArtEffectsTextArray.json';
 import { SearchApiIFC, SearchContextIFC } from 'components/DiscoverySearch/DiscoverySearch';
-import { wrapWithContext } from 'utils/testingUtils';
+import SimpleDocument from '../SimpleDocument';
 
 const noop = (): any => {
   throw new Error();
@@ -16,7 +17,7 @@ describe('SimpleDocument', () => {
     extracted_metadata: {
       filename: 'i_am_a_file'
     }
-  };
+  } as unknown as DiscoveryV2.QueryResult;
 
   beforeAll(() => {
     window.HTMLElement.prototype.scrollIntoView = jest.fn();
@@ -29,6 +30,8 @@ describe('SimpleDocument', () => {
           document={minimalDoc}
           setHideToolbarControls={(): void => {}}
           setLoading={(): void => {}}
+          loading={false}
+          hideToolbarControls={false}
         />
       );
     });
@@ -42,9 +45,11 @@ describe('SimpleDocument', () => {
     act(() => {
       ({ getByText } = render(
         <SimpleDocument
-          document={docArrayJson}
+          document={docArrayJson as unknown as DiscoveryV2.QueryResult}
           setLoading={(): void => {}}
           setHideToolbarControls={(): void => mock('setHideToolbarControls called')}
+          loading={false}
+          hideToolbarControls={false}
         />
       ));
     });
@@ -59,7 +64,7 @@ describe('SimpleDocument', () => {
     const documentText = 'This is the text of the document.';
     const customDoc = {
       body_field: documentText
-    };
+    } as unknown as DiscoveryV2.QueryResult;
     const context: Partial<SearchContextIFC> = {
       componentSettings: {
         fields_shown: {
@@ -79,6 +84,8 @@ describe('SimpleDocument', () => {
             document={customDoc}
             setHideToolbarControls={(): void => {}}
             setLoading={(): void => {}}
+            loading={false}
+            hideToolbarControls={false}
           />,
           api,
           context
@@ -96,7 +103,7 @@ describe('SimpleDocument', () => {
     const customDoc = {
       body_field: bodyText,
       passage_field: passageText
-    };
+    } as unknown as DiscoveryV2.QueryResult;
 
     const context: Partial<SearchContextIFC> = {
       componentSettings: {
@@ -126,6 +133,8 @@ describe('SimpleDocument', () => {
             highlight={highlight}
             setHideToolbarControls={(): void => {}}
             setLoading={(): void => {}}
+            loading={false}
+            hideToolbarControls={false}
           />,
           api,
           context

diff --git a/...very-react-components/src/components/DocumentPreview/utils/__tests__/documentData.test.ts b/...very-react-components/src/components/DocumentPreview/utils/__tests__/documentData.test.ts
@@ -1,10 +1,11 @@
+import { QueryResult } from 'ibm-watson/discovery/v2';
 import { detectPreviewType, getTextMappings, isCsvFile, isJsonFile } from '../documentData';
 import jsonDoc from '../../__fixtures__/Art Effects Koya Creative Base TSA 2008.pdf.json';
 
 describe('documentData', () => {
   const noMetadata = {
     extracted_metadata: {}
-  };
+  } as unknown as QueryResult;
 
   let consoleError: jest.SpyInstance<any, any>;
 
@@ -73,7 +74,7 @@ describe('documentData', () => {
     extracted_metadata: {
       file_type: 'json'
     }
-  };
+  } as unknown as QueryResult;
   it('returns true if the document is a JSON file', () => {
     const docTypeJson = isJsonFile(jsonFileType);
     expect(docTypeJson).toEqual(true);
@@ -83,7 +84,7 @@ describe('documentData', () => {
     extracted_metadata: {
       file_type: 'csv'
     }
-  };
+  } as unknown as QueryResult;
   it('returns true if the document is a CSV file', () => {
     const docTypeJson = isCsvFile(csvFileType);
     expect(docTypeJson).toEqual(true);
@@ -93,7 +94,7 @@ describe('documentData', () => {
     extracted_metadata: {
       file_type: true
     }
-  };
+  } as unknown as QueryResult;
   it('returns false if the file type provided is not a string', () => {
     const falseDocType = isJsonFile(noStringFileType);
     expect(falseDocType).toEqual(false);