diff --git a/.gitignore b/.gitignore index 8ec2ff0ba..57fe83dd1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,84 +1,84 @@ abc-ci-builds *.tar.gz *.exe src/bitcoin src/bitcoind src/bitcoin-cli src/bitcoin-seeder src/bitcoin-tx src/bitcoin-wallet src/test/test_bitcoin src/test/test_bitcoin_fuzzy src/qt/test/test_bitcoin-qt src/univalue/gen src/obj src/qt/*.moc src/qt/moc_*.cpp src/qt/forms/ui_*.h src/qt/test/moc*.cpp src/qt/bitcoin-qt.config src/qt/bitcoin-qt.creator src/qt/bitcoin-qt.creator.user src/qt/bitcoin-qt.files src/qt/bitcoin-qt.includes .deps .libs .*.swp *.*~* *.bak *.rej *.orig *.pyc *.o *.o-* *.a *.pb.cc *.pb.h *.log *.trs *.dmg *.json.h *.raw.h # Only ignore unexpected patches *.patch !depends/patches/**/*.patch # Compilation and Qt preprocessor part *.qm Makefile bitcoin-qt Bitcoin-Qt.app background.tiff* # Resources cpp qrc_*.cpp # Mac specific .DS_Store build #lcov *.gcno *.gcda /*.info #build tests test/config.ini test/cache/* !src/leveldb*/Makefile contrib/devtools/split-debug.sh # Ignore node_modules at every level -node_modules/ +node_modules/ \ No newline at end of file diff --git a/web/cashtab/.gitignore b/web/cashtab/.gitignore index 99dcb0296..5678d4469 100644 --- a/web/cashtab/.gitignore +++ b/web/cashtab/.gitignore @@ -1,29 +1,35 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies /node_modules /.pnp .pnp.js # testing /coverage # production /build # misc .DS_Store .env.local .env.development.local .env.test.local .env.production.local npm-debug.log* yarn-debug.log* yarn-error.log* # Chrome Extension testing *.crx *.zip *.pem -dist/ \ No newline at end of file +dist/ + +# Ignore fbt generated files +.source_strings.json +.src_manifest.json +.enum_manifest.json +src/translatedFbts.json diff --git a/web/cashtab/config/paths.js b/web/cashtab/config/paths.js index f32378040..79eba27fd 100644 --- a/web/cashtab/config/paths.js +++ b/web/cashtab/config/paths.js @@ -1,86 +1,88 @@ const path = require('path'); const fs = require('fs'); const url = require('url'); // Make sure any symlinks in the project folder are resolved: // https://github.com/facebook/create-react-app/issues/637 const appDirectory = fs.realpathSync(process.cwd()); const resolveApp = relativePath => path.resolve(appDirectory, relativePath); const envPublicUrl = process.env.PUBLIC_URL; function ensureSlash(inputPath, needsSlash) { const hasSlash = inputPath.endsWith('/'); if (hasSlash && !needsSlash) { return inputPath.substr(0, inputPath.length - 1); } else if (!hasSlash && needsSlash) { return `${inputPath}/`; } else { return inputPath; } } const getPublicUrl = appPackageJson => envPublicUrl || require(appPackageJson).homepage; // We use `PUBLIC_URL` environment variable or "homepage" field to infer // "public path" at which the app is served. // Webpack needs to know it to put the right