Skip to content

Commit

Permalink
Update to 3.1.4 dependencies and style (#24)
Browse files Browse the repository at this point in the history
* Update to 3.1.4 dependencies and style

* Update engines

Will close #23
  • Loading branch information
benmurden authored and Robdel12 committed Jul 2, 2018
1 parent 96b4403 commit f816389
Show file tree
Hide file tree
Showing 32 changed files with 14,270 additions and 221 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

1 change: 1 addition & 0 deletions .eslintignore
@@ -0,0 +1 @@
/blueprints/*/files/**/*.js
50 changes: 50 additions & 0 deletions .eslintrc.js
@@ -0,0 +1,50 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
},
overrides: [
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
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
})
}
]
};
10 changes: 8 additions & 2 deletions .gitignore
@@ -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 @@ -13,5 +13,11 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
yarn-error.log
testem.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
7 changes: 6 additions & 1 deletion .npmignore
Expand Up @@ -7,10 +7,15 @@
.bowerrc
.editorconfig
.ember-cli
.eslintrc.js
.gitignore
.jshintrc
.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
37 changes: 24 additions & 13 deletions .travis.yml
@@ -1,20 +1,34 @@
---
language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"

sudo: false
dist: trusty

addons:
chrome: stable

cache:
directories:
- node_modules
- $HOME/.npm

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- 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-lts-2.18
- 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 @@ -23,14 +37,11 @@ matrix:

before_install:
- npm config set spin false
- npm install -g bower
- npm install phantomjs-prebuilt

install:
- npm install
- bower install
- npm install -g npm@4
- npm --version

script:
- npm run lint:js
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- ember try $EMBER_TRY_SCENARIO test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
22 changes: 13 additions & 9 deletions addon/components/x-range-input.js
@@ -1,4 +1,5 @@
import Ember from 'ember';
import Component from '@ember/component';
import { observer, get, set } from '@ember/object';

/**
* A component to represent a number that must fall between two
Expand All @@ -8,11 +9,11 @@ import Ember from 'ember';
* For example:
*
*
* {{x-range-input min=0 max=100 step=1 value=someNumber action="someAction"}}
* {{x-range-input min=0 max=100 step=1 value=someNumber action=(action "someAction")}}
*
* @class XRangeInputComponent
*/
export default Ember.Component.extend({
export default Component.extend({
type: 'range',
tagName: 'input',
classNames: ['x-range-input'],
Expand Down Expand Up @@ -64,8 +65,8 @@ export default Ember.Component.extend({
*
* @private
*/
copyValue: Ember.observer('value', function() {
this.set('element.value', this.get('value'));
copyValue: observer('value', function() {
set(this, 'element.value', get(this, 'value'));
}),

/**
Expand All @@ -86,7 +87,7 @@ export default Ember.Component.extend({
change() {
if (navigator.userAgent.indexOf('Trident/') !== -1) {
// needs to be called with context for some reason
this.get('input').call(this);
get(this, 'input').call(this);
}
},

Expand All @@ -97,9 +98,12 @@ export default Ember.Component.extend({
* @private
*/
input() {
let newValue = Number(this.get('element.value')).valueOf();

this.sendAction('action', newValue, this);
let newValue = Number(get(this, 'element.value')).valueOf();
let action = get(this, 'action')

if(typeof(action) === 'function') {
action(newValue, this);
}
},

/**
Expand Down
9 changes: 0 additions & 9 deletions bower.json

This file was deleted.

113 changes: 64 additions & 49 deletions config/ember-try.js
@@ -1,55 +1,70 @@
/*jshint node:true*/
module.exports = {
scenarios: [
{
name: 'default',
bower: {
dependencies: { }
}
},
{
name: 'ember-1.13',
bower: {
dependencies: {
'ember': '~1.13.0'
'use strict';

const getChannelURL = require('ember-source-channel-url');

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary')
]).then((urls) => {
return {
scenarios: [
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
resolutions: {
'ember': '~1.13.0'
}
}
},
{
name: 'ember-release',
bower: {
dependencies: {
'ember': 'components/ember#release'
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
resolutions: {
'ember': 'release'
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
'ember': 'components/ember#beta'
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
}
}
},
resolutions: {
'ember': 'beta'
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
'ember': 'components/ember#canary'
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
}
},
resolutions: {
'ember': 'canary'
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
}
}
]
]
};
});
};
1 change: 0 additions & 1 deletion config/environment.js
@@ -1,4 +1,3 @@
/*jshint node:true*/
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
8 changes: 4 additions & 4 deletions ember-cli-build.js
@@ -1,9 +1,9 @@
/*jshint node:true*/
/* global require, module */
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberAddon(defaults, {
let app = new EmberAddon(defaults, {
// Add options here
});

Expand Down
1 change: 0 additions & 1 deletion index.js
@@ -1,4 +1,3 @@
/* jshint node: true */
'use strict';

module.exports = {
Expand Down
1 change: 1 addition & 0 deletions jsconfig.json
@@ -0,0 +1 @@
{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}

0 comments on commit f816389

Please sign in to comment.