From ba948efa29e901aae59222a4eb83ea02a42f261f Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Mon, 17 Oct 2016 20:07:41 -0400 Subject: [PATCH] build(npm): make package.json valid for fresh clones --- app-template/apply.js | 2 +- app-template/package.json | 14 +++-- package.json | 121 ++++---------------------------------- 3 files changed, 22 insertions(+), 115 deletions(-) diff --git a/app-template/apply.js b/app-template/apply.js index 7ecad93d8..b02b14c80 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -17,7 +17,7 @@ var templates = { // 'bower.json': '/', }; var configDir = process.argv[2] || 'copay'; -var JSONheader = ' { ' + "\n" + ' "//":"PLEASE! Do not edit this file directly",' + "\n" + ' "//":" Modify it at app-template/", ' + "\n"; +var JSONheader = ' { ' + "\n" + ' "//":"Changes to this file will be overwritten",' + "\n" + ' "//":" Modify it in the app-template directory", ' + "\n"; var MakefileHeader = "# PLEASE! Do not edit this file directly \n# Modify it at app-template/\n"; diff --git a/app-template/package.json b/app-template/package.json index 4da50b10e..fa24526d1 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -75,11 +75,12 @@ "shelljs": "^0.3.0" }, "scripts": { - "preinstall": "bower install && npm i fs-extra", - "postinstall": "npm run apply:bitpay && cordova prepare", + "preinstall": "bower install && npm install fs-extra", + "postinstall": "echo && echo \"To finish, choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", "start:android": "npm run build:www && npm run build:android && npm run run:android", + "start:desktop": "grunt desktop", "watch": "grunt watch", "build:www": "grunt", "build:www-release": "grunt prod", @@ -89,15 +90,16 @@ "build:android-release": "cordova prepare android && cordova build android --release", "open:ios": "open platforms/ios/*.xcodeproj", "open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android", - "final:www": "npm run clean-all && npm run build:www-release", + "final:www": "npm run build:www-release", "final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios", "final:android": "npm run final:www && npm run build:android-release && npm run run:android", + "final:desktop": "grunt desktop", "run:android": "cordova run android --device", "log:android": "adb logcat | grep chromium", - "apply:copay": "cd app-template && node apply.js copay", - "apply:bitpay": "cd app-template && node apply.js bitpay", + "apply:copay": "cd app-template && node apply.js copay && cordova prepare", + "apply:bitpay": "cd app-template && node apply.js bitpay && cordova prepare", "test": "./node_modules/.bin/grunt test-coveralls", - "clean": "trash platforms && trash plugins && npm run postinstall", + "clean": "trash platforms && trash plugins && cordova prepare", "clean-all": "git clean -dfx && npm install" }, "devDependencies": { diff --git a/package.json b/package.json index 3065d287c..8f5f3d3db 100644 --- a/package.json +++ b/package.json @@ -1,113 +1,18 @@ - { - "//":"PLEASE! Do not edit this file directly", - "//":" Modify it at app-template/", - - "name": "bitpay", - "description": "Secure Bitcoin Wallet", - "author": "BitPay", - "version": "0.14.0", - "keywords": [ - "bitcoin", - "wallet", - "bitpay", - "copay", - "multisignature", - "bitcore" - ], - "main": "www/index.html", - "window": { - "title": "BitPay - Secure Bitcoin Wallet", - "icon": "www/img/icon-128.png", - "toolbar": false, - "show": true, - "visible": true, - "resizable": true, - "frame": true, - "width": 400, - "height": 650, - "position": "center", - "fullscreen": false - }, - "webkit": { - "page-cache": false, - "java": false, - "plugin": false - }, - "dom_storage_quota": 200, - "id": "jid1-x7bV5evAaI1P9Q", - "homepage": "https://bitpay.com", - "license": "MIT", - "repository": { - "url": "git://github.com/bitpay/bitpay-wallet.git", - "type": "git" - }, - "bugs": { - "url": "https://github.com/bitpay/bitpay-wallet/issues" +{ + "name": "distribution-not-selected", + "description": "Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.", + "primary-package-json": "See the tempate in app-template/package.json", + "scripts": { + "postinstall": "npm run apply:copay && npm install", + "apply:copay": "cd app-template && node apply.js copay", + "apply:bitpay": "cd app-template && node apply.js bitpay" }, "dependencies": { - "adm-zip": "^0.4.7", - "angular": "1.4.6", - "angular-mocks": "1.4.10", - "bezier-easing": "^2.0.3", - "bhttp": "^1.2.1", - "bitauth": "^0.3.2", - "bitcore-wallet-client": "4.3.2", - "bower": "^1.7.9", - "chai": "^3.5.0", - "cordova-android": "5.1.1", - "cordova-custom-config": "^3.0.5", - "cordova-plugin-qrscanner": "^2.3.1", - "coveralls": "^2.11.9", - "express": "^4.11.2", - "fs": "0.0.2", - "fs-extra": "^0.30.0", - "grunt-angular-gettext": "^2.2.3", - "grunt-browserify": "^5.0.0", - "grunt-cli": "^1.2.0", - "grunt-contrib-compress": "^1.3.0", - "grunt-contrib-concat": "^1.0.1", - "grunt-contrib-copy": "^1.0.0", - "grunt-contrib-uglify": "^2.0.0", - "grunt-contrib-watch": "^1.0.0", - "grunt-exec": "^1.0.0", - "grunt-nw-builder": "^2.0.3", - "grunt-sass": "^1.2.0", - "load-grunt-tasks": "^3.5.0", - "mocha": "^2.4.5", - "phantomjs-prebuilt": "^2.1.7", - "shelljs": "^0.3.0" + "fs-extra": "^0.30.0" }, - "scripts": { - "preinstall": "bower install && npm i fs-extra", - "postinstall": "npm run apply:bitpay && cordova prepare", - "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", - "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", - "start:android": "npm run build:www && npm run build:android && npm run run:android", - "watch": "grunt watch", - "build:www": "grunt", - "build:www-release": "grunt prod", - "build:ios": "cordova prepare ios && cordova build ios --debug", - "build:android": "cordova prepare android && cordova build android --debug", - "build:ios-release": "cordova prepare ios && cordova build ios --release", - "build:android-release": "cordova prepare android && cordova build android --release", - "open:ios": "open platforms/ios/*.xcodeproj", - "open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android", - "final:www": "npm run clean-all && npm run build:www-release", - "final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios", - "final:android": "npm run final:www && npm run build:android-release && npm run run:android", - "run:android": "cordova run android --device", - "log:android": "adb logcat | grep chromium", - "apply:copay": "cd app-template && node apply.js copay", - "apply:bitpay": "cd app-template && node apply.js bitpay", - "test": "./node_modules/.bin/grunt test-coveralls", - "clean": "trash platforms && trash plugins && npm run postinstall", - "clean-all": "git clean -dfx && npm install" - }, - "devDependencies": { - "cordova": "^6.3.1", - "grunt": "^1.0.1", - "ionic": "^2.1.0", - "trash-cli": "^1.4.0", - "lodash": "^4.3.0" + "license": "MIT", + "repository": { + "url": "git://github.com/bitpay/copay.git", + "type": "git" } }