Merge branch 'master' into refactor/learneth-plugin

Author: hsy822

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.gg/hEUgg24WhH).
+Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.gg/KhDtC8mGqx).
 
 ## Development
 Remix libraries work closely with [Remix IDE](https://remix.ethereum.org). Each library has a README to explain its application.

README.md

@@ -12,7 +12,7 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/ethereum/remix-project?style=flat&logo=github)](https://github.com/ethereum/remix-project/graphs/contributors)
 [![Awesome Remix](https://img.shields.io/badge/Awesome--Remix-resources-green?logo=awesomelists)](https://github.com/ethereum/awesome-remix)
 [![GitHub](https://img.shields.io/github/license/ethereum/remix-project)](https://github.com/ethereum/remix-project/blob/master/LICENSE)
-[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/hEUgg24WhH)
+[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/KhDtC8mGqx)
 [![X Follow](https://img.shields.io/twitter/follow/ethereumremix?style=flat&logo=x&color=green)](https://x.com/ethereumremix)
 
 </div>
@@ -267,4 +267,4 @@ parameters:
 - Curated list of Remix resources: https://github.com/ethereum/awesome-remix
 - Medium: https://medium.com/remix-ide
 - X: https://x.com/ethereumremix
-- Join Discord: https://discord.gg/hEUgg24WhH
+- Join Discord: https://discord.gg/KhDtC8mGqx

apps/remixdesktop/src/lib/InferenceServerManager.ts

@@ -510,12 +510,12 @@ export class InferenceManager implements ICompletions {
       console.log('model not ready yet')
       return
     }
-    params.chatHistory = params.provider === 'anthropic' ? buildChatPrompt(prompt) : []
+    params.chatHistory = params.provider === 'anthropic' ? buildChatPrompt() : []
 
     if (params.stream_result) {
       return this._streamInferenceRequest('answer', { prompt:userPrompt, ...params })
     } else {
-      return this._makeInferenceRequest('answer', { prompt, ...params }, AIRequestType.GENERAL)
+      return this._makeInferenceRequest('answer', { prompt: userPrompt, ...params }, AIRequestType.GENERAL)
     }
   }
 

apps/remixdesktop/yarn.lock

@@ -74,9 +74,9 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2":
+"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2":
   version "10.2.0-electron.1"
-  resolved "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
+  resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"

libs/remix-ai-core/src/inferencers/local/ollama.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const _paq = (window._paq = window._paq || [])
+const _paq = (typeof window !== 'undefined' && (window as any)._paq) ? (window as any)._paq : []
 
 // default Ollama ports to check (11434 is the legacy/standard port)
 const OLLAMA_PORTS = [11434, 11435, 11436];

libs/remix-ai-core/src/inferencers/local/ollamaInferencer.ts

@@ -19,7 +19,7 @@ import {
 import axios from "axios";
 import { RemoteInferencer } from "../remote/remoteInference";
 
-const _paq = (window._paq = window._paq || [])
+const _paq = (typeof window !== 'undefined' && (window as any)._paq) ? (window as any)._paq : []
 const defaultErrorMessage = `Unable to get a response from Ollama server`;
 
 export class OllamaInferencer extends RemoteInferencer implements ICompletions, IGeneration {

libs/remix-ui/editor/src/lib/remix-ui-editor.tsx

@@ -182,7 +182,7 @@ export const EditorUI = (props: EditorUIProps) => {
   \t\t\t\t\t\t\t\t${intl.formatMessage({ id: 'editor.importantLinks.text1' })}: https://remix-project.org/\n
   \t\t\t\t\t\t\t\t${intl.formatMessage({ id: 'editor.importantLinks.text2' })}: https://remix-ide.readthedocs.io/en/latest/\n
   \t\t\t\t\t\t\t\tGithub: https://github.com/ethereum/remix-project\n
-  \t\t\t\t\t\t\t\tDiscord: https://discord.gg/hEUgg24WhH\n
+  \t\t\t\t\t\t\t\tDiscord: https://discord.gg/KhDtC8mGqx\n
   \t\t\t\t\t\t\t\tMedium: https://medium.com/remix-ide\n
   \t\t\t\t\t\t\t\tX: https://x.com/ethereumremix\n
   `

libs/remix-ui/home-tab/src/lib/components/homeTabTitle.tsx

@@ -47,7 +47,7 @@ const iconButtons: HometabIconSection[] = [
   {
     textToolip: <FormattedMessage id="home.joinUsOnDiscord" />,
     matomoTrackingEntry: ['trackEvent', 'hometab', 'titleCard', 'discord'],
-    urlLink: 'https://discord.gg/hEUgg24WhH',
+    urlLink: 'https://discord.gg/KhDtC8mGqx',
     iconClass: 'fa-discord',
     placement: 'top'
   }

libs/remix-ui/run-tab/src/lib/components/account.tsx

@@ -332,7 +332,7 @@ export function AccountUI(props: AccountProps) {
         <FormattedMessage id="udapp.enterAMessageToSign" />
         <textarea
           id="prompt_text"
-          className="bg-light text-light form-control"
+          className="bg-light form-control"
           data-id="signMessageTextarea"
           style={{ width: '100%' }}
           rows={4}

team-best-practices.md

@@ -20,7 +20,7 @@ Related links:
  - Remix-debug NPM module: https://www.npmjs.com/package/@remix-project/remix-debug
  - Remix-tests NPM module: https://www.npmjs.com/package/@remix-project/remix-tests
  - Remix documentation: http://remix-ide.readthedocs.io/en/latest/
- - Discord: https://discord.gg/hEUgg24WhH
+ - Discord: https://discord.gg/KhDtC8mGqx
 
 ---