Skip to content
Permalink
Browse files

Upgrades

  • Loading branch information...
Exelord committed Mar 14, 2019
1 parent 610aaca commit 3d26a7a8008dd3652eb798721cf92a5137a2c0d1
Showing with 2,342 additions and 2,607 deletions.
  1. +1 −0 .eslintignore
  2. +2 −0 .gitignore
  3. +2 −0 .npmignore
  4. +8 −2 .travis.yml
  5. +26 −0 CONTRIBUTING.md
  6. +1 −1 LICENSE.md
  7. +8 −24 README.md
  8. +9 −9 config/ember-try.js
  9. +2,271 −2,556 package-lock.json
  10. +14 −15 package.json
@@ -8,6 +8,7 @@

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
@@ -9,6 +9,8 @@
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/
@@ -9,6 +9,7 @@
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.gitignore
@@ -17,6 +18,7 @@
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
@@ -20,6 +20,12 @@ env:
# See https://git.io/vdao3 for details.
- JOBS=1

branches:
only:
- master
# npm version tags
- /^v\d+\.\d+\.\d+/

jobs:
fail_fast: true
allow_failures:
@@ -38,8 +44,8 @@ jobs:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
@@ -0,0 +1,26 @@
# How To Contribute

## Installation

* `git clone https://github.com/davewasmer/ember-cli-favicon`
* `cd ember-cli-favicon`
* `npm install`

## Linting

* `npm run lint:hbs`
* `npm run lint:js`
* `npm run lint:js -- --fix`

## Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018
Copyright (c) 2019

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:

@@ -5,6 +5,13 @@

Take a single favicon source file at `public/favicon.png`, and convert to the various formats and sizes required for popular devices and platforms. Also injects the appropriate HTML into your index.html file during the build process.

Compatibility
------------------------------------------------------------------------------

* Ember.js v2.18 or above
* Ember CLI v2.13 or above


Installation
------------------------------------------------------------------------------

@@ -54,30 +61,7 @@ var app = new EmberApp({
Contributing
------------------------------------------------------------------------------

### Installation

* `git clone https://github.com/davewasmer/ember-cli-favicon`
* `cd ember-cli-favicon`
* `npm install`

### Linting

* `npm run lint:hbs`
* `npm run lint:js`
* `npm run lint:js -- --fix`

### Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions

### Running the dummy application

* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
See the [Contributing](CONTRIBUTING.md) guide for details.

License
------------------------------------------------------------------------------
@@ -11,26 +11,22 @@ module.exports = function() {
return {
scenarios: [
{
name: 'ember-lts-2.16',
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.16.0'
'ember-source': '~2.18.0'
}
}
},
{
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
},
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.18.0'
'ember-source': '~3.4.0'
}
}
},
@@ -58,6 +54,10 @@ module.exports = function() {
}
}
},
// The default `.travis.yml` runs this scenario via `npm test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {

0 comments on commit 3d26a7a

Please sign in to comment.
You can’t perform that action at this time.