From 9a5d22abc7e1369c6b898885dd2b524d84381e1f Mon Sep 17 00:00:00 2001 From: filip mertens Date: Mon, 23 Oct 2023 08:54:49 +0200 Subject: [PATCH] merge test --- apps/remix-ide/src/app.js | 28 ----- .../app/src/lib/remix-app/remix-app.tsx | 2 +- package.json | 16 +-- yarn.lock | 115 ++++++++++-------- 4 files changed, 77 insertions(+), 84 deletions(-) diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 1fd677bdd8..3458f83bd8 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -51,32 +51,6 @@ import { isoGitPlugin } from './app/plugins/electron/isoGitPlugin' import { electronConfig } from './app/plugins/electron/electronConfigPlugin' import { electronTemplates } from './app/plugins/electron/templatesPlugin' import { xtermPlugin } from './app/plugins/electron/xtermPlugin' - - -import {ConfigPlugin} from './app/plugins/config' -import {StoragePlugin} from './app/plugins/storage' -import {Layout} from './app/panels/layout' -import {NotificationPlugin} from './app/plugins/notification' -import {Blockchain} from './blockchain/blockchain' -import {MergeVMProvider, LondonVMProvider, BerlinVMProvider, ShanghaiVMProvider} from './app/providers/vm-provider' -import {MainnetForkVMProvider} from './app/providers/mainnet-vm-fork-provider' -import {SepoliaForkVMProvider} from './app/providers/sepolia-vm-fork-provider' -import {GoerliForkVMProvider} from './app/providers/goerli-vm-fork-provider' -import {CustomForkVMProvider} from './app/providers/custom-vm-fork-provider' -import {HardhatProvider} from './app/providers/hardhat-provider' -import {GanacheProvider} from './app/providers/ganache-provider' -import {FoundryProvider} from './app/providers/foundry-provider' -import {ExternalHttpProvider} from './app/providers/external-http-provider' -import {InjectedProviderDefault} from './app/providers/injected-provider-default' -import {InjectedProviderTrustWallet} from './app/providers/injected-provider-trustwallet' -import {Injected0ptimismProvider} from './app/providers/injected-optimism-provider' -import {InjectedArbitrumOneProvider} from './app/providers/injected-arbitrum-one-provider' -import {InjectedEphemeryTestnetProvider} from './app/providers/injected-ephemery-testnet-provider' -import {InjectedSKALEChaosTestnetProvider} from './app/providers/injected-skale-chaos-testnet-provider' -import {FileDecorator} from './app/plugins/file-decorator' -import {CodeFormat} from './app/plugins/code-format' -import {SolidityUmlGen} from './app/plugins/solidity-umlgen' -import {ContractFlattener} from './app/plugins/contractFlattener' import {OpenAIGpt} from './app/plugins/openaigpt' const isElectron = require('is-electron') @@ -86,8 +60,6 @@ const remixLib = require('@remix-project/remix-lib') import { QueryParams } from '@remix-project/remix-lib' import { SearchPlugin } from './app/tabs/search' import { ElectronProvider } from './app/files/electronProvider' -import {QueryParams} from '@remix-project/remix-lib' -import {SearchPlugin} from './app/tabs/search' const Storage = remixLib.Storage const RemixDProvider = require('./app/files/remixDProvider') diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx index fff40c6683..2ad2e8e96e 100644 --- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx @@ -8,7 +8,7 @@ import {AppProvider} from './context/provider' import AppDialogs from './components/modals/dialogs' import DialogViewPlugin from './components/modals/dialogViewPlugin' import { AppContext } from './context/context' -import { IntlProvider } from 'react-intl' +import { FormattedMessage, IntlProvider } from 'react-intl' import { CustomTooltip } from '@remix-ui/helper'; import { RemixUiXterminals } from '@remix-ui/xterm' diff --git a/package.json b/package.json index 2e02af14d4..e3a279f2fa 100644 --- a/package.json +++ b/package.json @@ -133,13 +133,15 @@ "@openzeppelin/contracts": "^5.0.0", "@openzeppelin/upgrades-core": "^1.30.0", "@openzeppelin/wizard": "0.4.0", - "@remixproject/engine": "0.3.33", - "@remixproject/engine-web": "0.3.33", - "@remixproject/plugin": "0.3.33", - "@remixproject/plugin-api": "0.3.33", - "@remixproject/plugin-utils": "0.3.33", - "@remixproject/plugin-webview": "0.3.33", - "@remixproject/plugin-ws": "0.3.33", + "@remixproject/engine": "0.3.37", + "@remixproject/engine-electron": "0.3.37", + "@remixproject/engine-web": "0.3.37", + "@remixproject/plugin": "0.3.37", + "@remixproject/plugin-api": "0.3.37", + "@remixproject/plugin-electron": "0.3.37", + "@remixproject/plugin-utils": "0.3.37", + "@remixproject/plugin-webview": "0.3.37", + "@remixproject/plugin-ws": "0.3.37", "@types/nightwatch": "^2.3.1", "@web3modal/ethereum": "^2.7.1", "@web3modal/react": "^2.6.2", diff --git a/yarn.lock b/yarn.lock index 90ac50cdec..fd1bcda35e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5169,63 +5169,82 @@ unbzip2-stream "1.4.3" yargs "17.7.1" -"@remixproject/engine-web@0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.33.tgz#2a444c327cca5bd54bb1e12e2a937c24dde8703f" - integrity sha512-YP62Cy6LSYiSw7Aon8ukS/Ut+fX34NIvRPPaJNq0r8F3IgB9vXAuKgOLs5QoIbrDJNb0ddM+0L2sIDWiNN1RtQ== - dependencies: - "@remixproject/engine" "0.3.33" - "@remixproject/plugin-api" "0.3.33" - "@remixproject/plugin-utils" "0.3.33" - -"@remixproject/engine@0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.33.tgz#c3f15e5eefbd7bc04dda7aee776fa3f3ad460703" - integrity sha512-IoWIERfoT407nYcXPJZR03LOBXA3cbAxFXvhmxYrUh658jumljxTwH+SIAbIGew/kKtu0TXyTOr8RBaOb1cEog== - dependencies: - "@remixproject/plugin-api" "0.3.33" - "@remixproject/plugin-utils" "0.3.33" - -"@remixproject/plugin-api@0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.33.tgz#29699f980ea00bebf720961cc0e78887e03903ec" - integrity sha512-fBEbRr6/mgQdfNdRqYQL3yewsPfTxV41F509CngbD6YdY5YKBihJhfGFHbd2rKSyXOgBiHIbe0SsV3OXpFdWnw== - dependencies: - "@remixproject/plugin-utils" "0.3.33" - -"@remixproject/plugin-utils@0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.33.tgz#7b697403031598276baaf16bb82d6c62062053fc" - integrity sha512-cAo21ot4/G5BkN8ypDwg8MMCrEmLdXwMd3lQZUeB5enPC3KxmzQz71+OgEYl718Hwy+GtHaLq17FEXCHC5YV9w== +"@remixproject/engine-electron@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/engine-electron/-/engine-electron-0.3.37.tgz#5e14bcf08201603cfccff0761d6f8612b1f3d62f" + integrity sha512-XQea0a5SPtYtOl1XH8qu9AN+Fkc/LSZ8FYuxenFUeczqy9t4gxlPibLrCQXSlrcNEdoGhDE/DW/wltQoX8JLtg== + dependencies: + "@remixproject/engine" "0.3.37" + "@remixproject/plugin-api" "0.3.37" + "@remixproject/plugin-utils" "0.3.37" + +"@remixproject/engine-web@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.37.tgz#cb9e09a135f9083202207039b2f5104278d4db1b" + integrity sha512-9FcJOm5xMOta5DE/JVMu2TnGcJpoe6MagG/NC89QrxJq8mCQSDgiFeSfqJhgFXye/hjlCmaO96aLgXIeoXMhWQ== + dependencies: + "@remixproject/engine" "0.3.37" + "@remixproject/plugin-api" "0.3.37" + "@remixproject/plugin-utils" "0.3.37" + +"@remixproject/engine@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.37.tgz#995abd53c505f6f37eaa6550d81ec36f2e60d106" + integrity sha512-+dO32Bdgm2GLlamCnCWIPYX0v57Ft2vWGkFwXil1xiLvPttVOjnSPkqz9Xu0DAqDIqXIr4A15E2pHklVR+shLQ== + dependencies: + "@remixproject/plugin-api" "0.3.37" + "@remixproject/plugin-utils" "0.3.37" + +"@remixproject/plugin-api@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.37.tgz#2b5c628f81632bb0063e4c6afbce62085d20e883" + integrity sha512-bJ8oIpaI4qP3/Ku7jxXW3XRkTyQ2hjWX6N8yob3d/jjHtaJ/IorDx/vieGXQoJTPKAMPol0KVKCVCxx+xmzcUQ== + dependencies: + "@remixproject/plugin-utils" "0.3.37" + +"@remixproject/plugin-electron@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-electron/-/plugin-electron-0.3.37.tgz#e850b6aae55af1e7b0cd74f4583e8eeb946735ce" + integrity sha512-ZmkYLk9LEewPCqXIiMPJC8ZpgRjMW3dh2LbgeSGhKG0ly8pD5VuZj3/07iP/ZvjDNuTliX08gqvCru9/oOskqA== + dependencies: + "@remixproject/engine" "0.3.37" + "@remixproject/plugin" "0.3.37" + "@remixproject/plugin-api" "0.3.37" + "@remixproject/plugin-utils" "0.3.37" + +"@remixproject/plugin-utils@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.37.tgz#7068523398164976c2470f55837e93c6fa210489" + integrity sha512-Ow4gFf15ym7Sysza4hx4+QEYQHvluu0pDEj3GlNAMWAbvbjBGxb7O81b3Tvu7n8ywESYJlbIifNr++vYY63+PQ== dependencies: tslib "2.0.1" -"@remixproject/plugin-webview@0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.33.tgz#97393ee1c9511009f5f299698987e29f946c106b" - integrity sha512-cMwpRzgL7rfTQKlLuTuyYyFvo4hiZ6nsDX9FfLRjGJpgCDUsSmOA0JvGv+/GsyZvpSo4FXL/0TQKTgm0t78Ocg== +"@remixproject/plugin-webview@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.37.tgz#b38882fc8f05ba22405c0baa4bef9662652fec1a" + integrity sha512-LeKS05MXnVUM4xS9IUmKBE5HJzs3L5hvuqWcRosB6ASbhzzFu4h7zeDtBbjSK46dL6/3Ym/dDqdJM9e6I+Gltw== dependencies: - "@remixproject/plugin" "0.3.33" - "@remixproject/plugin-api" "0.3.33" - "@remixproject/plugin-utils" "0.3.33" + "@remixproject/plugin" "0.3.37" + "@remixproject/plugin-api" "0.3.37" + "@remixproject/plugin-utils" "0.3.37" axios "^0.21.1" -"@remixproject/plugin-ws@0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.33.tgz#98a003e83ffafb5a7a35ca4e8c59d849ecb017cf" - integrity sha512-Zkp8MK8jxnNm3uruu0dF8vqeh90JsLXttJP4LZF0HaStRRK4d2XG6CgE5mBiC2J4uTEwGP26H/vmqi+POBPTEg== +"@remixproject/plugin-ws@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.37.tgz#1f29d037a1743eb8b3da438f8a9dbdb3d322b9a4" + integrity sha512-fjGBrj3qP0UnraiG/opzMySxk0SdfABrx1PuM8f3c3tmZDdjTrVcsJ11NlNNvztOPkyY5fL4e2gXDUkpELKztg== dependencies: - "@remixproject/plugin" "0.3.33" - "@remixproject/plugin-api" "0.3.33" - "@remixproject/plugin-utils" "0.3.33" + "@remixproject/plugin" "0.3.37" + "@remixproject/plugin-api" "0.3.37" + "@remixproject/plugin-utils" "0.3.37" -"@remixproject/plugin@0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.33.tgz#2939cdb6a1231743d7f00c10f5ea47eddd49b602" - integrity sha512-ia6LevsWYPkcRwOBl3umA2fPCgYt2TmB437Pafs9BE6fD9judEvlvEqXjBy9GLBsZzZWSiyYenOnW8HIiwqfMA== +"@remixproject/plugin@0.3.37": + version "0.3.37" + resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.37.tgz#d7b41a7fd03d712717eeb44526399e6c6ce6647c" + integrity sha512-3DgGCPE78ThfqGUJlrWwdArRol2nLZMBHTZpPxLE9K4tpspY7G1KV8HLB55mkX/uPVvVbNTRoFI4TNm87Jjiwg== dependencies: - "@remixproject/plugin-api" "0.3.33" - "@remixproject/plugin-utils" "0.3.33" + "@remixproject/plugin-api" "0.3.37" + "@remixproject/plugin-utils" "0.3.37" events "3.2.0" "@restart/context@^2.1.4":