Skip to content

Commit

Permalink
Merge branch 'master' into file-element-type
Browse files Browse the repository at this point in the history
  • Loading branch information
locks authored May 18, 2017
2 parents 9a82663 + c01b64b commit 5ae0606
Show file tree
Hide file tree
Showing 449 changed files with 11,757 additions and 9,190 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
blueprints/*/*files/**/*.js
dist/
tmp/
47 changes: 47 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
var fs = require('fs');
var path = require('path');

var options = {
root: true,
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
},
extends: 'eslint:recommended',
plugins: [
"ember-internal"
],
env: {
qunit: true,
},
globals: {
'expectAssertion': true,
'expectDeprecation': true,
'expectNoDeprecation': true,
'expectWarning': true,
'expectNoWarning': true,
'ignoreAssertion': true,
'ignoreDeprecation': true,

// A safe subset of "browser:true":
'window': true,
'document': true,
'setTimeout': true,
'clearTimeout': true,
'setInterval': true,
'clearInterval': true,

'Symbol': true,
'WeakMap': true,
},
rules: {
'ember-internal/require-yuidoc-access': 'error',
'ember-internal/no-const-outside-module-scope': 'error',

// temporarily disabled
'no-unused-vars': 'off',
'comma-dangle': 'off',
},
};

module.exports = options;
91 changes: 0 additions & 91 deletions .jscsrc

This file was deleted.

57 changes: 0 additions & 57 deletions .jshintrc

This file was deleted.

34 changes: 0 additions & 34 deletions .npmignore

This file was deleted.

29 changes: 16 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,23 @@ addons:

cache:
directories:
- $HOME/.yarn
- $HOME/.yarn-cache
- $HOME/.cache # includes bowers cache
- $HOME/.yarn-cache

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- "phantomjs --version"
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- |
phantomjs --version
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
sudo apt-get update -qq
sudo apt-get install -y -qq yarn
yarn --version
install:
- "yarn global add bower"
- "yarn install --prefer-offline"
- "bower install"
- |
yarn install
after_success:
- "./bin/publish_builds"
Expand Down Expand Up @@ -54,12 +57,12 @@ env:
I/BFT0MbnR6JVCZiPV7TCWPgY1gvgZ6TEEIKGqauDMUBdL8ZK6I='
- secure: e0yxVfwVW61d3Mi/QBOsY6Rfd1mZd3VXUd9xNRoz/fkvQJRuVwDe7oG3NOuJ4LZzvMw7BJ+zpDV9D8nKhAyPEEOgpkkMHUB7Ds83pHG4qSMzm4EAwBCadDLXCQirldz8dzN5FAqgGucXoj5fj/p2SKOkO6qWIZveGr8pdBJEG1E=
matrix:
- TEST_SUITE=each-package-tests
- TEST_SUITE=each-package-tests PUBLISH=true
- TEST_SUITE=built-tests EMBER_ENV=production DISABLE_JSCS=true DISABLE_JSHINT=true
- TEST_SUITE=old-jquery-and-extend-prototypes DISABLE_JSCS=true DISABLE_JSHINT=true
- TEST_SUITE=node DISABLE_JSCS=true DISABLE_JSHINT=true
- TEST_SUITE=blueprints
- TEST_SUITE=travis-browsers DISABLE_JSCS=true DISABLE_JSHINT=true
- TEST_SUITE=sauce
- TEST_SUITE=allow-backtracking-rerender ALLOW_BACKTRACKING=true DISABLE_PUBLISHING=true
- TEST_SUITE=each-package-tests BUILD_TYPE=alpha
- TEST_SUITE=allow-backtracking-rerender ALLOW_BACKTRACKING=true
- TEST_SUITE=each-package-tests BUILD_TYPE=alpha PUBLISH=true
Loading

0 comments on commit 5ae0606

Please sign in to comment.