From fc61c7381fad12662df16dbc3e7621c91b886f03 Mon Sep 17 00:00:00 2001 From: Alex Indigo Date: Mon, 24 Jun 2019 20:04:26 -0700 Subject: [PATCH 1/4] Switched to Travis Windows from Appveyor --- .travis.yml | 5 +++-- appveyor.yml | 22 ---------------------- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml index 1f75e5b..7cf751a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ node_js: os: - osx - linux +- windows install: - travis_retry npm install @@ -19,8 +20,8 @@ script: - uname -a - node --version - npm --version - - npm run ci-lint - - npm run ci-test + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then npm run ci-lint; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then npm run test; else npm run ci-test; fi - npm run check after_success: diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ab428f3..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,22 +0,0 @@ -environment: - matrix: - - nodejs_version: '4' - - nodejs_version: '6' - - nodejs_version: '8' - - nodejs_version: '10' - - nodejs_version: '12' -platform: - - x86 - - x64 -install: - - ps: Install-Product node $env:nodejs_version $env:platform - - npm -g install npm@2 - - set PATH=%APPDATA%\npm;%PATH% - - npm install -test_script: - - node --version - - npm --version - - npm run test -build: off -matrix: - fast_finish: true From e3d8628728f6e4817ab97deeed92f0c822661b89 Mon Sep 17 00:00:00 2001 From: Alex Indigo Date: Mon, 24 Jun 2019 21:36:38 -0700 Subject: [PATCH 2/4] Updated deps and readme --- Readme.md | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index 08c3dfe..b117722 100644 --- a/Readme.md +++ b/Readme.md @@ -8,7 +8,7 @@ The API of this library is inspired by the [XMLHttpRequest-2 FormData Interface] [![Linux Build](https://img.shields.io/travis/form-data/form-data/master.svg?label=linux:4.x-12.x)](https://travis-ci.org/form-data/form-data) [![MacOS Build](https://img.shields.io/travis/form-data/form-data/master.svg?label=macos:4.x-12.x)](https://travis-ci.org/form-data/form-data) -[![Windows Build](https://img.shields.io/appveyor/ci/alexindigo/form-data/master.svg?label=windows:4.x-12.x)](https://ci.appveyor.com/project/alexindigo/form-data) +[![Windows Build](https://img.shields.io/travis/form-data/form-data/master.svg?label=windows:4.x-12.x)](https://travis-ci.org/form-data/form-data) [![Coverage Status](https://img.shields.io/coveralls/form-data/form-data/master.svg?label=code+coverage)](https://coveralls.io/github/form-data/form-data?branch=master) [![Dependency Status](https://img.shields.io/david/form-data/form-data.svg)](https://david-dm.org/form-data/form-data) diff --git a/package.json b/package.json index 9937718..bbdc886 100644 --- a/package.json +++ b/package.json @@ -46,9 +46,9 @@ "devDependencies": { "browserify": "^13.1.1", "browserify-istanbul": "^2.0.0", - "coveralls": "^2.11.14", + "coveralls": "^3.0.4", "cross-spawn": "^4.0.2", - "eslint": "^3.9.1", + "eslint": "^6.0.1", "fake": "^0.2.2", "far": "^0.0.7", "formidable": "^1.0.17", From 508b626bf1b460d3733d3420dc1cfd001617f6ac Mon Sep 17 00:00:00 2001 From: Alex Indigo Date: Mon, 24 Jun 2019 21:45:58 -0700 Subject: [PATCH 3/4] Bump notion of modern node to node8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbdc886..dda264b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "posttest": "istanbul report lcov text", "lint": "eslint lib/*.js test/*.js test/integration/*.js", "report": "istanbul report lcov text", - "ci-lint": "is-node-modern 6 && npm run lint || is-node-not-modern 6", + "ci-lint": "is-node-modern 8 && npm run lint || is-node-not-modern 8", "ci-test": "npm run test && npm run browser && npm run report", "predebug": "rimraf coverage test/tmp", "debug": "verbose=1 ./test/run.js", From 65e78f5587dc09c95189dec37ec95af0de4991e1 Mon Sep 17 00:00:00 2001 From: mapleeit <522856232@qq.com> Date: Wed, 26 Jun 2019 10:26:33 +0800 Subject: [PATCH 4/4] chore: move @types/node to devDep --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9937718..fbc684b 100644 --- a/package.json +++ b/package.json @@ -38,12 +38,12 @@ "node": ">= 0.12" }, "dependencies": { - "@types/node": "^12.0.8", "asynckit": "^0.4.0", "combined-stream": "^1.0.6", "mime-types": "^2.1.12" }, "devDependencies": { + "@types/node": "^12.0.10", "browserify": "^13.1.1", "browserify-istanbul": "^2.0.0", "coveralls": "^2.11.14",