Skip to content

Commit

Permalink
Upgraded to meanjs.org 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hvpulok committed Dec 3, 2016
1 parent b4b34d1 commit b2eda76
Show file tree
Hide file tree
Showing 215 changed files with 7,720 additions and 4,805 deletions.
42 changes: 0 additions & 42 deletions .bluemix/pipeline.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .bowerrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"directory": "public/lib"
"directory": "public/lib",
"interactive": false
}
10 changes: 0 additions & 10 deletions .cfignore

This file was deleted.

4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
bower_components
.tmp
.env
12 changes: 6 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ root = true
end_of_line = lf
insert_final_newline = true

# Standard at: https://github.com/felixge/node-style-guide
[**.js, **.json]
# Standard at: https://github.com/felixge/node-style-guide
[**.{js,json}]
trim_trailing_whitespace = true
indent_style = space
indent_size = 2
Expand All @@ -24,7 +24,7 @@ space_after_anonymous_functions = true
spaces_in_brackets = false

# No Standard. Please document a standard if different from .js
[**.yml, **.css]
[**.{yml,css}]
trim_trailing_whitespace = true
indent_style = tab

Expand All @@ -37,12 +37,12 @@ indent_size = 2
[**.md]
indent_style = tab

# Standard at:
# Standard at:
[Makefile]
indent_style = tab

# The indentation in package.json will always need to be 2 spaces
# https://github.com/npm/npm/issues/4718
[package.json, bower.json]
[{package, bower}.json]
indent_style = space
indent_size = 2
indent_size = 2
37 changes: 0 additions & 37 deletions .eslintrc

This file was deleted.

74 changes: 74 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
module.exports = {
extends: [
'airbnb/legacy'
],
rules: {
camelcase: 0,
'comma-dangle': [2, 'never'],
'comma-spacing': [2, { before: false, after: true }],
'consistent-return': 0,
curly: 0,
'default-case': 0,
eqeqeq: [2, 'smart'],
'func-names': 0,
'guard-for-in': 2,
indent: [2, 2, { SwitchCase: 1 }],
'key-spacing': [2, { beforeColon: false, afterColon: true }],
'keyword-spacing': [2, { before: true, after: true }],
'max-len': 0,
'new-cap': [2, { newIsCapExceptions: ['acl.memoryBackend', 'acl'] }],
'no-bitwise': 0,
'no-caller': 2,
'no-console': 0,
'no-else-return': 0,
'no-empty-class': 0,
'no-multi-spaces': 2,
'no-param-reassign': 0,
'no-shadow': 0,
'no-spaced-func': 2,
'no-throw-literal': 2,
'no-trailing-spaces': ["error", { "skipBlankLines": true }],
'no-undef': 2,
'no-unneeded-ternary': 2,
'no-unreachable': 2,
'no-underscore-dangle': 0,
'no-unused-expressions': 0,
'no-unused-vars': 0,
'no-use-before-define': [1, 'nofunc'],
'no-var': 0,
'object-curly-spacing': [2, 'always'],
'one-var': [0, 'never'],
'one-var-declaration-per-line': [2, 'always'],
'padded-blocks': 0,
'space-before-function-paren': 0,
'space-in-parens': [2, 'never'],
'spaced-comment': [2, 'always'],
strict: 0,
'quote-props': 0,
quotes: [1, 'single'],
'wrap-iife': [2, 'outside'],
'vars-on-top': 0
},
env: {
node: true,
es6: true,
browser: true,
jasmine: true,
mocha: true,
jquery: true
},
globals: {
angular: true,
by: true,
browser: true,
element: true,
inject: true,
io: true,
moment: true,
Modernizr: true,
Promise: true,
__TESTING__: true,
_: false,
ApplicationConfiguration: true
}
};
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,22 @@ app/tests/coverage/
.bower-*/
.idea/
coverage/
.coveralls.yml

# MEAN.js app and assets
# ======================
public/dist/
uploads
modules/users/client/img/profile/uploads
config/env/local.js
config/env/local-*.js
*.pem

# Compiled less and sass files
# ============================
modules/*/client/scss/*.css
modules/*/client/less/*.css

# Ignoring MEAN.JS's gh-pages branch for documenation
_site/

Expand Down
27 changes: 0 additions & 27 deletions .jshintrc

This file was deleted.

23 changes: 16 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
language: node_js
sudo: false
node_js:
- 0.10
- 0.12
- 4
- 5
- 6
- 7
matrix:
allow_failures:
- node_js: 7
os:
- linux
- centos
- macosx
- windows
# NodeJS v4 requires gcc 4.8
env:
- NODE_ENV=travis CXX="g++-4.8" CC="gcc-4.8"
matrix:
allow_failures:
- node_js: 5
services:
- mongodb
# gcc 4.8 requires ubuntu-toolchain-r-test
Expand All @@ -26,15 +31,19 @@ before_install:
- gem update --system
- gem install sass --version "=3.3.7"
- npm i nsp -g
- npm i snyk -g
- npm install protractor
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- 'node_modules/protractor/bin/webdriver-manager update --standalone --firefox'
- 'node_modules/protractor/bin/webdriver-manager start 2>&1 &'
- sleep 3
before_script:
- snyk test
after_script:
- nsp audit-package
- grunt coverage
- nsp check
- gulp test:coverage
- node_modules/.bin/lcov-result-merger 'coverage/**/lcov.info' | node_modules/coveralls/bin/coveralls.js
notifications:
webhooks:
urls:
Expand Down
Loading

0 comments on commit b2eda76

Please sign in to comment.