Skip to content

Commit

Permalink
Merge pull request #24 from Exelord/feature-upgrades
Browse files Browse the repository at this point in the history
Upgrades
  • Loading branch information
Exelord authored Feb 10, 2018
2 parents c566061 + 2eabe70 commit 1109649
Show file tree
Hide file tree
Showing 22 changed files with 418 additions and 742 deletions.
43 changes: 42 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ module.exports = {
ecmaVersion: 2017,
sourceType: 'module'
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
Expand All @@ -14,5 +17,43 @@ module.exports = {
rules: {
'ember/use-ember-get-and-set': 0,
'ember/named-functions-in-promises': 0
}
},
overrides: [
// node files
{
files: [
'index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'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
})
},

// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true
}
}
]
};
8 changes: 7 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
.DS_Store

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ env:
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.8
- 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
Expand All @@ -40,6 +40,7 @@ before_install:
- 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".
- 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) 2017
Copyright (c) 2018

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
5 changes: 1 addition & 4 deletions addon/instance-initializers/rollbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@ export function initialize(appInstance) {
};
}

export default {
name: 'rollbar',
initialize
};
export default { initialize };
17 changes: 4 additions & 13 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
/* eslint-env node */
module.exports = {
scenarios: [
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-8'
}
},
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': null
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-lts-2.12',
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
'ember-source': '~2.16.0'
}
}
},
Expand Down
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';

function codeVersion() {
Expand Down
12 changes: 6 additions & 6 deletions config/release.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/* eslint-env node */
'use strict';

const fs = require('fs');
const RSVP = require('rsvp');
const path = require('path');
const { exec } = require('child_process');
const exec = require('child_process').exec;

function generateChangelog(project, version) {
let content = `future-release=${version}\n`;
let generatorPath = path.join(project.root, '.github_changelog_generator');

return new RSVP.Promise(function(resolve, reject) {
return new Promise(function(resolve, reject) {
fs.writeFile(generatorPath, content, (err) => err ? reject(err) : resolve());
}).then(() => {
return new RSVP.Promise(function(resolve, reject) {
return new Promise(function(resolve, reject) {
exec('github_changelog_generator', (err) => err ? reject(err) : resolve());
});
})
Expand All @@ -20,7 +20,7 @@ function generateChangelog(project, version) {
function generateWebsite(version) {
let command = `ember github-pages:commit --message "${version}" && git push origin gh-pages:gh-pages`;

return new RSVP.Promise(function(resolve, reject) {
return new Promise(function(resolve, reject) {
exec(command, (err) => err ? reject(err) : resolve());
});
}
Expand Down
9 changes: 0 additions & 9 deletions config/targets.js

This file was deleted.

1 change: 0 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
Expand Down
1 change: 0 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

const path = require('path');
Expand Down
Loading

0 comments on commit 1109649

Please sign in to comment.