Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 7e53cd3

Browse files
authored
Merge pull request #4472 from trufflesuite/develop
chore(release): publish v7.9.0
2 parents 7cba77c + 2969bc7 commit 7e53cd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2485
-563
lines changed

CONTRIBUTING.md

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,40 @@
1616

1717
If installation fails due to a `node-gyp` issue you may need to perform some additional system configuration.
1818

19-
### on Linux (Ubuntu-based)
20-
21-
- Make sure `npm` commands are not run as `root`.
22-
- Determine if you have Python 2.7 installed
23-
- example: `which python2.7`
24-
- If you do not have Python 2.7 installed, you need to install it
25-
- example: `sudo apt update && sudo apt install python2.7`
26-
- Run `npm config set python python2.7`
19+
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.
2720

2821
### on Windows
2922

3023
- Install [https://www.npmjs.com/package/windows-build-tools](Windows-Build-Tools)
3124
- `npm install --global windows-build-tools`
3225

26+
### on Linux (Ubuntu-based)
27+
28+
- Make sure `npm` commands are not run as `root`.
29+
- If you get an error that `make` isn't installed you might need to also install the `build-essential` package
30+
- example `sudo apt update && sudo apt install build-essential`
31+
- Determine whether you have a compatible version of Python installed:
32+
- example: `python --version` (and `python3 --version` if `python3` is installed)
33+
- 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:
34+
- example: `sudo apt update && sudo apt install python2.7`
35+
- 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)):
36+
- example: `npm config set python <path-to-python-executable>`
37+
3338
### on macOS
3439

35-
- I have no idea.
40+
- Attempt to install Xcode command line tools (the console will tell you if they're already installed)
41+
- example: `xcode-select --install`
42+
- Determine whether you have a compatible version of Python installed:
43+
- example: `python --version` (and `python3 --version` if `python3` is installed)
44+
- 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)
45+
1. [Install `pyenv`](https://github.com/pyenv/pyenv#homebrew-in-macos)
46+
2. [Setup your shell environment for `pyenv`](https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv)
47+
3. Install Python: `pyenv install 2.7`
48+
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)):
49+
- example: `npm config set python <path-to-python-executable>`
50+
- 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:
51+
1. Remove the existing, broken installation: `rm -rf /Library/Developer/CommandLineTools`
52+
2. Install them again: `xcode-select --install`
3653

3754
## Clean install
3855

docs/assets/css/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
--turquoise: #3fe0c5;
1919
--medium-dark-turquoise: #1bd4b5;
2020
--dark-turquoise: #00c3a2;
21-
--very-dark-turquoise: #258575;
21+
--very-dark-turquoise: #237b6d;
2222

2323
--light-porsche: #f7e6d5;
2424
--porsche: #e4a663;

docs/assets/js/ganache/ganache.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/ganache/ganache.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/inject-editor.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require.config({
22
paths: {
33
vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.28.0/min/vs"
4+
},
5+
onNodeCreated: function (node) {
6+
node.setAttribute("crossorigin", "anonymous");
47
}
58
});
69

@@ -13,7 +16,7 @@ function escapeHtml(unsafe) {
1316
.replace(/'/g, "&#039;");
1417
}
1518

16-
function getTheme() {
19+
function getTheme(userTheme) {
1720
const styles = getComputedStyle(document.querySelector("#page"));
1821

1922
const format = str => str.trim().substring(1, 9);
@@ -55,7 +58,7 @@ function getTheme() {
5558
{ token: "string", foreground: text4 },
5659
{ token: "keyword", foreground: text6 }
5760
];
58-
const base = getUserColorTheme() === "light" ? "vs" : "vs-dark";
61+
const base = userTheme === "light" ? "vs" : "vs-dark";
5962
return {
6063
base,
6164
colors: {
@@ -75,7 +78,7 @@ function getTheme() {
7578
const newTheme = e.target.checked === true ? "light" : "dark";
7679
localStorage.setItem("theme", newTheme);
7780
document.documentElement.setAttribute("data-theme", newTheme);
78-
monaco.editor.defineTheme("ganache", getTheme());
81+
monaco.editor.defineTheme("ganache", getTheme(newTheme));
7982
});
8083
})();
8184

@@ -103,9 +106,9 @@ require(["vs/editor/editor.main"], function () {
103106
const libUri = "ts:filename/provider.d.ts";
104107
monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri);
105108
monaco.editor.createModel(libSource, "typescript", monaco.Uri.parse(libUri));
106-
monaco.editor.defineTheme("ganache", getTheme());
109+
monaco.editor.defineTheme("ganache", getTheme(userColorTheme));
107110

108-
const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor;
111+
const AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
109112
let ganachePromise = null;
110113
async function downloadGanacheIfNeeded() {
111114
if (Ganache) return;

docs/assets/js/preload.js

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

0 commit comments

Comments
 (0)