Skip to content

Commit

Permalink
sync (#5)
Browse files Browse the repository at this point in the history
* chore: point community link at our discord channel (trufflesuite#874)

* chore(deps): bump y18n from 4.0.0 to 4.0.1 (trufflesuite#884)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: rearchitect server status and move async functions from constructors to initialize functions (trufflesuite#877)

* feat: add filecoin flavor (trufflesuite#888)

Co-authored-by: David Murdoch <davidmurdoch@users.noreply.github.com>
Co-authored-by: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Co-authored-by: Tim Coulter <tim@timothyjcoulter.com>

* fix: support a uws fallback if uws native binaries don't exist (win+electron) (trufflesuite#893)

Co-authored-by: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mike Seese <seesemichaelj@gmail.com>
Co-authored-by: David Murdoch <davidmurdoch@users.noreply.github.com>
Co-authored-by: Tim Coulter <tim@timothyjcoulter.com>
  • Loading branch information
6 people committed Apr 14, 2021
1 parent 71242be commit 70b8cd3
Show file tree
Hide file tree
Showing 243 changed files with 31,449 additions and 9,447 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
if: startsWith(matrix.os, 'windows-')
run: npm config set msvs_version 2015
- run: npm ci
- run: npm run tsc
- run: npm test
env:
FORCE_COLOR: 1
2 changes: 2 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
with:
node-version: ${{ matrix.node }}
- run: npm ci
- run: npm run tsc
- run: npm test
env:
FORCE_COLOR: 1
Expand Down Expand Up @@ -66,6 +67,7 @@ jobs:
if: startsWith(matrix.os, 'windows-')
run: npm config set msvs_version 2015
- run: npm ci
- run: npm run tsc
- run: npm test
env:
FORCE_COLOR: 1
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
engine-strict=true
engine-strict=false
save-exact=true
sign-git-commit=true
sign-git-tag=true
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/ganache/ganache.min.js

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions docs/assets/js/ganache/ganache.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
* License: MIT
*/

/*!
* @ganache/colors
*
* @copyright Truffle Blockchain Group
* @author David Murdoch
* @license MIT
*/

/*!
* @ganache/ethereum
*
Expand All @@ -29,6 +37,14 @@
* @license MIT
*/

/*!
* @ganache/filecoin-options
*
* @copyright Truffle Blockchain Group
* @author Tim Coulter
* @license MIT
*/

/*!
* The buffer module from node.js, for the browser.
*
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/ganache/ganache.min.js.map

Large diffs are not rendered by default.

36 changes: 27 additions & 9 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"npm": ">=6.4.1"
},
"scripts": {
"build": "lerna run build && shx cp -r src/packages/ganache/dist/web/* docs/assets/js/ganache",
"build": "npm run tsc && lerna run build && shx cp -r src/packages/ganache/dist/web/* docs/assets/js/ganache",
"clean": "npm run tsc.clean && npx lerna clean -y && npx shx rm -rf node_modules",
"create": "ts-node scripts/create",
"docs.build": "lerna run docs.build && ts-node scripts/build-docs/",
Expand All @@ -17,7 +17,8 @@
"start": "lerna exec --loglevel=silent --scope ganache -- npm run start --silent -- ",
"test": "lerna exec -- npm run test",
"tsc": "ttsc --build src",
"tsc.clean": "npx lerna exec -- npx shx rm -rf lib dist"
"tsc.clean": "npx lerna exec -- npx shx rm -rf lib dist",
"tsc.filecoin.declarations": "lerna run tsc.declarations --scope @ganache/filecoin && pretty-quick src/chains/filecoin/types"
},
"devDependencies": {
"@istanbuljs/nyc-config-typescript": "1.0.1",
Expand Down
23 changes: 23 additions & 0 deletions scripts/skip-if-less-than-node-12.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// To use this script, run `ts-node path/to/skip-if-less-than-node-12.ts || <command>`
// This script will "succeed" if less than node@12, causing <command> to not execute
// but also make look like the overall command was successful

const majorVersionStringMatch = /^v([0-9]+)\./.exec(process.version);

if (!majorVersionStringMatch || majorVersionStringMatch.length < 2) {
console.error(
"ERROR: Could not parse process.version for some reason. This shouldn't happen."
);
process.exit(0); // we exit with code 0 to prevent further scripts from running
}

const majorVersion = parseInt(majorVersionStringMatch[1], 10);

if (majorVersion < 12) {
console.log(
`Skipping following command as the NodeJS version is ${majorVersion}, and it needs to be at least 12 to continue.`
);
process.exit(0);
} else {
process.exit(1);
}
Loading

0 comments on commit 70b8cd3

Please sign in to comment.