Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Upgrade ember-{cli,source} to 2.17
  • Loading branch information
dcyriller committed Dec 14, 2017
1 parent 9e80fd8 commit 4529706
Show file tree
Hide file tree
Showing 35 changed files with 7,433 additions and 237 deletions.
13 changes: 13 additions & 0 deletions .eslintrc.js
@@ -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
@@ -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
25 changes: 16 additions & 9 deletions .npmignore
@@ -1,14 +1,21 @@
bower_components/
tests/
tmp/
dist/

/bower_components
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.watchmanconfig
.travis.yml
.npmignore
**/.gitkeep
bower.json
Brocfile.js
testem.json
ember-cli-build.js
testem.js

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
40 changes: 26 additions & 14 deletions .travis.yml
@@ -1,34 +1,46 @@
---
language: node_js
node_js:
- "0.12"
# 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-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:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
- "npm install -g npm@^2"
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

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

script:
- ember try:each
# 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
23 changes: 0 additions & 23 deletions bower.json

This file was deleted.

115 changes: 75 additions & 40 deletions config/ember-try.js
@@ -1,49 +1,84 @@
/*jshint node:true*/
module.exports = function() {
return {
useVersionCompatibility: true,
scenarios: [
{
name: 'default',
bower: {
dependencies: { }
/* eslint-env node */
module.exports = {
useYarn: true,
scenarios: [
{
name: 'ember-1.13.2',
npm: {
devDependencies: {
'ember-source': '~1.13.2'
}
}
},
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
},
{
name: 'ember-release',
bower: {
dependencies: {
'ember': 'components/ember#release'
},
resolutions: {
'ember': 'release'
}
},
{
name: 'ember-release',
bower: {
dependencies: {
'ember': 'components/ember#release'
},
resolutions: {
'ember': 'release'
}
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
'ember': 'components/ember#beta'
},
resolutions: {
'ember': 'beta'
}
},
{
name: 'ember-beta',
allowedToFail: true,
bower: {
dependencies: {
'ember': 'components/ember#beta'
},
resolutions: {
'ember': 'beta'
}
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
'ember': 'components/ember#canary'
},
resolutions: {
'ember': 'canary'
}
},
{
name: 'ember-canary',
allowedToFail: true,
bower: {
dependencies: {
'ember': 'components/ember#canary'
},
resolutions: {
'ember': 'canary'
}
npm: {
devDependencies: {
'ember-source': null
}
}
]
};
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
};
1 change: 1 addition & 0 deletions config/environment.js
@@ -1,3 +1,4 @@
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
21 changes: 21 additions & 0 deletions config/release.js
@@ -0,0 +1,21 @@
/* jshint node:true */
// var RSVP = require('rsvp');

// For details on each option run `ember help release`
module.exports = {
// local: true,
// remote: 'some_remote',
// annotation: "Release %@",
// message: "Bumped version to %@",
// manifest: [ 'package.json', 'bower.json', 'someconfig.json' ],
// publish: true,
// strategy: 'date',
// format: 'YYYY-MM-DD',
// timezone: 'America/Los_Angeles',
//
// beforeCommit: function(project, versions) {
// return new RSVP.Promise(function(resolve, reject) {
// // Do custom things here...
// });
// }
};
25 changes: 13 additions & 12 deletions ember-cli-build.js
@@ -1,18 +1,19 @@
/*jshint node:true*/
/* global require, module */
var Funnel = require('broccoli-funnel');
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, {
// Add options here
let app = new EmberAddon(defaults, {
// Add options here
});

var extraAssets = new Funnel(app.bowerDirectory + '/sinon', {
srcDir: '/',
files: ['index.js'],
destDir: '/assets/sinon'
});
/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree(extraAssets);
return app.toTree();
};
2 changes: 1 addition & 1 deletion index.js
@@ -1,4 +1,4 @@
/* jshint node: true */
/* eslint-env node */
'use strict';

module.exports = {
Expand Down

0 comments on commit 4529706

Please sign in to comment.