From 5152f16a30f864bc6f322ff9e7f2c46166858dc3 Mon Sep 17 00:00:00 2001 From: Xavier Damman Date: Wed, 15 Mar 2017 17:29:29 -0400 Subject: [PATCH 1/4] Added Open Collective to README.md and in postinstall --- README.md | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++-- package.json | 11 ++++++-- 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c77afe423..7b00d3c6f 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ +[![OpenCollective Backers](https://opencollective.com/fine-uploader/backers/badge.svg)](#backers) +[![OpenCollective Sponsors](https://opencollective.com/fine-uploader/sponsors/badge.svg)](#sponsors) [![Build Status](https://travis-ci.org/FineUploader/fine-uploader.svg?branch=master)](https://travis-ci.org/FineUploader/fine-uploader) [![npm](https://img.shields.io/npm/v/fine-uploader.svg)](https://www.npmjs.com/package/fine-uploader) [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE) @@ -81,8 +83,82 @@ To build, run the tests & linter: `npm test` (you'll need Firefox installed loca - Follow the [Git Flow][git-flow] branching strategy. -*Fine Uploader is a code library sponsored by [Widen Enterprises, Inc.](http://www.widen.com/)* - [angular-commit]: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit [git-flow]: http://nvie.com/posts/a-successful-git-branching-model/ [issues]: https://github.com/FineUploader/fine-uploader/issues + + +# Backers + +Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/fine-uploader#backer)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# Sponsors + +*Fine Uploader is a code library sponsored by [Widen Enterprises, Inc.](http://www.widen.com/)* + +Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/fine-uploader#sponsor)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index b085c97db..e63179dc2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "fine-uploader", "title": "Fine Uploader", "main": "lib/traditional.js", - "types" : "typescript/fine-uploader.d.ts", + "types": "typescript/fine-uploader.d.ts", "version": "5.14.1", "description": "Multiple file upload plugin with progress-bar, drag-and-drop, direct-to-S3 & Azure uploading, client-side image scaling, preview generation, form support, chunking, auto-resume, and tons of other features.", "keywords": [ @@ -56,6 +56,7 @@ "karma-spec-reporter": "0.0.30", "mocha": "3.2.0", "node-static": "0.7.9", + "opencollective-postinstall": "^1.0.9", "pica": "latest", "uglify-js": "2.8.3" }, @@ -63,6 +64,12 @@ "build": "make clean; make build-all-ui", "lint": "make lint", "start": "make start-local-dev", - "test": "make lint && make test" + "test": "make lint && make test", + "postinstall": "./node_modules/.bin/opencollective-postinstall" + }, + "collective": { + "type": "opencollective", + "url": "https://opencollective.com/fine-uploader", + "logo": "https://opencollective.com/opencollective/logo.txt" } } From 0fde893ce853762b2ca25d997d768f8357917d1f Mon Sep 17 00:00:00 2001 From: Xavier Damman Date: Thu, 16 Mar 2017 14:19:01 -0400 Subject: [PATCH 2/4] making sure we don't return an error on postinstall when devDependencies are not installed --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e63179dc2..2530ce030 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "karma-spec-reporter": "0.0.30", "mocha": "3.2.0", "node-static": "0.7.9", - "opencollective-postinstall": "^1.0.9", + "opencollective-postinstall": "^1.0.10", "pica": "latest", "uglify-js": "2.8.3" }, @@ -65,7 +65,7 @@ "lint": "make lint", "start": "make start-local-dev", "test": "make lint && make test", - "postinstall": "./node_modules/.bin/opencollective-postinstall" + "postinstall": "./node_modules/.bin/opencollective-postinstall || exit 0" }, "collective": { "type": "opencollective", From c0de2d4ca6877d1b1ea2a5411b726082c3097ece Mon Sep 17 00:00:00 2001 From: Xavier Damman Date: Thu, 16 Mar 2017 15:32:36 -0400 Subject: [PATCH 3/4] using a version compatible with old node 5.x for your CI env --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2530ce030..fcd7dd428 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "karma-spec-reporter": "0.0.30", "mocha": "3.2.0", "node-static": "0.7.9", - "opencollective-postinstall": "^1.0.10", + "opencollective-postinstall": "^1.0.11", "pica": "latest", "uglify-js": "2.8.3" }, From f98afd2493b4fd501711557f1c3dae9788a2bc2e Mon Sep 17 00:00:00 2001 From: Xavier Damman Date: Tue, 21 Mar 2017 15:02:46 -0400 Subject: [PATCH 4/4] using newest version that checks for inquirer before running setup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fcd7dd428..cc7722242 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "karma-spec-reporter": "0.0.30", "mocha": "3.2.0", "node-static": "0.7.9", - "opencollective-postinstall": "^1.0.11", + "opencollective-postinstall": "^1.0.12", "pica": "latest", "uglify-js": "2.8.3" },