From 202fc49e3fbb2c1c17b9d92ea45c1a2579b8b4c6 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 16 Feb 2023 13:07:22 +0100 Subject: [PATCH 1/2] move the mixins --- apps/debugger/src/app/debugger.ts | 2 +- apps/debugger/src/index.ts | 1 - apps/remix-ide/src/app/tabs/compile-tab.js | 2 +- apps/remix-ide/src/app/tabs/debugger-tab.js | 2 +- apps/solidity-compiler/src/app/compiler.ts | 2 +- libs/remix-ui/debugger-ui/src/index.ts | 1 + .../remix-ui/debugger-ui/src/lib/api}/debugger-api.ts | 0 libs/remix-ui/solidity-compiler/src/index.ts | 1 + .../remix-ui/solidity-compiler/src/lib/api}/compiler-api.ts | 0 yarn.lock | 4 ++-- 10 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 apps/debugger/src/index.ts rename {apps/debugger/src/app => libs/remix-ui/debugger-ui/src/lib/api}/debugger-api.ts (100%) rename {apps/solidity-compiler/src/app => libs/remix-ui/solidity-compiler/src/lib/api}/compiler-api.ts (100%) diff --git a/apps/debugger/src/app/debugger.ts b/apps/debugger/src/app/debugger.ts index fb8f769c19..28e9703470 100644 --- a/apps/debugger/src/app/debugger.ts +++ b/apps/debugger/src/app/debugger.ts @@ -2,7 +2,7 @@ import { PluginClient } from "@remixproject/plugin"; import { createClient } from "@remixproject/plugin-webview"; import { IDebuggerApi, LineColumnLocation, onBreakpointClearedListener, onBreakpointAddedListener, onEditorContentChanged, onEnvChangedListener, TransactionReceipt } from '@remix-ui/debugger-ui' -import { DebuggerApiMixin } from './debugger-api' +import { DebuggerApiMixin } from '@remix-ui/debugger-ui' import { CompilerAbstract } from '@remix-project/remix-solidity' export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) { diff --git a/apps/debugger/src/index.ts b/apps/debugger/src/index.ts deleted file mode 100644 index b38e3a7942..0000000000 --- a/apps/debugger/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './app/debugger-api'; diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index 1c66b1db7a..a43e71ca4b 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/apps/remix-ide/src/app/tabs/compile-tab.js @@ -2,7 +2,7 @@ import React from 'react' // eslint-disable-line import { SolidityCompiler } from '@remix-ui/solidity-compiler' // eslint-disable-line import { CompileTabLogic } from '@remix-ui/solidity-compiler' // eslint-disable-line -import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin' // eslint-disable-line +import { CompilerApiMixin } from '@remix-ui/solidity-compiler' import { ViewPlugin } from '@remixproject/engine-web' import { QueryParams } from '@remix-project/remix-lib' // import { ICompilerApi } from '@remix-project/remix-lib' diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js index 8d357acc65..9e58b1cbf0 100644 --- a/apps/remix-ide/src/app/tabs/debugger-tab.js +++ b/apps/remix-ide/src/app/tabs/debugger-tab.js @@ -1,6 +1,6 @@ import Web3 from 'web3' import { DebuggerUI } from '@remix-ui/debugger-ui' // eslint-disable-line -import { DebuggerApiMixin } from '@remixproject/debugger-plugin' // eslint-disable-line +import { DebuggerApiMixin } from '@remix-ui/debugger-ui' import { ViewPlugin } from '@remixproject/engine-web' import * as packageJson from '../../../../../package.json' import React from 'react' // eslint-disable-line diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts index aa04950e0c..01543be995 100644 --- a/apps/solidity-compiler/src/app/compiler.ts +++ b/apps/solidity-compiler/src/app/compiler.ts @@ -2,7 +2,7 @@ /* eslint-disable no-unused-vars */ import { PluginClient } from '@remixproject/plugin' import { createClient } from '@remixproject/plugin-webview' -import { CompilerApiMixin } from './compiler-api' +import { CompilerApiMixin } from '@remix-ui/solidity-compiler' import { ICompilerApi } from '@remix-project/remix-lib' import { CompileTabLogic } from '@remix-ui/solidity-compiler' diff --git a/libs/remix-ui/debugger-ui/src/index.ts b/libs/remix-ui/debugger-ui/src/index.ts index 840763d2ef..384ae40ad7 100644 --- a/libs/remix-ui/debugger-ui/src/index.ts +++ b/libs/remix-ui/debugger-ui/src/index.ts @@ -1,2 +1,3 @@ export * from './lib/debugger-ui' export * from './lib/idebugger-api' +export * from './lib/api/debugger-api' diff --git a/apps/debugger/src/app/debugger-api.ts b/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts similarity index 100% rename from apps/debugger/src/app/debugger-api.ts rename to libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts diff --git a/libs/remix-ui/solidity-compiler/src/index.ts b/libs/remix-ui/solidity-compiler/src/index.ts index fe6611e472..386d3792be 100644 --- a/libs/remix-ui/solidity-compiler/src/index.ts +++ b/libs/remix-ui/solidity-compiler/src/index.ts @@ -1,3 +1,4 @@ export * from './lib/solidity-compiler' export * from './lib/logic' export * from './lib/logic/flattenerUtilities' +export * from './lib/api/compiler-api' \ No newline at end of file diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts similarity index 100% rename from apps/solidity-compiler/src/app/compiler-api.ts rename to libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts diff --git a/yarn.lock b/yarn.lock index 3f5d6a2006..5cd08a7c61 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2883,7 +2883,7 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/providers@5.7.2": +"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1": version "5.7.2" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg== @@ -12293,7 +12293,7 @@ ethers@^5.4.2: "@ethersproject/web" "5.5.0" "@ethersproject/wordlists" "5.5.0" -ethers@^5.7.2: +ethers@^5.7.1, ethers@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== From 3d16bf78c2d0783d817212af3f3989b5a7092b6f Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 16 Feb 2023 13:18:15 +0100 Subject: [PATCH 2/2] rm index --- apps/solidity-compiler/src/index.ts | 1 - 1 file changed, 1 deletion(-) delete mode 100644 apps/solidity-compiler/src/index.ts diff --git a/apps/solidity-compiler/src/index.ts b/apps/solidity-compiler/src/index.ts deleted file mode 100644 index f92deb7aa4..0000000000 --- a/apps/solidity-compiler/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './app/compiler-api'