Merge pull request #4472 from trufflesuite/develop

chore(release): publish v7.9.0

CONTRIBUTING.md

@@ -16,23 +16,40 @@
 
 If installation fails due to a `node-gyp` issue you may need to perform some additional system configuration.
 
-### on Linux (Ubuntu-based)
-
-- Make sure `npm` commands are not run as `root`.
-- Determine if you have Python 2.7 installed
-  - example: `which python2.7`
-- If you do not have Python 2.7 installed, you need to install it
-  - example: `sudo apt update && sudo apt install python2.7`
-- Run `npm config set python python2.7`
+note: Ganache uses [node-gyp v7.1.2](https://github.com/nodejs/node-gyp/tree/v7.1.2) as part of its build system, which requires Python v2.7, v3.5, v3.6, v3.7, or v3.8 to be installed on the system.
 
 ### on Windows
 
 - Install [https://www.npmjs.com/package/windows-build-tools](Windows-Build-Tools)
   - `npm install --global windows-build-tools`
 
+### on Linux (Ubuntu-based)
+
+- Make sure `npm` commands are not run as `root`.
+- If you get an error that `make` isn't installed you might need to also install the `build-essential` package
+ - example `sudo apt update && sudo apt install build-essential`
+- Determine whether you have a compatible version of Python installed:
+  - example: `python --version` (and `python3 --version` if `python3` is installed)
+- If you do not have a compatible version installed: (v2.7, v3.5, v3.6, v3.7, or v3.8), you will need to install it:
+  - example: `sudo apt update && sudo apt install python2.7`
+- You may need to configure the python dependency (see [node-gyp for details on different ways to do this](https://github.com/nodejs/node-gyp/tree/v7.1.2#configuring-python-dependency)):
+  - example: `npm config set python <path-to-python-executable>`
+
 ### on macOS
 
-- I have no idea.
+- Attempt to install Xcode command line tools (the console will tell you if they're already installed)
+  - example: `xcode-select --install`
+- Determine whether you have a compatible version of Python installed:
+  - example: `python --version` (and `python3 --version` if `python3` is installed)
+- If you do not have a compatible version installed: (v2.7, v3.5, v3.6, v3.7, or v3.8), you will need to install it: (we recommend [pyenv](https://github.com/pyenv/pyenv) to manage your python installation)
+  1. [Install `pyenv`](https://github.com/pyenv/pyenv#homebrew-in-macos)
+  2. [Setup your shell environment for `pyenv`](https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv)
+  3. Install Python: `pyenv install 2.7`
+  4. You may need to configure the python dependency (see [node-gyp for details on different ways to do this](https://github.com/nodejs/node-gyp/tree/v7.1.2#configuring-python-dependency)):
+  - example: `npm config set python <path-to-python-executable>`
+- If the above steps don't fix the `node-gyp` issue and you've recently updated your OS, you may need to re-install Xcode command line tools:
+  1. Remove the existing, broken installation: `rm -rf /Library/Developer/CommandLineTools`
+  2. Install them again: `xcode-select --install`
 
 ## Clean install
 

docs/assets/css/main.css

@@ -18,7 +18,7 @@
   --turquoise: #3fe0c5;
   --medium-dark-turquoise: #1bd4b5;
   --dark-turquoise: #00c3a2;
-  --very-dark-turquoise: #258575;
+  --very-dark-turquoise: #237b6d;
 
   --light-porsche: #f7e6d5;
   --porsche: #e4a663;

docs/assets/js/inject-editor.js

@@ -1,6 +1,9 @@
 require.config({
   paths: {
     vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.28.0/min/vs"
+  },
+  onNodeCreated: function (node) {
+    node.setAttribute("crossorigin", "anonymous");
   }
 });
 
@@ -13,7 +16,7 @@ function escapeHtml(unsafe) {
     .replace(/'/g, "'");
 }
 
-function getTheme() {
+function getTheme(userTheme) {
   const styles = getComputedStyle(document.querySelector("#page"));
 
   const format = str => str.trim().substring(1, 9);
@@ -55,7 +58,7 @@ function getTheme() {
     { token: "string", foreground: text4 },
     { token: "keyword", foreground: text6 }
   ];
-  const base = getUserColorTheme() === "light" ? "vs" : "vs-dark";
+  const base = userTheme === "light" ? "vs" : "vs-dark";
   return {
     base,
     colors: {
@@ -75,7 +78,7 @@ function getTheme() {
     const newTheme = e.target.checked === true ? "light" : "dark";
     localStorage.setItem("theme", newTheme);
     document.documentElement.setAttribute("data-theme", newTheme);
-    monaco.editor.defineTheme("ganache", getTheme());
+    monaco.editor.defineTheme("ganache", getTheme(newTheme));
   });
 })();
 
@@ -103,9 +106,9 @@ require(["vs/editor/editor.main"], function () {
   const libUri = "ts:filename/provider.d.ts";
   monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri);
   monaco.editor.createModel(libSource, "typescript", monaco.Uri.parse(libUri));
-  monaco.editor.defineTheme("ganache", getTheme());
+  monaco.editor.defineTheme("ganache", getTheme(userColorTheme));
 
-  const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor;
+  const AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
   let ganachePromise = null;
   async function downloadGanacheIfNeeded() {
     if (Ganache) return;