Skip to content

Commit

Permalink
Merge pull request #6 from skedify/develop
Browse files Browse the repository at this point in the history
release/next
  • Loading branch information
RobinMalfait authored Jan 14, 2019
2 parents 382435a + 15e5d18 commit b8ab701
Show file tree
Hide file tree
Showing 17 changed files with 10,775 additions and 196 deletions.
12 changes: 12 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"sourceRoot": "src",
"sourceType": "module",
"filenameRelative": "js/index.js",
"sourceMaps": "inline",
"presets": [
[
"env"
]
],
"plugins": []
}
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ root = true
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
trim_trailing_whitespace = true
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"env": {
"browser": true
"browser": true,
"jest": true
},
"parserOptions": {
"ecmaVersion": 6,
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
.sass-cache
node_modules/
node_modules/
coverage
15 changes: 11 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
language: node_js
cache:
directories:
- $HOME/.npm
notifications:
email: false
node_js:
- "6.6"
- "10"
before_script:
- npm install -g gulp karma-cli
- npm install
- npm audit --only=prod --audit-level=critical
script:
- npm test
- npm run test
branches:
except:
- /^v\d+\.\d+\.\d+$/
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"ignore": [
"src/",
"tests/",
"test/",
"gulpfile.js",
"node_modules",
"**/.*",
Expand Down
2 changes: 1 addition & 1 deletion dist/css/imagecrop.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/imagecrop_white.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/dist/imagecrop.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/dist/imagecrop_white.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
moduleDirectories : ['node_modules'],
testMatch : [
'<rootDir>/src/**/__tests__/**/*.js?(x)',
'<rootDir>/src/**/?(*.)(spec|test).js?(x)',
],
testPathIgnorePatterns : ['<rootDir>/node_modules/'],
collectCoverageFrom : ['src/**/*.js'],
testEnvironment : 'jsdom',
coverageDirectory : './coverage/',
collectCoverage : true
};
78 changes: 0 additions & 78 deletions karma.conf.js

This file was deleted.

Loading

0 comments on commit b8ab701

Please sign in to comment.