From ecb331c694a8f3b950ec61878eafe604da1d8d91 Mon Sep 17 00:00:00 2001 From: lianahus Date: Thu, 17 Mar 2022 14:01:47 +0100 Subject: [PATCH 1/7] bumped dev to 0.22.0-dev --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b246d05caa..86fb091bf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "remix-project", - "version": "0.22.0", + "version": "0.23.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 40a7d6af8b..ae8b3c6666 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "remix-project", - "version": "0.22.0", + "version": "0.23.0-dev", "license": "MIT", "description": "Ethereum Remix Monorepo", "keywords": [ From 630620b06f32490b69466716cb0c9452cb27763d Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 17 Mar 2022 17:03:37 +0100 Subject: [PATCH 2/7] info reload --- apps/remix-ide/src/app/components/preload.tsx | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/components/preload.tsx b/apps/remix-ide/src/app/components/preload.tsx index a5dde9454d..2aaa336f35 100644 --- a/apps/remix-ide/src/app/components/preload.tsx +++ b/apps/remix-ide/src/app/components/preload.tsx @@ -23,6 +23,8 @@ export const Preload = () => { const testBlockStorage = useRef(window.location.hash.includes('e2e_testblock_storage=true') && window.location.host === '127.0.0.1:8080' && window.location.protocol === 'http:') function loadAppComponent() { + setError(true) + return import('../../app').then((AppComponent) => { const appComponent = new AppComponent.default() appComponent.run().then(() => { @@ -103,8 +105,22 @@ export const Preload = () => { Either change the settings in your browser or use a supported browser. : null} {error ? -
- An unknown error has occured loading the application. +
+ An unknown error has occurred while loading the application.

+ Doing a hard refresh might fix this issue:

+
+ Windows:

+ - Chrome: CTRL + F5 or CTRL + Reload Button

+ - Firefox: CTRL + SHIFT + R or CTRL + F5

+
+
+ MacOS:

+ - Chrome & FireFox: CMD + SHIFT + R or SHIFT + Reload Button

+
+
+ Linux:

+ - Chrome & FireFox: CTRL + SHIFT + R

+
: null} {showDownloader ?
From a2e1d821bf7341751ebef1d6831a4a3ef2569646 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 17 Mar 2022 17:04:25 +0100 Subject: [PATCH 3/7] rm debug --- apps/remix-ide/src/app/components/preload.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/remix-ide/src/app/components/preload.tsx b/apps/remix-ide/src/app/components/preload.tsx index 2aaa336f35..6674b1bcfd 100644 --- a/apps/remix-ide/src/app/components/preload.tsx +++ b/apps/remix-ide/src/app/components/preload.tsx @@ -23,8 +23,6 @@ export const Preload = () => { const testBlockStorage = useRef(window.location.hash.includes('e2e_testblock_storage=true') && window.location.host === '127.0.0.1:8080' && window.location.protocol === 'http:') function loadAppComponent() { - setError(true) - return import('../../app').then((AppComponent) => { const appComponent = new AppComponent.default() appComponent.run().then(() => { From 05377338fffefd6b11a51f6a9f302a401a8b2975 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Thu, 17 Mar 2022 15:56:28 +0100 Subject: [PATCH 4/7] Update preload.css --- apps/remix-ide/src/app/components/styles/preload.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/components/styles/preload.css b/apps/remix-ide/src/app/components/styles/preload.css index 266cbfe834..031263b43f 100644 --- a/apps/remix-ide/src/app/components/styles/preload.css +++ b/apps/remix-ide/src/app/components/styles/preload.css @@ -19,5 +19,6 @@ .preload-logo { min-width: 200px; + max-width: 240px; padding-bottom: 1.5rem !important; -} \ No newline at end of file +} From 96faec1f413c5709dd88623cd59f0ebb2a1e45eb Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Thu, 17 Mar 2022 16:34:16 +0100 Subject: [PATCH 5/7] Update remixAppManager.js --- apps/remix-ide/src/remixAppManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js index 6a1790e3d0..eccf1690b5 100644 --- a/apps/remix-ide/src/remixAppManager.js +++ b/apps/remix-ide/src/remixAppManager.js @@ -7,7 +7,7 @@ const _paq = window._paq = window._paq || [] const requiredModules = [ // services + layout views + system views 'manager', 'config', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme', 'fileManager', 'contentImport', 'blockchain', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons', - 'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic', 'gistHandler', 'layout', 'notification', 'permissionhandler', 'walkthrough', 'storage'] + 'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic', 'gistHandler', 'layout', 'notification', 'permissionhandler', 'walkthrough', 'storage', 'restorebackupzip'] const dependentModules = ['git', 'hardhat', 'slither'] // module which shouldn't be manually activated (e.g git is activated by remixd) From c62247048569e2cb8561d28ea58208725cd1f9e3 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Fri, 18 Mar 2022 12:57:41 +0530 Subject: [PATCH 6/7] show option with ts hh config file --- .../solidity-compiler/src/lib/logic/compileTabLogic.ts | 2 +- libs/remixd/src/bin/remixd.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 631d4c7949..101837a9c4 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -105,7 +105,7 @@ export class CompileTabLogic { async isHardhatProject () { if (this.api.getFileManagerMode() === 'localhost') { - return await this.api.fileExists('hardhat.config.js') + return await this.api.fileExists('hardhat.config.js') || await this.api.fileExists('hardhat.config.ts') } else return false } diff --git a/libs/remixd/src/bin/remixd.ts b/libs/remixd/src/bin/remixd.ts index c6bff13a89..f30b68f247 100644 --- a/libs/remixd/src/bin/remixd.ts +++ b/libs/remixd/src/bin/remixd.ts @@ -101,8 +101,8 @@ function errorHandler (error: any, service: string) { sharedFolderClient.sharedFolder(program.sharedFolder) }) // Run hardhat service if a hardhat project is shared as folder - const hardhatConfigFilePath = absolutePath('./', program.sharedFolder) + '/hardhat.config.js' - const isHardhatProject = existsSync(hardhatConfigFilePath) + const hardhatConfigFilePath = absolutePath('./', program.sharedFolder) + const isHardhatProject = existsSync(hardhatConfigFilePath + '/hardhat.config.js') || existsSync(hardhatConfigFilePath + '/hardhat.config.ts') if (isHardhatProject) { startService('hardhat', (ws: WS, sharedFolderClient: servicesList.Sharedfolder, error: Error) => { if (error) { From cd3ddc8a1c8cea9f9b28c2c4a536a98652383fab Mon Sep 17 00:00:00 2001 From: yann300 Date: Thu, 17 Mar 2022 12:20:47 +0100 Subject: [PATCH 7/7] update process --- release-process.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release-process.md b/release-process.md index 67e100a5f8..15a58a6c87 100644 --- a/release-process.md +++ b/release-process.md @@ -37,7 +37,7 @@ This document includes: - git checkout origin/remix_beta - git checkout -b bumpVersion - update package.json version - - remove package-lock.json version and generate a new one with `npm install` + - update version in package-lock.json - merge PR to origin/remix_beta - git fetch origin remix_beta - git checkout origin/remix_beta @@ -52,7 +52,7 @@ This document includes: - git checkout origin/master - git checkout -b bumpDevVersion - update package.json version: bump the version and add the tag `dev` if not already present. - - remove package-lock.json version and generate a new one with `npm install` + - update version in package-lock.json - create a PR and merge it to origin/master ## Remix IDE release Part 4. remix.ethereum.org update @@ -73,7 +73,7 @@ This is not strictly speaking a release. Updating the remix site is done through - git checkout origin/master - git checkout -b bumpVersion - update package.json version to the new version "vx.x.x-beta.1" - - remove package-lock/json version and generate a new one with `npm install` + - update version in package-lock.json - merge PR - git fetch origin master - git checkout origin/master