From 32fb0b973615a553191085ad45f8a570ec57a3e5 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Tue, 14 Feb 2023 09:25:13 +0100 Subject: [PATCH] update plugin --- .../locale-module/types/locale-module.ts | 2 +- .../run-tab/src/lib/types/run-tab.d.ts | 2 +- .../theme-module/types/theme-module.ts | 2 +- .../workspace/src/lib/actions/index.ts | 2 +- .../components/file-explorer-context-menu.tsx | 2 +- .../src/lib/components/file-explorer.tsx | 2 +- .../workspace/src/lib/contexts/index.ts | 2 +- .../src/lib/providers/FileSystemProvider.tsx | 2 +- .../remix-ui/workspace/src/lib/types/index.ts | 2 +- libs/remixd/package.json | 8 +- package.json | 14 ++-- yarn.lock | 84 +++++++++---------- 12 files changed, 62 insertions(+), 62 deletions(-) diff --git a/libs/remix-ui/locale-module/types/locale-module.ts b/libs/remix-ui/locale-module/types/locale-module.ts index f532e4d001..824f68147c 100644 --- a/libs/remix-ui/locale-module/types/locale-module.ts +++ b/libs/remix-ui/locale-module/types/locale-module.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { Plugin } from "@remixproject/engine/lib/abstract"; +import { Plugin } from "@remixproject/engine"; import { EventEmitter } from "events"; export interface LocaleModule extends Plugin { currentLocaleState: Record; diff --git a/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts b/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts index 62cbdb26f1..31314dd710 100644 --- a/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts +++ b/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts @@ -38,7 +38,7 @@ export class RunTab extends ViewPlugin { recorder: Recorder; // syncContracts(): void } -import { ViewPlugin } from "@remixproject/engine-web/lib/view"; +import { ViewPlugin } from "@remixproject/engine-web"; import { Blockchain } from "./blockchain"; import { RunTabState } from "../reducers/runTab"; import { Recorder } from "./recorder"; diff --git a/libs/remix-ui/theme-module/types/theme-module.ts b/libs/remix-ui/theme-module/types/theme-module.ts index bc3b903a42..ac0b5db7cb 100644 --- a/libs/remix-ui/theme-module/types/theme-module.ts +++ b/libs/remix-ui/theme-module/types/theme-module.ts @@ -1,4 +1,4 @@ -import { Plugin } from "@remixproject/engine/lib/abstract"; +import { Plugin } from "@remixproject/engine"; import { EventEmitter } from "events"; // eslint-disable-next-line @typescript-eslint/no-explicit-any export interface ThemeModule extends Plugin { diff --git a/libs/remix-ui/workspace/src/lib/actions/index.ts b/libs/remix-ui/workspace/src/lib/actions/index.ts index 52a127b74f..67f9c83f82 100644 --- a/libs/remix-ui/workspace/src/lib/actions/index.ts +++ b/libs/remix-ui/workspace/src/lib/actions/index.ts @@ -1,7 +1,7 @@ import React from 'react' import { extractNameFromKey, createNonClashingNameAsync } from '@remix-ui/helper' import Gists from 'gists' -import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel/type' +import { customAction } from '@remixproject/plugin-api' import { displayNotification, displayPopUp, fetchDirectoryError, fetchDirectoryRequest, fetchDirectorySuccess, focusElement, fsInitializationCompleted, hidePopUp, removeInputFieldSuccess, setCurrentWorkspace, setExpandPath, setMode, setWorkspaces } from './payload' import { listenOnPluginEvents, listenOnProviderEvents } from './events' import { createWorkspaceTemplate, getWorkspaces, loadWorkspacePreset, setPlugin, workspaceExists } from './workspace' diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx index 8119d75abf..689c537177 100644 --- a/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx +++ b/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx @@ -3,7 +3,7 @@ import { useIntl } from 'react-intl' import { action, FileExplorerContextMenuProps } from '../types' import '../css/file-explorer-context-menu.css' -import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel' +import { customAction } from '@remixproject/plugin-api' declare global { interface Window { diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx index 69183e0332..bb9b80ad68 100644 --- a/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx +++ b/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx @@ -3,7 +3,7 @@ import { TreeView, TreeViewItem } from '@remix-ui/tree-view' // eslint-disable-l import { FileExplorerMenu } from './file-explorer-menu' // eslint-disable-line import { FileExplorerContextMenu } from './file-explorer-context-menu' // eslint-disable-line import { FileExplorerProps, MenuItems, FileExplorerState } from '../types' -import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel' +import { customAction } from '@remixproject/plugin-api' import { contextMenuActions } from '../utils' import '../css/file-explorer.css' diff --git a/libs/remix-ui/workspace/src/lib/contexts/index.ts b/libs/remix-ui/workspace/src/lib/contexts/index.ts index c4b342d799..08c1fb7f41 100644 --- a/libs/remix-ui/workspace/src/lib/contexts/index.ts +++ b/libs/remix-ui/workspace/src/lib/contexts/index.ts @@ -1,4 +1,4 @@ -import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel/type' +import { customAction } from '@remixproject/plugin-api' import { createContext, SyntheticEvent } from 'react' import { BrowserState } from '../reducers/workspace' diff --git a/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx b/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx index e4bd835c23..b57b10aed0 100644 --- a/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx +++ b/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx @@ -13,7 +13,7 @@ import { initWorkspace, fetchDirectory, removeInputField, deleteWorkspace, delet import { Modal, WorkspaceProps, WorkspaceTemplate } from '../types' // eslint-disable-next-line @typescript-eslint/no-unused-vars import { Workspace } from '../remix-ui-workspace' -import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel/type' +import { customAction } from '@remixproject/plugin-api' export const FileSystemProvider = (props: WorkspaceProps) => { const { plugin } = props diff --git a/libs/remix-ui/workspace/src/lib/types/index.ts b/libs/remix-ui/workspace/src/lib/types/index.ts index 17fafc345a..d47150789f 100644 --- a/libs/remix-ui/workspace/src/lib/types/index.ts +++ b/libs/remix-ui/workspace/src/lib/types/index.ts @@ -1,6 +1,6 @@ /* eslint-disable @nrwl/nx/enforce-module-boundaries */ import React from 'react' -import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel' +import { customAction } from '@remixproject/plugin-api' import { fileDecoration } from '@remix-ui/file-decorators' import { RemixAppManager } from 'libs/remix-ui/plugin-manager/src/types' import { ViewPlugin } from '@remixproject/engine-web' diff --git a/libs/remixd/package.json b/libs/remixd/package.json index dbf2926dd7..e2378063bb 100644 --- a/libs/remixd/package.json +++ b/libs/remixd/package.json @@ -27,10 +27,10 @@ }, "homepage": "https://github.com/ethereum/remix-project#readme", "dependencies": { - "@remixproject/plugin": "^0.3.11", - "@remixproject/plugin-api": "^0.3.11", - "@remixproject/plugin-utils": "^0.3.11", - "@remixproject/plugin-ws": "^0.3.11", + "@remixproject/plugin": "0.3.32-alpha", + "@remixproject/plugin-api": "0.3.32-alpha", + "@remixproject/plugin-utils": "0.3.32-alpha", + "@remixproject/plugin-ws": "0.3.32-alpha", "axios": "1.1.2", "chokidar": "^2.1.8", "commander": "^9.4.1", diff --git a/package.json b/package.json index c8f7573a5a..469b9accc5 100644 --- a/package.json +++ b/package.json @@ -132,13 +132,13 @@ "@openzeppelin/contracts": "^4.7.3", "@openzeppelin/upgrades-core": "^1.22.0", "@openzeppelin/wizard": "^0.1.1", - "@remixproject/engine": "^0.3.31", - "@remixproject/engine-web": "^0.3.31", - "@remixproject/plugin": "^0.3.31", - "@remixproject/plugin-api": "^0.3.31", - "@remixproject/plugin-utils": "^0.3.31", - "@remixproject/plugin-webview": "^0.3.31", - "@remixproject/plugin-ws": "^0.3.31", + "@remixproject/engine": "0.3.32-alpha", + "@remixproject/engine-web": "0.3.32-alpha", + "@remixproject/plugin": "0.3.32-alpha", + "@remixproject/plugin-api": "0.3.32-alpha", + "@remixproject/plugin-utils": "0.3.32-alpha", + "@remixproject/plugin-webview": "0.3.32-alpha", + "@remixproject/plugin-ws": "0.3.32-alpha", "@types/nightwatch": "^2.3.1", "ansi-gray": "^0.1.1", "async": "^2.6.2", diff --git a/yarn.lock b/yarn.lock index fe1faee2d7..304eb373ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5323,63 +5323,63 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590" integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ== -"@remixproject/engine-web@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.31.tgz#42ee5c5d874ef9646090342ca8b430e3fe1046e8" - integrity sha512-GYeUB4Y0NaVc23mSmVByhx6pCvjzfz8iBbJCwaUB3q61uyRQ1wMM0P/47qqwZMukPi7x4bFUpN41C6rKq7ECug== +"@remixproject/engine-web@0.3.32-alpha": + version "0.3.32-alpha" + resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.32-alpha.tgz#d787302c0ebdf42420d794f117bcc758db8e8b66" + integrity sha512-Bi7OPmgT5i1pRMKOIWLJYM2M9XYFgpMWk0lUa49hyL3ZJ0kAQFWNCREdWyj04HOy/SUF4pc0JDIwhlogfeL6Cg== dependencies: - "@remixproject/engine" "0.3.31" - "@remixproject/plugin-api" "0.3.31" - "@remixproject/plugin-utils" "0.3.31" + "@remixproject/engine" "0.3.32-alpha" + "@remixproject/plugin-api" "0.3.32-alpha" + "@remixproject/plugin-utils" "0.3.32-alpha" -"@remixproject/engine@0.3.31", "@remixproject/engine@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.31.tgz#6dcc209dbd993646430335c9454ce1a739d1a45f" - integrity sha512-5VTl9bkeU3fd3IUV8wy7kXHMd3RfnUsf6dlmORM9Np1oMZ9nhdhUsyJO/qXyrvR1PbyJIxPz/qM4+W5MGvOrnQ== +"@remixproject/engine@0.3.32-alpha": + version "0.3.32-alpha" + resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.32-alpha.tgz#e085ea77d942ea363a9282a1eb53dae4b99d43f8" + integrity sha512-JPCKEmM8wt96JZpBrDhgLX6ytzRMVuyUpeLh5MwCsklaEk21QOqRKI2PYpD797DlsYYjys8YbMn0uI82AD+RoA== dependencies: - "@remixproject/plugin-api" "0.3.31" - "@remixproject/plugin-utils" "0.3.31" + "@remixproject/plugin-api" "0.3.32-alpha" + "@remixproject/plugin-utils" "0.3.32-alpha" -"@remixproject/plugin-api@0.3.31", "@remixproject/plugin-api@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.31.tgz#86e7c458c58ff200bd927fd3d642877f4b5a0013" - integrity sha512-LOJRHxORNp7zW8k7//DQz5aZ7eqB7TwhYXrvzqvaryDTvtvJGWrlTHg81hzALynaxZKEWneohxjUxKvGp/eA4g== +"@remixproject/plugin-api@0.3.32-alpha": + version "0.3.32-alpha" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.32-alpha.tgz#c47edf4942f2e7f36b7d066c9bd386e37cfa9d7d" + integrity sha512-MtF+piB/H5SUxiqbBe6JZP6cSvtLzGrjgHFnVH3MAnT7Vwl/Lofm3AyBZ60OPpVfOoEimsPJ6z8E64VxbKZiow== dependencies: - "@remixproject/plugin-utils" "0.3.31" + "@remixproject/plugin-utils" "0.3.32-alpha" -"@remixproject/plugin-utils@0.3.31", "@remixproject/plugin-utils@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.31.tgz#80771e00c1a1b776432abb17b1f4b2e25600d4f6" - integrity sha512-OOAjoSd+ErBMrcNQEh80NU3BjJ9fHXuftRfy5Ul9aGXN3b1LJSNVvfrG+FxX6lpyaAK5JBj+aB9pgFozgb2wlw== +"@remixproject/plugin-utils@0.3.32-alpha": + version "0.3.32-alpha" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.32-alpha.tgz#2a26ed6c7ce25d561ad4a5d1ca4e8992b0402610" + integrity sha512-/qp5Jx7cWYiyQfQI/4r/rsMCu1cXFSqK0YEjwpRvrJluirkRVw/UJ8vY4Y4BD6Szyzv27sTCOw5Rf0teBzbyJA== dependencies: tslib "2.0.1" -"@remixproject/plugin-webview@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.31.tgz#e5cce7d0089439b35aee4ab2a724add1e5d36b40" - integrity sha512-8yoKwIkRi9S+rqvFShNt01FfXX0H/Fijn7UkWFWJ/V6ULcw2cw9ViCz8cYZLhNUpxqezyu/LKDQL9g1TbJJoYw== +"@remixproject/plugin-webview@0.3.32-alpha": + version "0.3.32-alpha" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.32-alpha.tgz#77d558d42b54026dddb0ec9f42cc9c327807350c" + integrity sha512-0HaRG45PUJySYsJ/kal6qB5yF3mWX13MoZhhjybRIT/y2dlvBv2UpmxSIibwohTImhfZRIY+zHK2UD/ZHXl9zw== dependencies: - "@remixproject/plugin" "0.3.31" - "@remixproject/plugin-api" "0.3.31" - "@remixproject/plugin-utils" "0.3.31" + "@remixproject/plugin" "0.3.32-alpha" + "@remixproject/plugin-api" "0.3.32-alpha" + "@remixproject/plugin-utils" "0.3.32-alpha" axios "^0.21.1" -"@remixproject/plugin-ws@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.31.tgz#a2bb415cc32a5b036b9b3759520088b8ceaa0d5a" - integrity sha512-Z4G6vkGxxCP+ibGNHAvNaFjYE4hbsazOEL50pMnda6LZNci9akMSiI/1MIZscVSMU8l2sYOoNUsWvLfLkIkYKQ== +"@remixproject/plugin-ws@0.3.32-alpha": + version "0.3.32-alpha" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.32-alpha.tgz#5af65b5a5fd47ac89e7d8ae8f75f324ea3c039f4" + integrity sha512-trrLErRZX6IqrwP3skiiPp9nmc++/H7eU7lRKieDLllqaA9i0si+lsFIaAw47CxWvPO/tW8L46+VGH6pi0B6Ew== dependencies: - "@remixproject/plugin" "0.3.31" - "@remixproject/plugin-api" "0.3.31" - "@remixproject/plugin-utils" "0.3.31" + "@remixproject/plugin" "0.3.32-alpha" + "@remixproject/plugin-api" "0.3.32-alpha" + "@remixproject/plugin-utils" "0.3.32-alpha" -"@remixproject/plugin@0.3.31", "@remixproject/plugin@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.31.tgz#b6c6b58d2c7964e37024eeca4819c70ece1f3953" - integrity sha512-9ntMU9CzStloahm/wXt4V8n64ERgJzY5nG0bzQfjnI12knrdTmUo+LC42M2xaTBDDP9CzMPdqClg7XhhRLzohA== +"@remixproject/plugin@0.3.32-alpha": + version "0.3.32-alpha" + resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.32-alpha.tgz#726ee1c795edfd73da639db8a6cdfbfbf8b46264" + integrity sha512-uVeAlxWFwLovBK1u0SUSsIgZP2NU8VO2oYCPyC3PrpCjOMg1q9oxXmrmMs1P26ty46kaJ+Pz4++D/mga2RLzHg== dependencies: - "@remixproject/plugin-api" "0.3.31" - "@remixproject/plugin-utils" "0.3.31" + "@remixproject/plugin-api" "0.3.32-alpha" + "@remixproject/plugin-utils" "0.3.32-alpha" events "3.2.0" "@restart/context@^2.1.4":