Skip to content
This repository has been archived by the owner on Aug 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #26 from rwjblue/update-addon
Browse files Browse the repository at this point in the history
Update to ember-cli@2.16 blueprint.
  • Loading branch information
rwjblue committed Nov 14, 2017
2 parents 008b482 + 6bfdf0b commit c41efe7
Show file tree
Hide file tree
Showing 27 changed files with 208 additions and 187 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

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
32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .npmignore
Expand Up @@ -8,7 +8,7 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
Expand Down
22 changes: 13 additions & 9 deletions .travis.yml
@@ -1,13 +1,19 @@
---
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=ember-1.10
Expand All @@ -20,6 +26,8 @@ env:
- EMBER_TRY_SCENARIO=ember-2.3
- EMBER_TRY_SCENARIO=ember-2.4
- EMBER_TRY_SCENARIO=ember-2.8
- EMBER_TRY_SCENARIO=ember-2.12
- EMBER_TRY_SCENARIO=ember-2.16
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand All @@ -30,15 +38,11 @@ matrix:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- "npm config set spin false"
- "npm install -g npm@^2"

install:
- npm install -g bower
- npm install
- bower install
- npm config set spin false
- npm install -g npm@4
- npm --version

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
@@ -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
9 changes: 4 additions & 5 deletions README.md
Expand Up @@ -68,21 +68,20 @@ the list of supported Ember versions at the time of authoring was:

* `git clone` this repository
* `npm install`
* `bower install`

### Running

* `ember server`
* Visit your app at http://localhost:4200.
* `ember serve`
* Visit your app at [http://localhost:4200](http://localhost:4200).

### Running Tests

* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
* `ember test`
* `ember test --server`

### Building

* `ember build`

For more information on using ember-cli, visit [http://www.ember-cli.com/](http://www.ember-cli.com/).
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
8 changes: 0 additions & 8 deletions bower.json

This file was deleted.

79 changes: 76 additions & 3 deletions config/ember-try.js
Expand Up @@ -8,6 +8,11 @@ module.exports = {
dependencies: {
"ember": "~1.10.0"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -16,6 +21,11 @@ module.exports = {
dependencies: {
"ember": "~1.11.3"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -24,6 +34,11 @@ module.exports = {
dependencies: {
"ember": "~1.12.1"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -32,6 +47,11 @@ module.exports = {
dependencies: {
"ember": "~1.13.8"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -40,6 +60,11 @@ module.exports = {
dependencies: {
"ember": "~2.0.0"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -48,6 +73,11 @@ module.exports = {
dependencies: {
"ember": "~2.1.0"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -56,6 +86,11 @@ module.exports = {
dependencies: {
"ember": "~2.2.0"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -64,6 +99,11 @@ module.exports = {
dependencies: {
"ember": "~2.3.0"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -72,6 +112,11 @@ module.exports = {
dependencies: {
"ember": "~2.4.0"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -80,13 +125,26 @@ module.exports = {
dependencies: {
"ember": "~2.8.0"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
name: 'ember-2.12',
bower: {
dependencies: {
"ember": "~2.12.0"
npm: {
devDependencies: {
"ember-source": "~2.12.0"
}
}
},
{
name: 'ember-2.16',
npm: {
devDependencies: {
"ember-source": "~2.16.0"
}
}
},
Expand All @@ -99,6 +157,11 @@ module.exports = {
resolutions: {
"ember": "release"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -110,6 +173,11 @@ module.exports = {
resolutions: {
"ember": "beta"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
},
{
Expand All @@ -121,6 +189,11 @@ module.exports = {
resolutions: {
"ember": "canary"
}
},
npm: {
devDependencies: {
"ember-source": null
}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
@@ -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
@@ -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
@@ -1,4 +1,4 @@
/* jshint node: true */
/* eslint-env node */
'use strict';

var VersionChecker = require('ember-cli-version-checker');
Expand Down

0 comments on commit c41efe7

Please sign in to comment.