Skip to content

Commit

Permalink
upgrade to ember/ember-cli 2.18.2 (#176)
Browse files Browse the repository at this point in the history
* upgrade to ember 2.18.2

* add 2.18 to travis

* add lint:js task

* eslintrc allows node and Promise
  • Loading branch information
mnutt authored and duizendnegen committed Mar 6, 2018
1 parent 9afb0ab commit a8dd247
Show file tree
Hide file tree
Showing 25 changed files with 3,125 additions and 2,054 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ module.exports = {
},
extends: 'eslint:recommended',
env: {
browser: true
node: true,
browser: true,
es6: true
},
rules: {
}
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,10 @@
/coverage/*
/libpeerconnection.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 @@ -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
46 changes: 25 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,48 @@
---
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:
- $HOME/.npm
- $HOME/.cache # includes bowers cache
yarn: true

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-2.8.3
- EMBER_TRY_SCENARIO=ember-2.4.3
- EMBER_TRY_SCENARIO=ember-2.3.1
- EMBER_TRY_SCENARIO=ember-2.2.2
- EMBER_TRY_SCENARIO=ember-2.0.2
- EMBER_TRY_SCENARIO=ember-1.13.13
- EMBER_TRY_SCENARIO=ember-1.13.1
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
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- 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:
- 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 test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
1 change: 0 additions & 1 deletion app/components/pikaday-input.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Ember from 'ember';
import PikadayInputComponent from 'ember-pikaday/components/pikaday-input';

export default PikadayInputComponent;
4 changes: 0 additions & 4 deletions bower.json

This file was deleted.

196 changes: 63 additions & 133 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,141 +1,71 @@
/* eslint-env node */
module.exports = {
scenarios: [
{
name: 'default',
bower: {
dependencies: { }
}
},
{
name: 'ember-1.13.1',
bower: {
dependencies: {
'ember': '1.13.1'
'use strict';

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

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary'),
]).then((urls) => {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
resolutions: {
'ember': '1.13.1'
}
},
npm: {
devDependencies: {
'ember-hash-helper-polyfill': '0.1.1'
}
}
},
{
name: 'ember-1.13.13',
bower: {
dependencies: {
'ember': '1.13.13'
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
resolutions: {
'ember': '1.13.13'
}
},
npm: {
devDependencies: {
'ember-hash-helper-polyfill': '0.1.1'
}
}
},
{
name: 'ember-2.8.3',
bower: {
dependencies: {
'ember': '2.8.3'
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
}
}
},
resolutions: {
'ember': '2.8.3'
}
}
},
{
name: 'ember-2.4.3',
bower: {
dependencies: {
'ember': '2.4.3'
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
resolutions: {
'ember': '2.4.3'
}
}
},
{
name: 'ember-2.3.1',
bower: {
dependencies: {
'ember': '2.3.1'
},
resolutions: {
'ember': '2.3.1'
}
}
},
{
name: 'ember-2.2.2',
bower: {
dependencies: {
'ember': '2.2.2'
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
}
},
resolutions: {
'ember': '2.2.2'
}
},
npm: {
devDependencies: {
'ember-hash-helper-polyfill': '0.1.1'
}
}
},
{
name: 'ember-2.0.2',
bower: {
dependencies: {
'ember': '2.0.2'
},
resolutions: {
'ember': '2.0.2'
}
},
npm: {
devDependencies: {
'ember-hash-helper-polyfill': '0.1.1'
}
}
},
{
name: 'ember-release',
bower: {
dependencies: {
'ember': 'components/ember#release'
},
resolutions: {
'ember': 'release'
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
'ember': 'components/ember#beta'
},
resolutions: {
'ember': 'beta'
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
'ember': 'components/ember#canary'
{
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
5 changes: 3 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* 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
Loading

0 comments on commit a8dd247

Please sign in to comment.