Merge branch 'master' into updated-RP

apps/remix-ide/src/app/components/preload.tsx

@@ -103,8 +103,22 @@ export const Preload = () => {
                     Either change the settings in your browser or use a supported browser.
                 </div> : null}
             {error ?
-                <div className='preload-info-container alert alert-danger'>
-                    An unknown error has occured loading the application.
+                <div className='preload-info-container alert alert-danger text-left'>
+                    An unknown error has occurred while loading the application.<br></br>
+                    Doing a hard refresh might fix this issue:<br></br>
+                    <div className='pt-2'>
+                    Windows:<br></br>
+                    - Chrome: CTRL + F5 or CTRL + Reload Button<br></br>
+                    - Firefox: CTRL + SHIFT + R or CTRL + F5<br></br>
+                    </div>
+                    <div className='pt-2'>
+                    MacOS:<br></br>
+                    - Chrome & FireFox: CMD + SHIFT + R or SHIFT + Reload Button<br></br>
+                    </div>
+                    <div className='pt-2'>
+                    Linux:<br></br>
+                    - Chrome & FireFox: CTRL + SHIFT + R<br></br>
+                    </div>
                 </div> : null}
             {showDownloader ?
                 <div className='preload-info-container alert alert-info'>

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;
-}
+}

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)
 

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
   }
 

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) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.22.0",
+  "version": "0.23.0-dev",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

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": [

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