Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
kazlauskis committed Apr 6, 2018
2 parents 9c90322 + 30e519e commit caf6638
Showing 330 changed files with 9,801 additions and 4,796 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"presets": [
"es2015"
"env"
],

"plugins": ["transform-exponentiation-operator", "array-includes"],
"env": {
"test": {
"plugins": [
95 changes: 24 additions & 71 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,88 +1,41 @@
{
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"env": {
"browser": true,
"mocha": true
},
"extends": ["airbnb-base", "prettier"],
"rules": {
"indent": ["error", 2, { "SwitchCase": 1 }],
"no-cond-assign": [2,"always"],
"no-constant-condition": 2,
"no-control-regex": 1,
"no-debugger": 1,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 1,
"no-ex-assign": 2,
"no-extra-boolean-cast": 1,
"no-extra-semi": 1,
"no-func-assign": 2,
"no-invalid-regexp": 1,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 1,
"no-obj-calls": 2,
"no-regex-spaces": 1,
"no-sparse-arrays": 1,
"no-unreachable": 2,
"use-isnan": 1,
"valid-typeof": 2,
"no-unexpected-multiline": 1,
"complexity": [1,20],
"default-case": 1,
"eqeqeq": [1,"smart"],
"guard-for-in": 1,
"no-alert": 1,
"no-caller": 2,
"no-div-regex": 1,
"no-else-return": 1,
"no-eval": 2,
"no-fallthrough": 2,
"no-octal": 2,
"no-redeclare": [2,{"builtinGlobals":true}],
"no-undef": 1,
"no-unused-vars": 0,
"brace-style": [1,"1tbs",{"allowSingleLine":true}],
"comma-spacing": [1,{"after":true}],
"comma-dangle": [2, "always-multiline"],
"consistent-this": [1,"self"],
"eol-last": 2,
"key-spacing": [2,{"afterColon":true, "mode": "minimum"}],
"max-nested-callbacks": [1,10],
"no-mixed-spaces-and-tabs": [2,"smart-tabs"],
"no-multiple-empty-lines": [2,{"max":2}],
"no-nested-ternary": 2,
"no-new-object": 2,
"no-trailing-spaces": [1,{"skipBlankLines":false}],
"prefer-const": 2,
"curly": 1,
"object-curly-spacing": [2, "always"]
"import/no-mutable-exports": 0,
"import/extensions": 0,
"no-case-declarations": 0,
"no-console": 0,
"no-plusplus": 0,
"no-param-reassign": 0, // TODO: switch back once fixed
"prefer-destructuring": 0, // TODO: switch back once fixed
"no-mutable-exports": 0,
"no-underscore-dangle": 0,
"no-unused-expressions": [2, {
"allowShortCircuit": true, // eg. a || a()
"allowTernary": true // eg. a ? b() : c()
}]
},
"overrides": [
{
"files": ["**/__tests__/*.js"],
"rules": {
"no-unused-expressions": 0
}
}
],
"globals": {
"sinon": true,
"before": true,
"beforeEach": true,
"after": true,
"afterEach": true,
"describe": true,
"it": true,
"expect": true,

"parseInt": true,

"cordova": true,
"StatusBar": true,
"splashscreen": true,
"Promise": true
"cordova": true
},
"settings": {
"import/resolver": {
"webpack": {
"config": "config/webpack.common.js"
"config": "other/webpack.common.js"
}
}
}
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,9 @@ before_script:
- sleep 3 # give xvfb some time to start
script:
- npm test
- npm run test:eslint
- npm run test:sauce
# - npm run build:cordova
notifications:
email: true
sudo: false
8 changes: 7 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -42,6 +42,13 @@ takes care of passing the ES6 code through Babel and pulling the code together
to make an *dist/main/app.js* file that is loaded in the *index.html*.


## Environmental Variables

The app's build process requires certain environmental variables to be present.
If any missing then the build will fail. If you want to bypass this and force the build you
can use `APP_FORCE=true` set to your environment. Alternatively, you can
set all your vars to an `.env` file in the root dir.

## Style Guide

The code is *[eslint](http://eslint.org)*'ed, to detect issues early on, so it is
@@ -158,5 +165,4 @@ Use XCode to build and upload
Run and upload binaries from cordova/dist
```bash
npm run build:cordova:android
grunt cordova:android:old
```
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ module.exports = function(grunt) {

require('load-grunt-config')(grunt, {
// path to task.js files, defaults to grunt dir
configPath: path.join(process.cwd(), 'config/build'),
configPath: path.join(process.cwd(), 'other/build'),
// auto grunt.initConfig
init: true,
});
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -93,6 +93,8 @@ npm start

### Cordova app

Building a cordova application requires cordova 7.1.0

- Initialize the project:

```bash
106 changes: 0 additions & 106 deletions config/build/aliases.js

This file was deleted.

6 changes: 0 additions & 6 deletions config/build/clean.js

This file was deleted.

16 changes: 0 additions & 16 deletions config/build/copy.js

This file was deleted.

Loading

0 comments on commit caf6638

Please sign in to comment.