Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Ember from 3.6 to 3.9 #136

Merged
merged 1 commit into from
Apr 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
/node_modules/

# misc
=======
/.env*
/.eslintcache
/.pnp*
/.sass-cache
/connect.lock
/coverage/
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.prettierrc.js
Expand Down
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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
- "6"
- '6'

addons:
chrome: stable
Expand All @@ -30,32 +30,32 @@ jobs:
include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
- stage: 'Tests'
name: 'Tests'
install:
- yarn install --non-interactive
script:
- yarn lint:hbs
- yarn lint:js
- yarn test

- name: "Node Tests"
- name: 'Node Tests'
script:
- yarn node-test

- name: "Floating Dependencies"
- name: 'Floating Dependencies'
script:
- yarn test

- name: "Deploy"
- name: 'Deploy'
if: (branch = master or tag is present) and type = push
script: node_modules/.bin/ember deploy production

# 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
- stage: 'Additional Tests'
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
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@

This Ember addon helps you configure and manage the web app manifest and related meta tags needed to create a Progressive Web Application

## Compatibility

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

## Installation

```
ember install ember-web-app
```

## Usage

See [documentation](https://zonkyio.github.io/ember-web-app/versions/master/).

## Contributing
Expand Down
14 changes: 4 additions & 10 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = function() {
return {
scenarios: [
{
name: 'ember-lts-2.16',
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true,
Expand All @@ -20,21 +20,15 @@ module.exports = function() {
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',
},
},
},
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@ember/optional-features": "^0.7.0",
"ember-cli": "~3.6.1",
"ember-cli": "~3.9.0",
"ember-cli-addon-docs": "^0.6.10",
"ember-cli-addon-docs-esdoc": "^0.2.1",
"ember-cli-addon-tests": "^0.11.1",
Expand All @@ -61,7 +61,7 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.1.3",
"ember-source": "~3.6.0",
"ember-source": "~3.9.1",
"ember-source-channel-url": "^1.1.0",
"ember-try": "^1.0.0",
"eslint": "^5.16.0",
Expand All @@ -75,6 +75,9 @@
"prettier": "^1.17.0",
"qunit-dom": "^0.8.4"
},
"resolutions": {
"**/tough-cookie": "~2.4.0"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
},
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = function(environment) {
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Expand Down