Skip to content

Commit

Permalink
Merge pull request #274 from mike-north/greenkeeper/initial
Browse files Browse the repository at this point in the history
Update dependencies to enable Greenkeeper 🌴
  • Loading branch information
mike-north committed Jan 3, 2018
2 parents 9a304ce + 8a2406e commit abd9541
Show file tree
Hide file tree
Showing 72 changed files with 16,489 additions and 1,646 deletions.
44 changes: 42 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,53 @@ module.exports = {
ecmaVersion: 2017,
sourceType: 'module'
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember-suave/recommended'
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
}
},
overrides: [
// node files
{
files: [
'index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
},

// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true
}
}
]
};
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -14,6 +14,11 @@
/coverage/*
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
*.sublime-workspace

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
lcov.dat
7 changes: 6 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
32 changes: 22 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
---
language: node_js
node_js:
- "6"
- "4"

sudo: false
dist: trusty

addons:
chrome: stable

cache:
yarn: true

env:
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-release
- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
global:
# See https://git.io/vdao3 for details.
- JOBS=1
matrix:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
Expand All @@ -24,21 +35,22 @@ matrix:
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- yarn global add phantomjs-prebuilt
- yarn global add greenkeeper-lockfile@1
- yarn global add bower
- phantomjs --version

before_script: greenkeeper-lockfile-update

after_script: greenkeeper-lockfile-upload

install:
- yarn install
- bower install
- yarn install --no-lockfile --non-interactive

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
- yarn lint:js
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

after_success:
# Remove the downloaded copy of phantomJS
Expand Down
5 changes: 2 additions & 3 deletions addon/components/-base-child-component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Ember from 'ember';

const { Component, computed } = Ember;
import Component from '@ember/component';
import { computed } from '@ember/object';

export default Component.extend({
childComponentClassName: null,
Expand Down
11 changes: 3 additions & 8 deletions addon/components/-base-input-component.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import Ember from 'ember';
import { isPresent } from '@ember/utils';
import { observer, computed } from '@ember/object';
import { run } from '@ember/runloop';
import BaseComponent from './-base-toplevel-component';

const {
computed,
isPresent,
observer,
run
} = Ember;

export default BaseComponent.extend({
primaryClassName: 'textfield',
type: 'text',
Expand Down
5 changes: 2 additions & 3 deletions addon/components/-base-toggle-component.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import Ember from 'ember';
import { deprecate } from '@ember/application/deprecations';
import { computed } from '@ember/object';
import BaseToplevelComponent from './-base-toplevel-component';
import RippleSupport from '../mixins/ripple-support';
import ClickActionSupport from '../mixins/click-action-support';
import layout from '../templates/components/mdl-checkbox';

const { deprecate, computed } = Ember;

export default BaseToplevelComponent.extend(RippleSupport, ClickActionSupport, {
tagName: 'label',
layout,
Expand Down
5 changes: 2 additions & 3 deletions addon/components/-base-toplevel-component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Ember from 'ember';

const { computed, Component } = Ember;
import { computed } from '@ember/object';
import Component from '@ember/component';

export default Component.extend({
primaryClassName: null,
Expand Down
4 changes: 1 addition & 3 deletions addon/components/mdl-button.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import Ember from 'ember';
import { computed } from '@ember/object';
import BaseComponent from './-base-toplevel-component';
import RippleSupport from '../mixins/ripple-support';
import ClickActionSupport from '../mixins/click-action-support';
import layout from '../templates/components/mdl-button';

const { computed } = Ember;

export default BaseComponent.extend(RippleSupport, ClickActionSupport, {
primaryClassName: 'button',
tagName: 'button',
Expand Down
4 changes: 1 addition & 3 deletions addon/components/mdl-card-actions.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Ember from 'ember';
import Component from '@ember/component';
import layout from '../templates/components/mdl-card-actions';

const { Component } = Ember;

export default Component.extend({
classNames: ['mdl-card__actions mdl-card--border'],
layout
Expand Down
4 changes: 1 addition & 3 deletions addon/components/mdl-card-buttons.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Ember from 'ember';
import Component from '@ember/component';
import layout from '../templates/components/mdl-card-buttons';

const { Component } = Ember;

export default Component.extend({
classNames: ['mdl-card__menu'],
layout
Expand Down
5 changes: 2 additions & 3 deletions addon/components/mdl-footer-dropdown-section.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import Ember from 'ember';
import Component from '@ember/component';
import { A } from '@ember/array';
import layout from '../templates/components/mdl-footer-dropdown-section';
import MdlMiniFooter from './mdl-mini-footer';
import MdlMegaFooter from './mdl-mega-footer';
import ChildComponentSupport from 'ember-composability/mixins/child-component-support';

const { Component, A } = Ember;

export default Component.extend(ChildComponentSupport, {
_parentComponentTypes: A([MdlMegaFooter, MdlMiniFooter]),
layout,
Expand Down
4 changes: 1 addition & 3 deletions addon/components/mdl-footer-linklist.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import Ember from 'ember';
import { A } from '@ember/array';
import MdlMiniFooter from './mdl-mini-footer';
import MdlMegaFooter from './mdl-mega-footer';
import BaseChildComponent from './-base-child-component';
import ChildComponentSupport from 'ember-composability/mixins/child-component-support';
import layout from '../templates/components/mdl-footer-linklist';

const { A } = Ember;

export default BaseChildComponent.extend(ChildComponentSupport, {
_parentComponentTypes: A([MdlMegaFooter, MdlMiniFooter]),
layout,
Expand Down
5 changes: 2 additions & 3 deletions addon/components/mdl-footer-section.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import Ember from 'ember';
import { computed } from '@ember/object';
import { A } from '@ember/array';
import MdlMiniFooter from './mdl-mini-footer';
import MdlMegaFooter from './mdl-mega-footer';
import ChildComponentSupport from 'ember-composability/mixins/child-component-support';
import BaseChildComponent from './-base-child-component';
import layout from '../templates/components/mdl-footer-section';

const { computed, A } = Ember;

export default BaseChildComponent.extend(ChildComponentSupport, {
_parentComponentTypes: A([MdlMegaFooter, MdlMiniFooter]),
layout,
Expand Down
4 changes: 1 addition & 3 deletions addon/components/mdl-icon.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import Ember from 'ember';
import Component from '@ember/component';
import BadgeSupport from '../mixins/badge-support';
import layout from '../templates/components/mdl-icon';

const { Component } = Ember;

export default Component.extend(BadgeSupport, {
classNames: ['icon', 'material-icons'],
layout
Expand Down
5 changes: 2 additions & 3 deletions addon/components/mdl-menu-item.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import Ember from 'ember';
import { A } from '@ember/array';
import ChildComponentSupport from 'ember-composability/mixins/child-component-support';
import BaseChildComponent from './-base-child-component';
import MdlMenu from './mdl-menu';
import layout from '../templates/components/mdl-menu-item';

const { A } = Ember;

export default BaseChildComponent.extend(ChildComponentSupport, {
layout,
tagName: 'li',
_parentComponentTypes: A([MdlMenu]),
_childComponentClassStringDelimeter: '__',
childComponentClassName: 'item',
click() {
// eslint-disable-next-line
this.sendAction('action', this);
}
});
5 changes: 2 additions & 3 deletions addon/components/mdl-menu.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import Ember from 'ember';
import Component from '@ember/component';
import { computed } from '@ember/object';
import ParentComponentSupport from 'ember-composability/mixins/parent-component-support';
import layout from '../templates/components/mdl-menu';

const { Component, computed } = Ember;

export default Component.extend(ParentComponentSupport, {
layout,
_primaryClassNameString: 'mdl-menu',
Expand Down
5 changes: 2 additions & 3 deletions addon/components/mdl-nav-item.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import Ember from 'ember';
import Component from '@ember/component';
import { A } from '@ember/array';
import ChildComponentSupport from 'ember-composability/mixins/child-component-support';
import ClickActionSupport from '../mixins/click-action-support';
import MdlNav from './mdl-nav';

const { Component, A } = Ember;

export default Component.extend(ChildComponentSupport, ClickActionSupport, {
_parentComponentTypes: A([MdlNav]),
inDrawer: true,
Expand Down
17 changes: 5 additions & 12 deletions addon/components/mdl-nav.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
import Ember from 'ember';
/* eslint-disable ember/use-brace-expansion */
import { A } from '@ember/array';
import { computed } from '@ember/object';
import { oneWay } from '@ember/object/computed';
import { next } from '@ember/runloop';
import ParentComponentSupport from 'ember-composability/mixins/parent-component-support';
import BaseComponent from './-base-toplevel-component';
import layout from '../templates/components/mdl-nav';

const {
A,
computed,
computed: {
oneWay
},
run: {
next
}
} = Ember;

export default BaseComponent.extend(ParentComponentSupport, {
primaryClassName: 'layout',
composableChildrenDebounceTime: 1,
Expand Down
5 changes: 2 additions & 3 deletions addon/components/mdl-progress.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import Ember from 'ember';
import { empty } from '@ember/object/computed';
import { computed } from '@ember/object';
import BaseComponent from './-base-toplevel-component';
import layout from '../templates/components/mdl-progress';

const { computed: { empty }, computed } = Ember;

export default BaseComponent.extend({
primaryClassName: 'progress',
classNameBindings: [
Expand Down
4 changes: 1 addition & 3 deletions addon/components/mdl-radio.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import Ember from 'ember';
import { oneWay } from '@ember/object/computed';
import BaseToggleComponent from './-base-toggle-component';
import layout from '../templates/components/mdl-radio';

const { computed: { oneWay } } = Ember;

export default BaseToggleComponent.extend({
primaryClassName: 'radio',
layout,
Expand Down

0 comments on commit abd9541

Please sign in to comment.