From 53e348c38806a8ab19f05e6a62e6cbfa68bc421d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Mon, 28 May 2018 21:01:34 -0400 Subject: [PATCH 1/4] Document usage with Yarn --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9e8bab3..9eb406e 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,18 @@ chai.use(require('./chai-immutable')); ### Node.js -Install via [npm](http://npmjs.org): +Install via [npm](http://npmjs.org) or [`yarn`](https://yarnpkg.com/en/): ```bash -npm install chai-immutable +npm install --save-dev chai-immutable +# or: +yarn add --dev chai-immutable ``` -⚠️ To use `chai-immutable` with Chai v4, you need to use `npm install chai-immutable@next` instead, until I am done with the v2 release of this plugin. I apologize for the inconvenience in the meantime. +⚠️ To use `chai-immutable` with Chai v4, you need to use +`npm install --save-dev chai-immutable@next` (or +`yarn add --dev chai-immutable@next`) instead, until I am done with the v2 +release of this plugin. I apologize for the inconvenience in the meantime. You can then use this plugin as any other Chai plugins: From a18d5f20378c490dcf2f4b678a157d33be884848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Mon, 28 May 2018 21:03:09 -0400 Subject: [PATCH 2/4] Make sure exact versions of dependencies are installed --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..1dab4ed --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +save-exact = true From 7eed255e87afbfaaef64c412aee667f11f4a8517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Mon, 28 May 2018 21:06:48 -0400 Subject: [PATCH 3/4] Use npm-run-all to run tests+lint, and make package.json not explicitly rely on npm --- .travis.yml | 5 ----- appveyor.yml | 4 +--- package.json | 7 ++++--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b32c242..1c86611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,6 @@ node_js: - 8 # EOL: December 2019 - 6 # EOL: April 2019 -script: -- npm run test-mocha -- npm run test-readme -- npm run lint - after_script: - npm run coveralls diff --git a/appveyor.yml b/appveyor.yml index 6ce2efe..a9d8e74 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,9 +23,7 @@ install: test_script: - node --version - npm --version - - npm run test-mocha - - npm run test-readme - - npm run lint + - npm run test # Don't actually build build: off diff --git a/package.json b/package.json index eb40010..28ed529 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ }, "scripts": { "lint": "eslint --ignore-path .gitignore . --report-unused-disable-directives", - "test": "npm run test-mocha; npm run test-readme; npm run lint", - "test-readme": "mocha --compilers md:fulky/md-compiler README.md", - "test-mocha": "nyc mocha", + "test": "run-s --continue-on-error test:* lint", + "test:readme": "mocha --compilers md:fulky/md-compiler README.md", + "test:mocha": "nyc mocha", "coveralls": "nyc report --reporter=text-lcov | coveralls" }, "repository": { @@ -51,6 +51,7 @@ "fulky": "0.2.0", "immutable": "3.8.2", "mocha": "5.2.0", + "npm-run-all": "4.1.3", "nyc": "11.8.0" } } From a29fc55434c724c580a4849fbabe747c5da5cbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Mon, 28 May 2018 21:07:57 -0400 Subject: [PATCH 4/4] Revert license year to initial year I learned recently that this value means the license applies as of that year, and is not meant to be updated every year. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 2153eab..5f8a8eb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Jérémie Astori +Copyright (c) 2015 Jérémie Astori Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal