Skip to content

Commit

Permalink
Update Ember CLI from v3.15.1...v3.16.0
Browse files Browse the repository at this point in the history
Updated blueprints and bumped netlify node version as this drops node
8.
  • Loading branch information
jrjohnson committed Mar 9, 2020
1 parent f9a4c7d commit 4a94603
Show file tree
Hide file tree
Showing 8 changed files with 1,749 additions and 956 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
10
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) 2019
Copyright (c) 2020

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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ It is built using EmberJS and takes advantage of the awesome [Sharp](https://git
Compatibility
------------------------------------------------------------------------------

* Ember.js v3.8 or above
* Ember.js v3.12 or above
* Ember CLI v2.13 or above
* Node.js v8 or above
* Node.js v10 or above


Installation
Expand Down
8 changes: 4 additions & 4 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ module.exports = async function() {
return {
scenarios: [
{
name: 'ember-lts-3.8',
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
'ember-source': '~3.12.0'
}
}
},
{
name: 'ember-lts-3.12',
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.12.0'
'ember-source': '~3.16.0'
}
}
},
Expand Down
2,665 changes: 1,728 additions & 937 deletions package-lock.json

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"test": "tests"
},
"scripts": {
"build": "ember build",
"build": "ember build --environment=production",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember serve",
Expand All @@ -27,21 +27,22 @@
"broccoli-caching-writer": "^3.0.3",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^3.0.0",
"ember-cli-babel": "^7.13.0",
"ember-cli-htmlbars": "^4.2.0",
"ember-cli-babel": "^7.17.2",
"ember-cli-htmlbars": "^4.2.2",
"rsvp": "^4.7.0",
"sharp": "^0.24.1"
},
"devDependencies": {
"@ember/optional-features": "^1.1.0",
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"babel-eslint": "^10.0.3",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.5.3",
"ember-cli": "~3.15.1",
"ember-cli": "~3.16.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.3",
"ember-cli-uglify": "^3.0.0",
Expand All @@ -51,16 +52,16 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-resolver": "^7.0.0",
"ember-source": "~3.15.0",
"ember-source": "~3.16.0",
"ember-source-channel-url": "^2.0.1",
"ember-try": "^1.4.0",
"eslint-plugin-ember": "^7.7.1",
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-ember": "^7.7.2",
"eslint-plugin-node": "^11.0.0",
"loader.js": "^4.7.0",
"qunit-dom": "^0.9.2"
"qunit-dom": "^1.0.0"
},
"engines": {
"node": "8.* || >= 10.*"
"node": "10.* || >= 12"
},
"ember": {
"edition": "octane"
Expand Down
1 change: 1 addition & 0 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = {
launch_in_dev: [
'Chrome'
],
browser_start_timeout: 120,
browser_args: {
Chrome: {
ci: [
Expand Down

0 comments on commit 4a94603

Please sign in to comment.