fix: merge conflicts

rpidanny · Nov 3, 2023 · 6f4888d · 6f4888d
2 parents 3b09db9 + 40b1dc1
commit 6f4888d
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 41 deletions.
diff --git a/apps/chrome-extension/CHANGELOG.md b/apps/chrome-extension/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [1.8.2](https://github.com/rpidanny/llm-prompt-templates/compare/chrome-extension-v1.8.1...chrome-extension-v1.8.2) (2023-11-02)
+
+
+### Bug Fixes
+
+* update package.json version on release ([#17](https://github.com/rpidanny/llm-prompt-templates/issues/17)) ([59a829c](https://github.com/rpidanny/llm-prompt-templates/commit/59a829cec1a75a8026938ca7837fa57836e01006))
+
+## [1.8.1](https://github.com/rpidanny/llm-prompt-templates/compare/chrome-extension-v1.8.0...chrome-extension-v1.8.1) (2023-10-30)
+
+
+### Bug Fixes
+
+* bard text area selector ([#16](https://github.com/rpidanny/llm-prompt-templates/issues/16)) ([1c85d6a](https://github.com/rpidanny/llm-prompt-templates/commit/1c85d6a474b2e0eb3ddd2cfe9e205f79cf14c3ac))
+
 # [1.8.0](https://github.com/rpidanny/llm-prompt-templates/compare/chrome-extension-v1.7.0...chrome-extension-v1.8.0) (2023-05-27)
 
 

diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "llm-prompt-templates",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Get more out of your LLM with the latest advances in prompt engineering",
   "type": "commonjs",
   "repository": {

diff --git a/apps/chrome-extension/release.config.js b/apps/chrome-extension/release.config.js
@@ -40,6 +40,12 @@ module.exports = {
         changelogFile: `${srcRoot}/CHANGELOG.md`,
       },
     ],
+    [
+      '@rpidanny/semantic-release-update-package.json',
+      {
+        packageJsonPath: `${srcRoot}/package.json`,
+      },
+    ],
     [
       '@semantic-release/npm',
       {

diff --git a/apps/chrome-extension/src/pages/Content/base.dom.tsx b/apps/chrome-extension/src/pages/Content/base.dom.tsx
@@ -1,4 +1,5 @@
 import { IPrompt } from '@rpidanny/llm-prompt-templates';
+import { message } from 'antd';
 import mixpanel from 'mixpanel-browser';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
@@ -7,8 +8,6 @@ import { Metrics } from './metrics';
 import { groupedPrompts } from './prompts';
 import PromptsView from './PromptsView';
 
-mixpanel.init('1eb7876e8cc0adf4a46631b5ba85b4d5');
-
 export abstract class BaseDom {
   protected abstract name: string;
 
@@ -26,7 +25,10 @@ export abstract class BaseDom {
 
   init() {
     console.log(`Initializing ${this.name} DOM`);
+
+    mixpanel.init('1eb7876e8cc0adf4a46631b5ba85b4d5');
     mixpanel.identify('local');
+
     this.promptsView = this.createPromptsElement();
     this.addTriggers();
   }
@@ -39,7 +41,16 @@ export abstract class BaseDom {
     });
 
     this.isPromptsViewOpen = false;
-    this.usePrompt(prompt);
+    try {
+      this.usePrompt(prompt);
+    } catch (error) {
+      console.error(error);
+      message.error(
+        'Failed to use prompt. Copying prompt to clipboard instead.',
+        5
+      );
+      this.copyPromptToClipboard(prompt);
+    }
     this.hidePrompts();
   }
 
@@ -61,6 +72,15 @@ export abstract class BaseDom {
     );
   }
 
+  protected copyPromptToClipboard(prompt: IPrompt) {
+    const clipboardItem = new ClipboardItem({
+      'text/plain': new Blob([prompt.content], { type: 'text/plain' }),
+    });
+    navigator.clipboard.write([clipboardItem]);
+
+    message.info(`${prompt.name} prompt copied to clipboard`, 7);
+  }
+
   protected async showPrompts() {
     mixpanel.track(Metrics.PromptListShown);
 

diff --git a/apps/chrome-extension/src/pages/Content/generic.dom.ts b/apps/chrome-extension/src/pages/Content/generic.dom.ts
@@ -1,5 +1,4 @@
 import { IPrompt } from '@rpidanny/llm-prompt-templates';
-import { message } from 'antd';
 
 import { BaseDom } from './base.dom';
 
@@ -10,12 +9,7 @@ export class GenericDom extends BaseDom {
   protected addCustomTrigger() {}
 
   protected usePrompt(prompt: IPrompt) {
-    const clipboardItem = new ClipboardItem({
-      'text/plain': new Blob([prompt.content], { type: 'text/plain' }),
-    });
-    navigator.clipboard.write([clipboardItem]);
-
-    message.info(`${prompt.name} prompt copied to clipboard`);
+    this.copyPromptToClipboard(prompt);
   }
 }
 

diff --git a/apps/chrome-extension/src/pages/Content/llms/bard/bard.dom.ts b/apps/chrome-extension/src/pages/Content/llms/bard/bard.dom.ts
@@ -1,6 +1,16 @@
-import { ChatGPTDom } from '../chatgpt/chatgpt.dom';
+import { IPrompt } from '@rpidanny/llm-prompt-templates';
 
-export class BardDom extends ChatGPTDom {
+import { LLMDom } from '../llm.dom';
+
+export class BardDom extends LLMDom {
   protected name = 'Bard';
-  protected textAreaSelector = 'div > textarea';
+  protected textAreaSelector = 'rich-textarea > .ql-editor';
+
+  protected usePrompt(prompt: IPrompt) {
+    const textArea = this.getTextArea();
+    console.log('Setting text', prompt.content);
+    textArea.focus();
+    textArea.textContent = prompt.content;
+    textArea.style.height = textArea.scrollHeight + 'px';
+  }
 }
diff --git a/apps/chrome-extension/src/pages/Content/llms/chatgpt/chatgpt.dom.ts b/apps/chrome-extension/src/pages/Content/llms/chatgpt/chatgpt.dom.ts
@@ -1,34 +1,11 @@
 import { IPrompt } from '@rpidanny/llm-prompt-templates';
 
-import { BaseDom } from '../../base.dom';
+import { LLMDom } from '../llm.dom';
 
-export class ChatGPTDom extends BaseDom {
+export class ChatGPTDom extends LLMDom {
   protected name = 'ChatGPT';
   protected textAreaSelector = 'div.relative > textarea';
 
-  private getTextArea(): HTMLTextAreaElement {
-    const textArea = document.querySelector<HTMLTextAreaElement>(
-      this.textAreaSelector
-    );
-
-    if (!textArea) throw new Error('Could not find text area');
-
-    return textArea;
-  }
-
-  protected addCustomTrigger() {
-    this.getTextArea().addEventListener('input', (event) => {
-      const input = event.target as HTMLTextAreaElement;
-      const text = input.value;
-
-      if (text === '/templates' || text === '/lpt') {
-        this.showPrompts();
-      } else if (this.isPromptsViewOpen) {
-        this.hidePrompts();
-      }
-    });
-  }
-
   protected usePrompt(prompt: IPrompt) {
     const textArea = this.getTextArea();
     console.log('Setting text', prompt.content);

diff --git a/apps/chrome-extension/src/pages/Content/llms/llm.dom.ts b/apps/chrome-extension/src/pages/Content/llms/llm.dom.ts
@@ -0,0 +1,31 @@
+import { BaseDom } from '../base.dom';
+
+export abstract class LLMDom extends BaseDom {
+  protected abstract name: string;
+  protected abstract textAreaSelector: string;
+
+  protected getTextArea(): HTMLTextAreaElement {
+    const textArea = document.querySelector<HTMLTextAreaElement>(
+      this.textAreaSelector
+    );
+
+    if (!textArea) {
+      throw new Error('Could not find text area');
+    }
+
+    return textArea;
+  }
+
+  protected addCustomTrigger() {
+    this.getTextArea().addEventListener('input', (event) => {
+      const input = event.target as HTMLTextAreaElement;
+      const text = input.value;
+
+      if (text === '/templates' || text === '/lpt') {
+        this.showPrompts();
+      } else if (this.isPromptsViewOpen) {
+        this.hidePrompts();
+      }
+    });
+  }
+}
diff --git a/libs/llm-prompt-templates/CHANGELOG.md b/libs/llm-prompt-templates/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.3.1](https://github.com/rpidanny/llm-prompt-templates/compare/llm-prompt-templates-v1.3.0...llm-prompt-templates-v1.3.1) (2023-11-02)
+
+
+### Bug Fixes
+
+* update package.json version on release ([#17](https://github.com/rpidanny/llm-prompt-templates/issues/17)) ([59a829c](https://github.com/rpidanny/llm-prompt-templates/commit/59a829cec1a75a8026938ca7837fa57836e01006))
+
 # [1.3.0](https://github.com/rpidanny/llm-prompt-templates/compare/llm-prompt-templates-v1.2.0...llm-prompt-templates-v1.3.0) (2023-05-27)
 
 

diff --git a/libs/llm-prompt-templates/package.json b/libs/llm-prompt-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rpidanny/llm-prompt-templates",
-  "version": "1.0.1",
+  "version": "1.3.1",
   "type": "commonjs",
   "exports": {
     ".": "./src/index.js",
@@ -17,4 +17,4 @@
     "url": "https://github.com/rpidanny/llm-prompt-templates.git",
     "directory": "libs/llm-prompt-templates"
   }
-}
+}
diff --git a/libs/llm-prompt-templates/release.config.js b/libs/llm-prompt-templates/release.config.js
@@ -40,6 +40,12 @@ module.exports = {
         changelogFile: `${srcRoot}/CHANGELOG.md`,
       },
     ],
+    [
+      '@rpidanny/semantic-release-update-package.json',
+      {
+        packageJsonPath: `${srcRoot}/package.json`,
+      },
+    ],
     [
       '@semantic-release/npm',
       {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
     "@nx/workspace": "16.1.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@rpidanny/eslint-config-typescript": "^1.1.0",
+    "@rpidanny/semantic-release-update-package.json": "^1.0.0",
     "@svgr/webpack": "^6.1.2",
     "@swc/cli": "~0.1.62",
     "@swc/core": "~1.3.51",