Merge branch 'master' into fixrefresh

pull/5370/head
bunsenstraat 3 years ago committed by GitHub
commit 1a4d8427e4
  1. 20
      .circleci/config.yml
  2. 3
      .gitmodules
  3. 4
      libs/remix-ui/tabs/.babelrc
  4. 1
      libs/remix-ui/tabs/react-tabs
  5. 2
      libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx

@ -72,8 +72,6 @@ jobs:
parallelism: 12 parallelism: 12
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npx nx build remix-ide --with-deps - run: npx nx build remix-ide --with-deps
- run: - run:
@ -107,8 +105,6 @@ jobs:
parallelism: 12 parallelism: 12
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npm run downloadsolc_assets - run: npm run downloadsolc_assets
- run: npx nx build remix-ide --with-deps - run: npx nx build remix-ide --with-deps
@ -143,8 +139,6 @@ jobs:
parallelism: 12 parallelism: 12
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npx nx build remix-ide --with-deps - run: npx nx build remix-ide --with-deps
- run: - run:
@ -178,8 +172,6 @@ jobs:
parallelism: 12 parallelism: 12
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npm run downloadsolc_assets - run: npm run downloadsolc_assets
- run: npx nx build remix-ide --with-deps - run: npx nx build remix-ide --with-deps
@ -214,8 +206,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npx nx build remix-ide --with-deps - run: npx nx build remix-ide --with-deps
- run: - run:
@ -249,8 +239,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npx nx build remix-ide --with-deps - run: npx nx build remix-ide --with-deps
- run: npx nx build remix-ide-e2e-src-local-plugin - run: npx nx build remix-ide-e2e-src-local-plugin
@ -285,8 +273,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npm run downloadsolc_assets - run: npm run downloadsolc_assets
- run: npm run build:production - run: npm run build:production
@ -315,8 +301,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- setup_remote_docker - setup_remote_docker
- run: npm install - run: npm install
- run: npm run downloadsolc_assets - run: npm run downloadsolc_assets
@ -343,8 +327,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npm run downloadsolc_assets - run: npm run downloadsolc_assets
- run: npm run build:production - run: npm run build:production
@ -373,8 +355,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: git submodule sync --recursive
- run: git submodule update --recursive --init
- run: npm install - run: npm install
- run: npm run build:libs - run: npm run build:libs
- run: npm run downloadsolc_assets - run: npm run downloadsolc_assets

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

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

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

@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint-disable-line 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' import './remix-ui-tabs.css'
/* eslint-disable-next-line */ /* eslint-disable-next-line */

Loading…
Cancel
Save