From e99e90eefa0f127e10492fb5ed983d49ab08ab0e Mon Sep 17 00:00:00 2001 From: filip mertens Date: Tue, 29 Nov 2022 09:25:03 +0100 Subject: [PATCH] rm ts extension --- .../plugins/parser/services/code-parser-antlr-service.ts | 2 +- .../src/app/plugins/parser/services/code-parser-compiler.ts | 2 +- apps/remix-ide/src/app/tabs/compile-tab.js | 2 +- apps/solidity-compiler/src/app/compiler-api.ts | 2 +- apps/solidity-compiler/src/app/compiler.ts | 2 +- libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts | 2 +- .../remix-ui/editor/src/lib/providers/completionProvider.ts | 2 +- libs/remix-ui/run-tab/src/lib/actions/deploy.ts | 2 +- libs/remix-ui/run-tab/src/lib/actions/index.ts | 2 +- libs/remix-ui/run-tab/src/lib/reducers/runTab.ts | 2 +- libs/remix-ui/run-tab/src/lib/types/index.ts | 2 +- .../solidity-compiler/src/lib/compiler-container.tsx | 2 +- .../solidity-compiler/src/lib/logic/compileTabLogic.ts | 2 +- libs/remix-ui/solidity-compiler/src/lib/types/index.ts | 2 +- tsconfig.paths.json | 6 ------ 15 files changed, 14 insertions(+), 20 deletions(-) diff --git a/apps/remix-ide/src/app/plugins/parser/services/code-parser-antlr-service.ts b/apps/remix-ide/src/app/plugins/parser/services/code-parser-antlr-service.ts index 4363a1d6ed..ee28b2cc1b 100644 --- a/apps/remix-ide/src/app/plugins/parser/services/code-parser-antlr-service.ts +++ b/apps/remix-ide/src/app/plugins/parser/services/code-parser-antlr-service.ts @@ -1,6 +1,6 @@ 'use strict' -import { AstNode } from "@remix-project/remix-solidity-ts" +import { AstNode } from "@remix-project/remix-solidity" import { CodeParser } from "../code-parser" import { antlr } from '../types' import { pathToFileURL } from 'url' diff --git a/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts b/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts index 17122778f2..8ea51b2ce1 100644 --- a/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts +++ b/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts @@ -6,7 +6,7 @@ import { CompilationResult, CompilationSource } from '@remix-project/remix-solid import { CodeParser } from "../code-parser"; import { fileDecoration, fileDecorationType } from '@remix-ui/file-decorators' import { sourceMappingDecoder } from '@remix-project/remix-debug' -import { CompilerRetriggerMode, CompilationSourceCode } from '@remix-project/remix-solidity-ts'; +import { CompilerRetriggerMode, CompilationSourceCode } from '@remix-project/remix-solidity'; import { MarkerSeverity } from 'monaco-editor'; import { findLinesInStringWithMatch, SearchResultLine } from '@remix-ui/search' import { lastCompilationResult } from '@remixproject/plugin-api'; diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index 04e33277e0..1c66b1db7a 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/apps/remix-ide/src/app/tabs/compile-tab.js @@ -5,7 +5,7 @@ import { CompileTabLogic } from '@remix-ui/solidity-compiler' // eslint-disable- import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin' // eslint-disable-line import { ViewPlugin } from '@remixproject/engine-web' import { QueryParams } from '@remix-project/remix-lib' -// import { ICompilerApi } from '@remix-project/remix-lib-ts' +// import { ICompilerApi } from '@remix-project/remix-lib' import * as packageJson from '../../../../../package.json' import { compilerConfigChangedToastMsg, compileToastMsg } from '@remix-ui/helper' import { isNative } from '../../remixAppManager' diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts index 12307bffc5..62853189fa 100644 --- a/apps/solidity-compiler/src/app/compiler-api.ts +++ b/apps/solidity-compiler/src/app/compiler-api.ts @@ -1,7 +1,7 @@ import React from 'react'; import { compile, helper } from '@remix-project/remix-solidity' import { CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line -import type { ConfigurationSettings } from '@remix-project/remix-lib-ts' +import type { ConfigurationSettings } from '@remix-project/remix-lib' export const CompilerApiMixin = (Base) => class extends Base { currentFile: string diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts index d0e71a7270..0e5c67678c 100644 --- a/apps/solidity-compiler/src/app/compiler.ts +++ b/apps/solidity-compiler/src/app/compiler.ts @@ -3,7 +3,7 @@ import { PluginClient } from '@remixproject/plugin' import { createClient } from '@remixproject/plugin-webview' import { CompilerApiMixin } from './compiler-api' -import { ICompilerApi } from '@remix-project/remix-lib-ts' +import { ICompilerApi } from '@remix-project/remix-lib' import { CompileTabLogic } from '@remix-ui/solidity-compiler' const defaultCompilerParameters = { diff --git a/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts b/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts index 1b0d19c3d4..202ed6f056 100644 --- a/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts +++ b/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts @@ -1,5 +1,5 @@ -import type { CompilationSource, CompilerAbstract, SourcesCode } from '@remix-project/remix-solidity-ts' // eslint-disable-line +import type { CompilationSource, CompilerAbstract, SourcesCode } from '@remix-project/remix-solidity' // eslint-disable-line export interface LineColumnLocation { start: { diff --git a/libs/remix-ui/editor/src/lib/providers/completionProvider.ts b/libs/remix-ui/editor/src/lib/providers/completionProvider.ts index b57bada936..93d259b236 100644 --- a/libs/remix-ui/editor/src/lib/providers/completionProvider.ts +++ b/libs/remix-ui/editor/src/lib/providers/completionProvider.ts @@ -1,4 +1,4 @@ -import { AstNode } from "@remix-project/remix-solidity-ts" +import { AstNode } from "@remix-project/remix-solidity" import { isArray } from "lodash" import { editor, languages, Position } from "monaco-editor" import monaco from "../../types/monaco" diff --git a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts index 9c2475ff47..1f90827da1 100644 --- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts +++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts @@ -1,6 +1,6 @@ import { ContractData, FuncABI } from "@remix-project/core-plugin" import { RunTab } from "../types/run-tab" -import { CompilerAbstract as CompilerAbstractType } from '@remix-project/remix-solidity-ts' +import { CompilerAbstract as CompilerAbstractType } from '@remix-project/remix-solidity' import * as remixLib from '@remix-project/remix-lib' import { DeployMode, MainnetPrompt } from "../types" import { displayNotification, displayPopUp, setDecodedResponse } from "./payload" diff --git a/libs/remix-ui/run-tab/src/lib/actions/index.ts b/libs/remix-ui/run-tab/src/lib/actions/index.ts index 9a082d0146..6fd0182d8e 100644 --- a/libs/remix-ui/run-tab/src/lib/actions/index.ts +++ b/libs/remix-ui/run-tab/src/lib/actions/index.ts @@ -7,7 +7,7 @@ import { clearInstances, clearPopUp, removeInstance, setAccount, setGasFee, setM setNetworkNameFromProvider, setPassphrasePrompt, setSelectedContract, setSendTransactionValue, setUnit, updateBaseFeePerGas, updateConfirmSettings, updateGasPrice, updateGasPriceStatus, updateMaxFee, updateMaxPriorityFee, updateScenarioPath } from './actions' import { createInstance, getContext, getFuncABIInputs, getSelectedContract, loadAddress, runTransactions, updateInstanceBalance, syncContractsInternal, isValidContractAddress } from './deploy' -import { CompilerAbstract as CompilerAbstractType } from '@remix-project/remix-solidity-ts' +import { CompilerAbstract as CompilerAbstractType } from '@remix-project/remix-solidity' import { ContractData, FuncABI } from "@remix-project/core-plugin" import { DeployMode, MainnetPrompt } from '../types' import { runCurrentScenario, storeScenario } from './recorder' diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts index 4e28130f0c..3ee59195be 100644 --- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts +++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts @@ -1,4 +1,4 @@ -import { CompilerAbstract } from '@remix-project/remix-solidity-ts' +import { CompilerAbstract } from '@remix-project/remix-solidity' import { ContractData } from '@remix-project/core-plugin' import { DeployOptions } from '../types' import { ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_PROXY_ENV_ADDRESS, ADD_DEPLOY_OPTION, REMOVE_DEPLOY_OPTION, SET_REMIXD_ACTIVATED } from '../constants' diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts index 0376fc2163..e904a0d987 100644 --- a/libs/remix-ui/run-tab/src/lib/types/index.ts +++ b/libs/remix-ui/run-tab/src/lib/types/index.ts @@ -1,5 +1,5 @@ import { Ref } from 'react' -import { CompilerAbstract } from '@remix-project/remix-solidity-ts' +import { CompilerAbstract } from '@remix-project/remix-solidity' import { ContractData, FuncABI } from '@remix-project/core-plugin' import { ContractList } from '../reducers/runTab' import { RunTab } from './run-tab' diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index bc5fad18c8..d810daeb5b 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState, useRef, useReducer } from 'react' // eslint import { FormattedMessage, useIntl } from 'react-intl' import semver from 'semver' import { CompilerContainerProps } from './types' -import { ConfigurationSettings } from '@remix-project/remix-lib-ts' +import { ConfigurationSettings } from '@remix-project/remix-lib' import { checkSpecialChars, CustomTooltip, extractNameFromKey } from '@remix-ui/helper' import { canUseWorker, baseURLBin, baseURLWasm, urlFromVersion, pathToURL } from '@remix-project/remix-solidity' diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts index 0ddc745af2..e938bedcbc 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -1,4 +1,4 @@ -import { ICompilerApi } from '@remix-project/remix-lib-ts' +import { ICompilerApi } from '@remix-project/remix-lib' import { getValidLanguage, Compiler} from '@remix-project/remix-solidity' import { EventEmitter } from 'events' diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts index 096cc1d277..8897fb1653 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts @@ -1,4 +1,4 @@ -import { ICompilerApi, ConfigurationSettings } from '@remix-project/remix-lib-ts' +import { ICompilerApi, ConfigurationSettings } from '@remix-project/remix-lib' import { CompileTabLogic } from '../logic/compileTabLogic' export type onCurrentFileChanged = (fileName: string) => void diff --git a/tsconfig.paths.json b/tsconfig.paths.json index b7c36a4531..88d06365a1 100644 --- a/tsconfig.paths.json +++ b/tsconfig.paths.json @@ -16,9 +16,6 @@ "@remix-project/remix-lib": [ "libs/remix-lib/src/index.ts" ], - "@remix-project/remix-lib-ts": [ - "libs/remix-lib/src/index.ts" - ], "@remix-project/remix-niks": [ "libs/remix-niks/src/index.ts" ], @@ -31,9 +28,6 @@ "@remix-project/remix-solidity": [ "libs/remix-solidity/src/index" ], - "@remix-project/remix-solidity-ts": [ - "libs/remix-solidity/src/index.ts" - ], "@remix-project/remix-tests": [ "libs/remix-tests/src/index.ts" ],