Merge branch 'master' into misc_fixes_2

.circleci/config.yml

@@ -226,7 +226,14 @@ jobs:
 
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
+      - save_cache:
+          key: v1-deps-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules
       - run: yarn run downloadsolc_assets
       - run: yarn run build:production
       - run:
@@ -250,7 +257,14 @@ jobs:
 
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
+      - save_cache:
+          key: v1-deps-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules
       - run: yarn run downloadsolc_assets
       - run: yarn run build:production
       - run:
@@ -274,8 +288,14 @@ jobs:
 
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: yarn run build:libs
+      - save_cache:
+          key: v1-deps-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules
       - run: yarn run downloadsolc_assets
       - run: yarn run build:production
       - run:

apps/debugger/tsconfig.app.json

@@ -9,7 +9,6 @@
     "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
   "exclude": [
-    "jest.config.ts",
     "**/*.spec.ts",
     "**/*.test.ts",
     "**/*.spec.tsx",

apps/etherscan/tsconfig.app.json

@@ -9,7 +9,6 @@
     "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
   "exclude": [
-    "jest.config.ts",
     "**/*.spec.ts",
     "**/*.test.ts",
     "**/*.spec.tsx",

apps/remix-ide-e2e/src/local-plugin/.eslintrc

@@ -238,7 +238,6 @@
     "browser": true,
     "commonjs": true,
     "es6": true,
-    "jest": true,
     "node": true
   },
   "settings": { "react": { "version": "detect" } },

apps/remix-ide-e2e/src/tests/recorder.test.ts

@@ -68,10 +68,9 @@ module.exports = {
       })
   },
 
-  'Record more than one contract #group1': function (browser: NightwatchBrowser) {
+  'Record more than one contract #group2': function (browser: NightwatchBrowser) {
     // deploy 2 contracts (2 different ABIs), save the record, reexecute and test one of the function.
     browser
-      .click('*[data-id="deployAndRunClearInstances"]')
       .testContracts('multipleContracts.sol', sources[1]['multipleContracts.sol'], ['t1est', 't2est'])
       .clickLaunchIcon('udapp')
       .selectContract('t1est')
@@ -81,6 +80,7 @@ module.exports = {
       .selectContract('t2est')
       .pause(1000)
       .createContract('')
+      .click('[data-id="udappRecorderTitleExpander"]')
       .click('.savetransaction')
       .waitForElementVisible('[data-id="udappNotify-modal-footer-ok-react"]')
       .execute(function () {
@@ -92,7 +92,7 @@ module.exports = {
       .click('*[data-id="deployAndRunClearInstances"]') // clear udapp
       .click('*[data-id="terminalClearConsole"]') // clear terminal
       .click('[data-id="runtransaction"]')
-      .clickInstance(2)
+      .clickInstance(1)
       .pause(1000)
       .clickFunction('set2 - transact (not payable)', { types: 'uint256 _po', values: '10' })
       .testFunction('last',
@@ -103,7 +103,7 @@ module.exports = {
       
   },
 
-  'Run with live "mode" #group1': function (browser: NightwatchBrowser) {
+  'Run with live "mode" #group2': function (browser: NightwatchBrowser) {
     let addressRef: string
     browser.addFile('scenario_live_mode.json', { content: JSON.stringify(liveModeScenario, null, '\t') })
       .addFile('scenario_live_mode_storage.sol', { content: testStorageForLiveMode })

apps/remix-ide/tsconfig.json

@@ -5,7 +5,7 @@
     "allowJs": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "types": ["node", "jest"],
+    "types": ["node"],
     "resolveJsonModule": true
   },
   "files": [

apps/remix-ide/tsconfig.spec.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": ["node"]
   },
   "include": [
     "**/*.spec.ts",

apps/solidity-compiler/tsconfig.app.json

@@ -9,7 +9,6 @@
     "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
   "exclude": [
-    "jest.config.ts",
     "**/*.spec.ts",
     "**/*.test.ts",
     "**/*.spec.tsx",

jest.preset.js

@@ -1,4 +0,0 @@
-
-      const nxPreset = require('@nrwl/jest/preset');
-     
-      module.exports = { ...nxPreset }

libs/ghaction-helper/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "types": ["jest", "node"]
+    "types": ["node"]
   },
   "include": ["**/*.ts"]
 }

libs/remix-solidity/jest.config.js

@@ -1,26 +0,0 @@
-module.exports = {
-  name: 'remix-solidity',
-  preset: '../../jest.config.js',
-  verbose: true,
-  silent: false, // Silent console messages, specially the 'remix-simulator' ones
-  transform: {
-    '^.+\\.[tj]sx?$': ['ts-jest',
-      {
-        useESM: true,
-      }]
-  },
-  transformIgnorePatterns: ["/node_modules/", "/dist/", "\\.pnp\\.[^\\/]+$"],
-  rootDir: "./",
-  testTimeout: 40000,
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html', 'json'],
-  // Coverage
-  collectCoverage: true,
-  coverageReporters: ['text', 'text-summary'],
-  collectCoverageFrom: [
-    "**/*.ts",
-    "!**/sol/**",
-    "!src/types.ts",
-    "!src/logger.ts"
-  ],
-  coverageDirectory: '../../coverage/libs/remix-solidity'
-};

libs/remix-solidity/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "types": ["jest", "node"],
+    "types": ["node"],
   },
   "include": ["**/*.ts"]
 }

libs/remix-tests/tsconfig.spec.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": ["node"]
   },
   "include": [
     "**/*.spec.ts",

libs/remixd/tsconfig.spec.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": ["node"]
   },
   "include": [
     "**/*.spec.ts",

package.json

@@ -225,7 +225,6 @@
     "@monaco-editor/react": "4.4.5",
     "@nrwl/cli": "^15.7.1",
     "@nrwl/eslint-plugin-nx": "^15.7.1",
-    "@nrwl/jest": "15.7.1",
     "@nrwl/js": "15.7.1",
     "@nrwl/linter": "15.7.1",
     "@nrwl/node": "15.7.1",
@@ -243,7 +242,6 @@
     "@types/express-ws": "^3.0.1",
     "@types/fs-extra": "^9.0.1",
     "@types/isomorphic-git__lightning-fs": "^4.4.2",
-    "@types/jest": "28.1.1",
     "@types/lodash": "^4.14.172",
     "@types/mocha": "^9.1.1",
     "@types/node": "18.7.18",
@@ -264,7 +262,6 @@
     "ace-mode-solidity": "^0.1.0",
     "ace-mode-zokrates": "^1.0.4",
     "babel-eslint": "^10.0.0",
-    "babel-jest": "25.1.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-fast-async": "^6.1.2",
     "babel-plugin-module-resolver": "^4.0.0",
@@ -315,8 +312,6 @@
     "ipfs-mini": "^1.1.5",
     "is-electron": "^2.2.0",
     "javascript-serialize": "^1.6.1",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "28.1.1",
     "js-base64": "^2.1.9",
     "js-beautify": "1.6.14",
     "lerna": "^3.22.1",
@@ -350,7 +345,6 @@
     "tape": "^4.13.3",
     "terser-webpack-plugin": "^5.3.6",
     "timers-browserify": "^2.0.12",
-    "ts-jest": "^29.0.3",
     "ts-node": "10.9.1",
     "tslint": "~6.0.0",
     "typescript": "^4.8.4",