Skip to content

Commit

Permalink
Update Ember & Ember-CLI (#7)
Browse files Browse the repository at this point in the history
* Update to Ember-CLI 2.10

* Update to Ember CLI 2.17
  • Loading branch information
Robdel12 authored Dec 18, 2017
1 parent a922c10 commit 74e8bb2
Show file tree
Hide file tree
Showing 30 changed files with 5,808 additions and 152 deletions.
13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {
}
};
10 changes: 8 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 @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.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
38 changes: 23 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,46 @@
---
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
yarn: true

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-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- npm config set spin false
- npm install -g bower
- bower --version
- npm install phantomjs-prebuilt
- phantomjs --version
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

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

script:
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016
Copyright (c) 2017

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
15 changes: 9 additions & 6 deletions addon/components/route-announcer.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import Ember from 'ember';
import { alias } from '@ember/object/computed';
import { computed } from '@ember/object';
import { inject as service } from '@ember/service';
import Component from '@ember/component';
import layout from '../templates/components/route-announcer';

export default Ember.Component.extend({
announcer: Ember.inject.service('announcer'),
export default Component.extend({
announcer: service('announcer'),
layout: layout,
classNames: ['screen-reader'],
attributeBindings: ['ariaLive:aria-live'],
ariaLive: Ember.computed('tone', function() {
ariaLive: computed('tone', function() {
return this.get('announcer').getWithDefault('announceTone', 'polite');
}),
tone: Ember.computed.alias('announcer.announceTone'),
message: Ember.computed.alias('announcer.announceMessage')
tone: alias('announcer.announceTone'),
message: alias('announcer.announceMessage')
});
4 changes: 2 additions & 2 deletions addon/services/announcer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';
import Service from '@ember/service';

export default Ember.Service.extend({
export default Service.extend({
message: "has loaded",
announceMessage: null,
announceTone: 'polite',
Expand Down
14 changes: 8 additions & 6 deletions app/initializers/add-announcer-to-router.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import Ember from 'ember';
import $ from 'jquery';
import { later, cancel } from '@ember/runloop';
import { inject as service } from '@ember/service';
import Router from '../router';

export default {
name: 'add-announcer-to-router',
initialize: function(app) {
initialize: function() {
Router.reopen({
announcer: Ember.inject.service('announcer'),
announcer: service('announcer'),
didTransition: function() {
this._super(...arguments);

this._timerId = Ember.run.later(() => {
this._timerId = later(() => {
if (this.isDestroying || this.isDestroyed) { return; }

let pageTitle = Ember.$('title').html().trim();
let pageTitle = $('title').html().trim();
let serviceMessage = this.get('announcer.message');
let message = `${pageTitle} ${serviceMessage}`;

Expand All @@ -21,7 +23,7 @@ export default {
},

willDestroy() {
Ember.run.cancel(this._timerId);
cancel(this._timerId);
this._super();
}
});
Expand Down
8 changes: 0 additions & 8 deletions bower.json

This file was deleted.

43 changes: 32 additions & 11 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*jshint node:true*/
/* eslint-env node */
module.exports = {
useYarn: true,
scenarios: [
{
name: 'default',
bower: {
dependencies: { }
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-1.13',
bower: {
dependencies: {
'ember': '~1.13.0'
},
resolutions: {
'ember': '~1.13.0'
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
Expand All @@ -27,6 +27,11 @@ module.exports = {
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -38,6 +43,11 @@ module.exports = {
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -49,6 +59,17 @@ module.exports = {
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
9 changes: 5 additions & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/*jshint node:true*/
/* global require, module */
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
/* eslint-env node */
'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
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* jshint node: true */
/* eslint-env node */
'use strict';

module.exports = {
Expand Down
67 changes: 34 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,52 @@
"name": "a11y-announcer",
"version": "1.0.2",
"description": "An accessible ember route change announcer",
"keywords": [
"ember-addon",
"ember accessibility",
"ember router",
"a11y-announcer"
],
"license": "MIT",
"author": "Robert DeLuca",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/ember-a11y/a11y-announcer",
"scripts": {
"build": "ember build",
"start": "ember server",
"start": "ember serve",
"test": "ember try:each"
},
"repository": "https://github.com/ember-a11y/a11y-announcer",
"engines": {
"node": ">= 0.10.0"
"dependencies": {
"ember-cli-babel": "^6.6.0",
"ember-cli-htmlbars": "^2.0.1"
},
"author": "Robert DeLuca",
"license": "MIT",
"devDependencies": {
"ember-cli-document-title": "0.2.0",
"ember-cli-github-pages": "0.0.6",
"broccoli-asset-rev": "^2.4.2",
"ember-ajax": "^2.0.1",
"ember-cli": "2.7.0",
"ember-cli-app-version": "^1.0.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-mocha": "0.10.4",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0",
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-cli": "~2.17.0",
"ember-cli-chai": "^0.4.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-document-title": "0.3.2",
"ember-cli-eslint": "^4.2.1",
"ember-cli-github-pages": "0.1.2",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-mocha": "^0.14.4",
"ember-cli-release": "^0.2.9",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",
"loader.js": "^4.0.1"
"ember-cli-shims": "^1.2.0",
"ember-cli-uglify": "^2.0.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.17.0",
"loader.js": "^4.2.3"
},
"keywords": [
"ember-addon",
"ember accessibility",
"ember router",
"a11y-announcer"
],
"dependencies": {
"ember-cli-htmlbars": "^1.0.3",
"ember-cli-babel": "^5.1.6"
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
Loading

0 comments on commit 74e8bb2

Please sign in to comment.