Skip to content

Commit

Permalink
Merge branch 'master' into feature/rrggbbaa
Browse files Browse the repository at this point in the history
* master: (26 commits)
  Fix output quoting.
  Rework the README to allow the examples to be validated.
  New build
  Fix rollup config
  Switch from rollup-plugin-commonjs to @rollup/plugin-commonjs
  Replace uglify-js with rollup-plugin-terser, update rollup, simplify build setup
  Test on more node.js versions, lint and build on 14.
  Avoid no-prototype-builtins error
  eslint --fix . && prettier --write '**/*.js'
  Replace jshint with eslint
  prettier --write '**/*.{js,md}'
  Add prettier setup
  Try building on node.js 12 always, and only run the tests on the Travis-provided one
  Rename travis script to ci
  Drop package-lock.json, disable save-exact in .npmrc
  Bump lodash from 4.17.11 to 4.17.19
  Make npm build script possible to run on windows. refs #42 (comment)
  3.1.0
  Add luminance, contrast and darkness values
  Update author's email
  ...
  • Loading branch information
papandreou committed Nov 27, 2022
2 parents 7945c71 + 50fb015 commit b68d1d3
Show file tree
Hide file tree
Showing 52 changed files with 1,660 additions and 1,392 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -16,7 +16,7 @@ insert_final_newline = true

; Indentation
indent_style = space
indent_size = 4
indent_size = 2

[Makefile]
indent_style = tab
6 changes: 6 additions & 0 deletions .eslintignore
@@ -0,0 +1,6 @@
/node_modules/
/demo/
/slides/
/one-color-all.js
/one-color.js
/coverage/
12 changes: 12 additions & 0 deletions .eslintrc
@@ -0,0 +1,12 @@
{
"extends": ["standard", "prettier", "prettier/standard"],
"plugins": ["import", "mocha"],
"env": {
"mocha": true
},
"rules": {
"mocha/no-exclusive-tests": "error",
"mocha/no-nested-tests": "error",
"mocha/no-identical-title": "error"
}
}
6 changes: 0 additions & 6 deletions .jshintignore

This file was deleted.

78 changes: 0 additions & 78 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .npmrc
@@ -1 +1 @@
save-exact=true
package-lock = false
6 changes: 6 additions & 0 deletions .prettierignore
@@ -0,0 +1,6 @@
/node_modules/
/demo/
/slides/
/one-color-all.js
/one-color.js
/coverage/
3 changes: 3 additions & 0 deletions .prettierrc
@@ -0,0 +1,3 @@
{
"singleQuote": true
}
32 changes: 23 additions & 9 deletions .travis.yml
Expand Up @@ -3,14 +3,28 @@ services:
language: node_js
cache:
directories:
- node_modules
- node_modules
node_js:
- "0.10"
- "0.12"
- "1"
- "2"
- "3"
- "4"
- '0.12'
- '1'
- '2'
- '3'
- '4'
- '6'
- '8'
- '10'
- '12'
- '14'
- node

script: "npm run-script travis"
after_success: "<coverage/lcov.info ./node_modules/coveralls/bin/coveralls.js"
matrix:
include:
- name: Lint
node_js: 14
script: npm run lint
- name: Documentation
node_js: 14
script: npm run test:documentation

script: '(nvm i 14 && npm run build) && npm run ci:test'
after_success: '<coverage/lcov.info ./node_modules/coveralls/bin/coveralls.js'

0 comments on commit b68d1d3

Please sign in to comment.