Skip to content

Commit

Permalink
Merge branch 'release/0.5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyvion committed Mar 1, 2019
2 parents d62569d + 15976c8 commit 857bdeb
Show file tree
Hide file tree
Showing 94 changed files with 11,145 additions and 4,177 deletions.
7 changes: 7 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"exclude": "node_modules/**",
"presets": [
"@babel/preset-flow"
],
"sourceMap": false
}
35 changes: 35 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module.exports = {
"parser": "babel-eslint",
"plugins": [
"flowtype"
],
"env": {
"browser": true,
"es6": true
},
"extends": "plugin:flowtype/recommended",
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
},
"rules": {
"indent": [
"error",
"tab",
{ "SwitchCase": 1 }
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
]
},
"settings": {
"flowtype": {
"onlyFilesWithFlowAnnotation": false
}
}
};
4 changes: 4 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[include]

[ignore]
.*/node_modules/flow-bin
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/.sass-cache
/assets/generated
/assets/removeFlow
/dist
/nbproject/private
/node_modules
Expand Down
152 changes: 0 additions & 152 deletions .jscsrc

This file was deleted.

31 changes: 0 additions & 31 deletions .jshintrc

This file was deleted.

32 changes: 23 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
language: node_js
node_js:
- "4.7.0"
before_install:
- npm install -g grunt-cli
- rvm install 2.4.1
- gem install sass --version "=3.4.23"
- gem install compass --version "=1.0.3"
- 8.4.0
before_install:
- npm install -g grunt-cli
- rvm install 2.4.2
- gem install sass --version "=3.4.25"
- gem install compass --version "=1.0.3"
install:
- npm update -g
- npm install
script: grunt build
- npm update -g
- npm install
script:
- grunt build
- npm run print-userscript-banner
deploy:
provider: releases
api_key:
secure: UfVMZo8geJjIw3p9p2Iw5LDXWXVcJKNBkAam8PDDWlqprPhRuHsvvvev5BGchjZ8mlr/3R2poYn+6KXWqiGNh/1/4vEx1GCeo9/Y7IdZw4Zk11Z0rZIsg0G8VyQidLwEJC/g3y5INV3RkHmg2ux5qHpgWXVaaVInyPgHEYxoVeYtGb1QRQfu45axLjxhT6PbGjSzQ9oa6kE5+mR+GZAfr4KdiVXYVfN+VFF75KMh8swoRUOtxX5ED+mblC83ar25BHUCSwDvkfMZgNJHziTI0KzIJHSoxAZnso14cx6/BWcRW3chsU/Eh5mXT3Z94iGIgrTTNKjq6nDC/HJuRMwVKfMGSkQBOpAtKEGpSusLOsluOw1XVRytnkIXEE5+CnQNS8J0GqKUU9Ea47EScH+VW4xUmWolyGDuYjZC0tH2GFhxcAXDUFMbCxTwVNIuoph7nokxbYAPgGc4g0WeI/fNJ0szHTw9mGFbWXFh4kWj0bCEcKwPBkgrN18n7l1EiM7uR221jUPjqJihS5hiyVyBsjzxefS/lY1+9C0Fb0tBRMWE/jEqgh1LVA5ir8LiRlV3FxHdT04ebR6y5aq5e1A8Xfu+z72aPi8ZmGz4hdU4VHIou6VzzzGuPp9lnQx5UEZ+nvBAPeoprcXG0HV9CwaJa3aStPdSm8WSJxNHdyMUQdQ=
file:
- dist/qc-ext.min.user.js
- dist/qc-ext.user.js
- dist/qc-ext.meta.js
skip_cleanup: true
on:
repo: Questionable-Content-Extensions/client
tags: true
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"javascript.validate.enable": false
}
Loading

0 comments on commit 857bdeb

Please sign in to comment.