Skip to content

Commit 7f5d5ac

Browse files
authored
Merge branch 'master' into extend-modal
2 parents 98c409f + e488d58 commit 7f5d5ac

File tree

15 files changed

+46
-133
lines changed

15 files changed

+46
-133
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,5 @@ apps/remixdesktop/circom-download
7777
apps/remixdesktop/log_input_signals.txt
7878
apps/remixdesktop/log_input_signals_new.txt
7979
logs
80-
apps/remix-ide-e2e/src/extensions/chrome/metamask
80+
apps/remix-ide-e2e/src/extensions/chrome/metamask
81+
apps/remix-ide-e2e/tmp/

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<div align="center">
77

88

9-
[![CircleCI](https://img.shields.io/circleci/build/github/ethereum/remix-project?logo=circleci)](https://circleci.com/gh/ethereum/remix-project)
9+
[![CircleCI](https://img.shields.io/circleci/build/github/remix-project-org/remix-project?logo=circleci)](https://circleci.com/gh/remix-project-org/remix-project)
1010
[![Documentation Status](https://readthedocs.org/projects/remix-ide/badge/?version=latest)](https://remix-ide.readthedocs.io/en/latest/index.html)
11-
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat&logo=github)](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md)
12-
[![GitHub contributors](https://img.shields.io/github/contributors/ethereum/remix-project?style=flat&logo=github)](https://github.com/ethereum/remix-project/graphs/contributors)
11+
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat&logo=github)](https://github.com/remix-project-org/remix-project/blob/master/CONTRIBUTING.md)
12+
[![GitHub contributors](https://img.shields.io/github/contributors/remix-project-org/remix-project?style=flat&logo=github)](https://github.com/remix-project-org/remix-project/graphs/contributors)
1313
[![Awesome Remix](https://img.shields.io/badge/Awesome--Remix-resources-green?logo=awesomelists)](https://github.com/remix-project-org/awesome-remix)
14-
[![GitHub](https://img.shields.io/github/license/ethereum/remix-project)](https://github.com/ethereum/remix-project/blob/master/LICENSE)
14+
[![GitHub](https://img.shields.io/github/license/remix-project-org/remix-project)](https://github.com/remix-project-org/remix-project/blob/master/LICENSE)
1515
[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/KhDtC8mGqx)
1616
[![X Follow](https://img.shields.io/twitter/follow/ethereumremix?style=flat&logo=x&color=green)](https://x.com/ethereumremix)
1717

@@ -28,17 +28,17 @@
2828

2929
:point_right: Supported browsers: Firefox v100.0.1 & Chrome v101.0.4951.64. No support for Remix's use on tablets or smartphones or telephones.
3030

31-
**Remix Desktop IDE**, see releases: [https://github.com/ethereum/remix-desktop/releases](https://github.com/ethereum/remix-desktop/releases)
31+
**Remix Desktop IDE**, see releases: [https://github.com/remix-project-org/remix-desktop/releases](https://github.com/remix-project-org/remix-desktop/releases)
3232

33-
![Remix screenshot](https://github.com/ethereum/remix-project/raw/master/apps/remix-ide/remix-screenshot-400h.png)
33+
![Remix screenshot](https://github.com/remix-project-org/remix-project/raw/master/apps/remix-ide/remix-screenshot-400h.png)
3434

3535

3636
## Remix libraries
3737
Remix libraries are essential for Remix IDE's native plugins. Read more about libraries [here](libs/README.md)
3838

3939
## Offline Usage
4040

41-
The `gh-pages` branch of [remix-live](https://github.com/ethereum/remix-live) always has the latest stable build of Remix. It contains a ZIP file with the entire build. Download it to use offline.
41+
The `gh-pages` branch of [remix-live](https://github.com/remix-project-org/remix-live) always has the latest stable build of Remix. It contains a ZIP file with the entire build. Download it to use offline.
4242

4343
Note: It contains the latest supported version of Solidity available at the time of the packaging. Other compiler versions can be used online only.
4444

@@ -60,7 +60,7 @@ yarn global add nx
6060
* Clone the GitHub repository (`wget` need to be installed first):
6161

6262
```bash
63-
git clone https://github.com/ethereum/remix-project.git
63+
git clone https://github.com/remix-project-org/remix-project.git
6464
```
6565
* Build and Run `remix-project`:
6666

@@ -120,7 +120,7 @@ Then go to http://localhost:8080 and you can use your Remix instance.
120120

121121
To fetch the docker-compose file without cloning this repo run:
122122
```
123-
curl https://raw.githubusercontent.com/ethereum/remix-project/master/docker-compose.yaml > docker-compose.yaml
123+
curl https://raw.githubusercontent.com/remix-project-org/remix-project/master/docker-compose.yaml > docker-compose.yaml
124124
```
125125

126126
### Troubleshooting

apps/remix-ide/release-process.md

Lines changed: 0 additions & 53 deletions
This file was deleted.

apps/remix-ide/src/app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ class AppComponent {
226226
this.engine.register(appManager)
227227

228228
const matomoDomains = {
229-
'remix-alpha.ethereum.org': 27,
230-
'remix-beta.ethereum.org': 25,
229+
'alpha.remix.live': 27,
230+
'beta.remix.live': 25,
231231
'remix.ethereum.org': 23,
232232
'6fd22d6fe5549ad4c4d8fd3ca0b7816b.mod': 35 // remix desktop
233233
}

apps/remix-ide/src/app/plugins/remixAIPlugin.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ export class RemixAIPlugin extends Plugin {
222222
await statusCallback?.('Creating contracts and files...')
223223
const genResult = await this.contractor.writeContracts(result, userPrompt, statusCallback)
224224

225+
// revert provider
226+
this.setAssistantProvider(await this.getAssistantProvider())
225227
if (genResult.includes('No payload')) return genResult
226228
await this.call('menuicons', 'select', 'filePanel')
227229
return genResult

apps/remix-ide/src/app/tabs/locales/en/remixd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"remixd.text1": "Access your local file system from Remix IDE using <a>Remixd NPM package</a>.",
88
"remixd.text2": "Remixd <a>documentation</a>.",
99
"remixd.text3": "The remixd command is:",
10-
"remixd.text4": "The remixd command without options uses the terminal's current directory as the shared directory and the shared Remix domain can only be https://remix.ethereum.org, https://remix-alpha.ethereum.org, or https://remix-beta.ethereum.org",
10+
"remixd.text4": "The remixd command without options uses the terminal's current directory as the shared directory and the shared Remix domain can only be https://remix.ethereum.org, https://alpha.remix.live, or https://beta.remix.live",
1111
"remixd.text5": "Example command with flags:",
1212
"remixd.text6": "For info about ports, see <a>Remixd ports usage</a>",
1313
"remixd.text7": "This feature is still in Alpha. We recommend to keep a backup of the shared folder.",

apps/remix-ide/src/assets/js/loader.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
const domains = {
2-
'remix-alpha.ethereum.org': 27,
3-
'remix-beta.ethereum.org': 25,
2+
'alpha.remix.live': 27,
3+
'beta.remix.live': 25,
44
'remix.ethereum.org': 23,
55
'localhost': 35 // remix desktop
66
}
77
const domainsOnPrem = {
8-
'remix-alpha.ethereum.org': 1,
9-
'remix-beta.ethereum.org': 2,
8+
'alpha.remix.live': 1,
9+
'beta.remix.live': 2,
1010
'remix.ethereum.org': 3,
1111
'localhost': 4 // remix desktop
1212
}

apps/remix-ide/team-best-practices.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Related links:
1212
- Public WebSite: https://remix-project.org
1313
- Remix basic FAQ: https://hackmd.io/KVooMJhWRImCGq6zkDgW9A
1414
- Remix live: https://remix.ethereum.org
15-
- Remix alpha live: https://remix-alpha.ethereum.org
16-
- Remix beta live: https://remix-beta.ethereum.org
15+
- Remix alpha live: https://alpha.remix.live
16+
- Remix beta live: https://beta.remix.live
1717
- Remix-lib NPM module: https://www.npmjs.com/package/@remix-project/remix-lib
1818
- Remix-tests NPM module: https://www.npmjs.com/package/@remix-project/remix-tests
1919
- Remix-solidity NPM module: https://www.npmjs.com/package/@remix-project/remix-solidity
@@ -114,7 +114,7 @@ Before starting to coding, we should ensure all devs / contributors are aware of
114114
### 3) Merge:
115115

116116
- Merging is possible after Review and Tests are ok and when the PR is approved.
117-
- After a merge, it is highly recommended to check the new code in `remix-alpha.ethereum.org`
117+
- After a merge, it is highly recommended to check the new code in `alpha.remix.live`
118118

119119
---
120120

@@ -195,8 +195,8 @@ Before starting to coding, we should ensure all devs / contributors are aware of
195195
### release process:
196196

197197
- We release an `x.0.0` if there's a fundamental change in our UX design, which means users will need to readapt the way they use the app
198-
- after a week finishes, we publish/release a new version as **remix-beta.ethereum.org** and inform users so early adopters can test. after another week, when the next finished work is released as **remix-beta.ethereum.org**, the previous one becomes **remix.ethereum.org** and all users can start using it
199-
- a bot to automatically notify users about upcoming features on all channels whenever **remix-beta.ethereum.org** is updated
198+
- after a week finishes, we publish/release a new version as **beta.remix.live** and inform users so early adopters can test. after another week, when the next finished work is released as **beta.remix.live**, the previous one becomes **remix.ethereum.org** and all users can start using it
199+
- a bot to automatically notify users about upcoming features on all channels whenever **beta.remix.live** is updated
200200
- in case it's a major version increase - this announcement should be specially marked so people can check early instead of being confronted with drastic changes when **remix.ethereum.org** updates
201201
### maintenance:
202202
- Setting up a "bug" time where we each take a bug for which:

libs/remix-ui/app/src/lib/remix-app/components/modals/origin-warning.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const OriginWarning = () => {
1111
if (window.location.hostname === 'yann300.github.io') {
1212
setContent('This UNSTABLE ALPHA branch of Remix has been moved to http://ethereum.github.io/remix-live-alpha.')
1313
} else if (
14-
window.location.hostname === 'remix-alpha.ethereum.org' ||
14+
window.location.hostname === 'alpha.remix.live' ||
1515
(window.location.hostname === 'ethereum.github.io' && window.location.pathname.indexOf('/remix-live-alpha') === 0)
1616
) {
1717
setContent('Welcome to the Remix alpha instance. Please use it to try out latest features. But use preferably https://remix.ethereum.org for any production work.')

libs/remix-ui/home-tab/src/lib/components/constant.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const branches = {
2-
'remix-beta.ethereum.org': 'beta',
3-
'remix-alpha.ethereum.org': 'alpha',
2+
'beta.remix.live': 'beta',
3+
'alpha.remix.live': 'alpha',
44
'remix.ethereum.org': 'live'
55
}
66

0 commit comments

Comments
 (0)