Follow up to replace papi-components with two libraries (#716)

paranext · Jan 17, 2024 · 786ce6a · 786ce6a
2 parents c2dd689 + ba696ec
commit 786ce6a
Show file tree

Hide file tree

Showing 28 changed files with 343 additions and 317 deletions.
diff --git a/extensions/package-lock.json b/extensions/package-lock.json
diff --git a/extensions/src/hello-someone/src/hello-someone.web-view.html b/extensions/src/hello-someone/src/hello-someone.web-view.html
@@ -34,6 +34,7 @@
     <script>
       const papi = require('@papi/frontend');
       const { logger } = require('@papi/frontend');
+      const { htmlEncode, serialize } = require('platform-bible-utils');
 
       function print(input) {
         logger.debug(input);
@@ -50,7 +51,7 @@
           const nameInput = document.getElementById('name-input');
           const greeting = await peopleDataProvider.getGreeting(nameInput.value.toLowerCase());
           const helloSomeoneOutput = document.getElementById('greetings-button-output');
-          helloSomeoneOutput.textContent = papi.utils.htmlEncode(greeting || '');
+          helloSomeoneOutput.textContent = htmlEncode(greeting || '');
           print(greeting);
         });
         greetingsButton.addEventListener('contextmenu', async (e) => {
@@ -69,7 +70,7 @@
           const nameInput = document.getElementById('name-input');
           const success = await peopleDataProvider.deletePerson(nameInput.value.toLowerCase());
           const helloSomeoneOutput = document.getElementById('greetings-button-output');
-          helloSomeoneOutput.textContent = papi.utils.htmlEncode(
+          helloSomeoneOutput.textContent = htmlEncode(
             `${success ? 'Successfully' : 'Unsuccessfully'} deleted ${nameInput.value}.${
               success ? ' RIP ⚰️' : ''
             }`.replace(/'/g, '`'),
@@ -87,7 +88,7 @@
             setGreetingsInput.value,
           );
           const helloSomeoneOutput = document.getElementById('greetings-button-output');
-          helloSomeoneOutput.textContent = papi.utils.htmlEncode(
+          helloSomeoneOutput.textContent = htmlEncode(
             `${success ? 'Successfully' : 'Unsuccessfully'} set ${name}'s greeting!`.replace(
               /'/g,
               '`',
@@ -106,16 +107,16 @@
             parseInt(setAgeInput.value),
           );
           const helloSomeoneOutput = document.getElementById('greetings-button-output');
-          helloSomeoneOutput.textContent = papi.utils.htmlEncode(
+          helloSomeoneOutput.textContent = htmlEncode(
             `${success ? 'Successfully' : 'Unsuccessfully'} set ${name}'s age!`.replace(/'/g, '`'),
           );
         });
 
         // Update the 'people' display on load and on updates
         peopleDataProvider.subscribePeople(undefined, (people) => {
           const peopleData = document.getElementById('people-data');
-          const peopleString = papi.utils.serialize(people, undefined, 2);
-          peopleData.textContent = papi.utils.htmlEncode(peopleString.replace(/"/g, '`'));
+          const peopleString = serialize(people, undefined, 2);
+          peopleData.textContent = htmlEncode(peopleString.replace(/"/g, '`'));
           print(peopleString);
         });
 
@@ -126,9 +127,7 @@
           () => {
             peopleUpdateCount += 1;
             const peopleUpdateCountDiv = document.getElementById('people-update-count');
-            peopleUpdateCountDiv.textContent = papi.utils.htmlEncode(
-              `People Updates: ${peopleUpdateCount}`,
-            );
+            peopleUpdateCountDiv.textContent = htmlEncode(`People Updates: ${peopleUpdateCount}`);
           },
           { retrieveDataImmediately: false },
         );
@@ -142,7 +141,7 @@
             const billAnyGreetingsUpdateCountDiv = document.getElementById(
               'bill-any-greetings-update-count',
             );
-            billAnyGreetingsUpdateCountDiv.textContent = papi.utils.htmlEncode(
+            billAnyGreetingsUpdateCountDiv.textContent = htmlEncode(
               `Any Greetings Updates (via Bill): ${billAnyGreetingsUpdateCount}`,
             );
           },
@@ -156,7 +155,7 @@
           const billGreetingsUpdateCountDiv = document.getElementById(
             'bill-greetings-update-count',
           );
-          billGreetingsUpdateCountDiv.textContent = papi.utils.htmlEncode(
+          billGreetingsUpdateCountDiv.textContent = htmlEncode(
             `Bill Greetings Updates: ${billGreetingsUpdateCount}`,
           );
         });
@@ -168,7 +167,7 @@
           () => {
             billAnyAgeUpdateCount += 1;
             const billAnyAgeUpdateCountDiv = document.getElementById('bill-any-age-update-count');
-            billAnyAgeUpdateCountDiv.textContent = papi.utils.htmlEncode(
+            billAnyAgeUpdateCountDiv.textContent = htmlEncode(
               `Any Age Updates (via Bill): ${billAnyAgeUpdateCount}`,
             );
           },
@@ -180,9 +179,7 @@
         peopleDataProvider.subscribeAge('bIlL', () => {
           billAgeUpdateCount += 1;
           const billAgeUpdateCountDiv = document.getElementById('bill-age-update-count');
-          billAgeUpdateCountDiv.textContent = papi.utils.htmlEncode(
-            `Bill Age Updates: ${billAgeUpdateCount}`,
-          );
+          billAgeUpdateCountDiv.textContent = htmlEncode(`Bill Age Updates: ${billAgeUpdateCount}`);
         });
 
         // Attach handler for new-web-view-button

diff --git a/extensions/src/project-notes-data-provider/index.d.ts b/extensions/src/project-notes-data-provider/index.d.ts
@@ -2,10 +2,9 @@ import { VerseRef } from '@sillsdev/scripture';
 import type {
   DataProviderDataType,
   DataProviderSubscriberOptions,
-  Unsubscriber,
   IDataProvider,
 } from '@papi/core';
-import { PlatformEvent } from 'platform-bible-utils';
+import { PlatformEvent, Unsubscriber } from 'platform-bible-utils';
 
 declare module 'project-notes-data-provider' {
   export type ProjectNotesProviderDataTypes = {

diff --git a/extensions/src/usfm-data-provider/index.d.ts b/extensions/src/usfm-data-provider/index.d.ts
@@ -7,8 +7,8 @@ declare module 'usfm-data-provider' {
     ExtensionDataScope,
     IDataProvider,
     MandatoryProjectDataType,
-    Unsubscriber,
   } from '@papi/core';
+  import { Unsubscriber } from 'platform-bible-utils';
 
   export type UsfmProviderDataTypes = {
     BookNames: DataProviderDataType<boolean, string[], never>;

diff --git a/jest.config.ts b/jest.config.ts
@@ -18,8 +18,8 @@ const config: Config = {
     ...pathsToModuleNameMapper(compilerOptions.paths, {
       prefix: '<rootDir>/src',
     }),
-    '^platform-bible-react$': '<rootDir>/node_modules/platform-bible-react/dist/index.es.js',
-    '^platform-bible-utils$': '<rootDir>/node_modules/platform-bible-utils/dist/index.es.js',
+    '^platform-bible-react$': '<rootDir>/node_modules/platform-bible-react/dist/index.js',
+    '^platform-bible-utils$': '<rootDir>/node_modules/platform-bible-utils/dist/index.js',
   },
   testEnvironment: 'jsdom',
   testEnvironmentOptions: {

diff --git a/lib/papi-dts/package-lock.json b/lib/papi-dts/package-lock.json
diff --git a/lib/papi-dts/papi.d.ts b/lib/papi-dts/papi.d.ts
@@ -4656,7 +4656,6 @@ declare module '@papi/core' {
   export type { ExecutionToken } from 'node/models/execution-token.model';
   export type { DialogTypes } from 'renderer/components/dialogs/dialog-definition.model';
   export type { UseDialogCallbackOptions } from 'renderer/hooks/papi-hooks/use-dialog-callback.hook';
-  export type { UsePromiseOptions } from 'platform-bible-react';
   export type { default as IDataProvider } from 'shared/models/data-provider.interface';
   export type {
     DataProviderUpdateInstructions,
@@ -4666,12 +4665,6 @@ declare module '@papi/core' {
   export type { WithNotifyUpdate } from 'shared/models/data-provider-engine.model';
   export type { default as IDataProviderEngine } from 'shared/models/data-provider-engine.model';
   export type { DialogOptions } from 'shared/models/dialog-options.model';
-  export type {
-    Unsubscriber,
-    UnsubscriberAsync,
-    PlatformEvent,
-    default as PlatformEventEmitter,
-  } from 'platform-bible-utils';
   export type {
     ExtensionDataScope,
     MandatoryProjectDataType,