Merge branch 'master' of https://github.com/ethereum/remix-project into fastcircle

pull/1754/head
bunsenstraat 3 years ago
commit 87ac3f1a71
  1. 26
      .circleci/config.yml
  2. 3
      .gitmodules
  3. 1
      apps/remix-ide/src/app/files/fileManager.js
  4. 4
      libs/remix-ui/tabs/.babelrc
  5. 1
      libs/remix-ui/tabs/react-tabs
  6. 2
      libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
  7. 4
      libs/remix-ui/workspace/src/lib/actions/events.ts

@ -118,8 +118,6 @@ jobs:
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm run selenium-install
- run:
name: Start Selenium
@ -157,8 +155,6 @@ jobs:
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm run selenium-install
- run:
name: Start Selenium
@ -196,8 +192,6 @@ jobs:
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm run selenium-install
- run:
name: Start Selenium
@ -235,8 +229,6 @@ jobs:
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm run selenium-install
- run:
name: Start Selenium
@ -274,8 +266,6 @@ jobs:
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm run selenium-install
- run:
name: Start Selenium
@ -318,8 +308,6 @@ jobs:
name: Start Selenium
command: npx selenium-standalone start
background: true
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: ./apps/remix-ide/ci/browser_tests_plugin_api.sh
- store_test_results:
path: ./reports/tests
@ -344,9 +332,7 @@ jobs:
steps:
- checkout
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: npm install
- run: npm run downloadsolc_assets
- run: npm run build:production
- run:
@ -374,8 +360,6 @@ jobs:
steps:
- checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- setup_remote_docker
- restore_cache:
keys:
@ -404,9 +388,7 @@ jobs:
steps:
- checkout
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: npm install
- run: npm run downloadsolc_assets
- run: npm run build:production
- run:
@ -434,9 +416,7 @@ jobs:
steps:
- checkout
- restore_cache:
keys:
- v1-deps-{{ checksum "package-lock.json" }}
- run: npm install
- run: npm run build:libs
- run: npm run downloadsolc_assets
- run: npm run build:production

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "libs/remix-ui/tabs/react-tabs"]
path = libs/remix-ui/tabs/react-tabs
url = https://github.com/reactjs/react-tabs

@ -141,6 +141,7 @@ class FileManager extends Plugin {
const provider = this.fileProviderOf('/')
// emit rootFolderChanged so that File Explorer reloads the file tree
provider.event.emit('rootFolderChanged', provider.workspace || '/')
this.emit('rootFolderChanged', provider.workspace || '/')
}
/**

@ -1,4 +1,4 @@
{
"presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]],
"plugins": ["@babel/plugin-proposal-class-properties"]
"presets": ["@nrwl/react/babel"],
"plugins": []
}

@ -1 +0,0 @@
Subproject commit 5a1fb0dc4b79f811e63e2f029786ff36b68bcbf4

@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint-disable-line
import { Tab, Tabs, TabList, TabPanel } from '../../react-tabs/src/index'
import { Tab, Tabs, TabList, TabPanel } from 'react-tabs'
import './remix-ui-tabs.css'
/* eslint-disable-next-line */

@ -41,6 +41,10 @@ export const listenOnPluginEvents = (filePanelPlugin) => {
plugin.on('remixd', 'rootFolderChanged', async (path: string) => {
rootFolderChanged(path)
})
plugin.on('fileManager', 'rootFolderChanged', async (path: string) => {
rootFolderChanged(path)
})
}
export const listenOnProviderEvents = (provider) => (reducerDispatch: React.Dispatch<any>) => {

Loading…
Cancel
Save