machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/liquid-bits-calc

Browse Source
This commit is contained in:
Jonathan Underwood 2023-08-05 00:00:02 -07:00 committed by GitHub
commit 6ff7a59bfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/.gitignore vendored
View File

@ -45,3 +45,6 @@ testem.log
#System Files #System Files
.DS_Store .DS_Store
Thumbs.db Thumbs.db
# package folder (npm run package output)
/package

7
backend/npm_package.sh
View File

@ -1,14 +1,17 @@
#/bin/sh #/bin/sh
set -e set -e
# Remove previous dist folder
rm -rf dist
# Build new dist folder
npm run build npm run build
# Remove previous package folder # Remove previous package folder
rm -rf package rm -rf package
# Move JS and deps # Move JS and deps
mv dist package mv dist package
mv node_modules package cp -R node_modules package
# Remove symlink for rust-gbt and insert real folder # Remove symlink for rust-gbt and insert real folder
rm package/node_modules/rust-gbt rm package/node_modules/rust-gbt
mv rust-gbt package/node_modules cp -R rust-gbt package/node_modules
# Clean up deps # Clean up deps
npm run package-rm-build-deps npm run package-rm-build-deps

5
backend/package.json
View File

@ -22,7 +22,7 @@
"main": "index.ts", "main": "index.ts",
"scripts": { "scripts": {
"tsc": "./node_modules/typescript/bin/tsc -p tsconfig.build.json", "tsc": "./node_modules/typescript/bin/tsc -p tsconfig.build.json",
"build": "npm run tsc && npm run create-resources", "build": "npm run rust-build && npm run tsc && npm run create-resources",
"create-resources": "cp ./src/tasks/price-feeds/mtgox-weekly.json ./dist/tasks && node dist/api/fetch-version.js", "create-resources": "cp ./src/tasks/price-feeds/mtgox-weekly.json ./dist/tasks && node dist/api/fetch-version.js",
"package": "./npm_package.sh", "package": "./npm_package.sh",
"package-rm-build-deps": "./npm_package_rm_build_deps.sh", "package-rm-build-deps": "./npm_package_rm_build_deps.sh",
@ -33,7 +33,8 @@
"test": "./node_modules/.bin/jest --coverage", "test": "./node_modules/.bin/jest --coverage",
"lint": "./node_modules/.bin/eslint . --ext .ts", "lint": "./node_modules/.bin/eslint . --ext .ts",
"lint:fix": "./node_modules/.bin/eslint . --ext .ts --fix", "lint:fix": "./node_modules/.bin/eslint . --ext .ts --fix",
"prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\"" "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\"",
"rust-build": "cd rust-gbt && npm run build-release"
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.21.3", "@babel/core": "^7.21.3",