Skip to content

Commit 0c56fdc

Browse files
committed
Update Ember CLI v3.18.0...v3.22.0
With ember-cli-update to update all blueprints as well
1 parent 9d9eb42 commit 0c56fdc

File tree

11 files changed

+1940
-1661
lines changed

11 files changed

+1940
-1661
lines changed

.eslintrc.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ module.exports = {
2020
env: {
2121
browser: true
2222
},
23-
rules: {
24-
'ember/no-jquery': 'error'
25-
},
23+
rules: {},
2624
overrides: [
2725
// node files
2826
{
@@ -50,9 +48,7 @@ module.exports = {
5048
node: true
5149
},
5250
plugins: ['node'],
53-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
54-
// add your custom rules and overrides for node files here
55-
})
51+
extends: ['plugin:node/recommended']
5652
}
5753
]
5854
};

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
strategy:
5454
matrix:
5555
ember-try-scenario:
56-
- ember-lts-3.12
5756
- ember-lts-3.16
57+
- ember-lts-3.20
5858
- ember-release
5959
- ember-beta
6060
- ember-canary

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It is built using EmberJS and takes advantage of the awesome [Sharp](https://git
1313
Compatibility
1414
------------------------------------------------------------------------------
1515

16-
* Ember.js v3.12 or above
16+
* Ember.js v3.16 or above
1717
* Ember CLI v2.13 or above
1818
* Node.js v10 or above
1919

config/ember-try.js

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ module.exports = async function() {
66
return {
77
scenarios: [
88
{
9-
name: 'ember-lts-3.12',
9+
name: 'ember-lts-3.16',
1010
npm: {
1111
devDependencies: {
12-
'ember-source': '~3.12.0'
12+
'ember-source': '~3.16.0'
1313
}
1414
}
1515
},
1616
{
17-
name: 'ember-lts-3.16',
17+
name: 'ember-lts-3.20',
1818
npm: {
1919
devDependencies: {
20-
'ember-source': '~3.16.0'
20+
'ember-source': '~3.20.5'
2121
}
2222
}
2323
},
@@ -45,16 +45,6 @@ module.exports = async function() {
4545
}
4646
}
4747
},
48-
// The default `.travis.yml` runs this scenario via `npm test`,
49-
// not via `ember try`. It's still included here so that running
50-
// `ember try:each` manually or from a customized CI config will run it
51-
// along with all the other scenarios.
52-
{
53-
name: 'ember-default',
54-
npm: {
55-
devDependencies: {}
56-
}
57-
},
5848
{
5949
name: 'ember-default-with-jquery',
6050
env: {
@@ -64,7 +54,7 @@ module.exports = async function() {
6454
},
6555
npm: {
6656
devDependencies: {
67-
'@ember/jquery': '^0.5.1'
57+
'@ember/jquery': '^1.1.0'
6858
}
6959
}
7060
},

package-lock.json

Lines changed: 1910 additions & 1617 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,39 @@
2929
"broccoli-caching-writer": "^3.0.3",
3030
"broccoli-funnel": "^3.0.2",
3131
"broccoli-merge-trees": "^4.1.0",
32-
"ember-cli-babel": "^7.19.0",
33-
"ember-cli-htmlbars": "^4.3.1",
32+
"ember-cli-babel": "^7.22.1",
33+
"ember-cli-htmlbars": "^5.3.1",
3434
"rsvp": "^4.7.0",
3535
"sharp": "^0.26.0"
3636
},
3737
"devDependencies": {
38-
"@ember/optional-features": "^1.3.0",
39-
"@glimmer/component": "^1.0.0",
40-
"@glimmer/tracking": "^1.0.0",
38+
"@ember/optional-features": "^2.0.0",
39+
"@glimmer/component": "^1.0.2",
40+
"@glimmer/tracking": "^1.0.2",
4141
"babel-eslint": "^10.1.0",
4242
"broccoli-asset-rev": "^3.0.0",
43-
"ember-auto-import": "^1.5.3",
44-
"ember-cli": "~3.18.0",
43+
"ember-auto-import": "^1.6.0",
44+
"ember-cli": "~3.22.0",
4545
"ember-cli-dependency-checker": "^3.2.0",
4646
"ember-cli-inject-live-reload": "^2.0.2",
4747
"ember-cli-sri": "^2.1.1",
48-
"ember-cli-uglify": "^3.0.0",
48+
"ember-cli-terser": "^4.0.0",
4949
"ember-disable-prototype-extensions": "^1.1.3",
5050
"ember-export-application-global": "^2.0.1",
5151
"ember-load-initializers": "^2.1.1",
5252
"ember-maybe-import-regenerator": "^0.1.6",
5353
"ember-qunit": "^4.6.0",
54-
"ember-resolver": "^8.0.0",
55-
"ember-source": "~3.18.0",
56-
"ember-source-channel-url": "^2.0.1",
57-
"ember-template-lint": "^2.6.0",
54+
"ember-resolver": "^8.0.2",
55+
"ember-source": "~3.22.0",
56+
"ember-source-channel-url": "^3.0.0",
57+
"ember-template-lint": "^2.14.0",
5858
"ember-try": "^1.4.0",
59-
"eslint": "^7.2.0",
60-
"eslint-plugin-ember": "^8.4.0",
59+
"eslint": "^7.11.0",
60+
"eslint-plugin-ember": "^9.3.0",
6161
"eslint-plugin-node": "^11.1.0",
6262
"loader.js": "^4.7.0",
6363
"npm-run-all": "^4.1.5",
64-
"qunit-dom": "^1.2.0"
64+
"qunit-dom": "^1.5.0"
6565
},
6666
"engines": {
6767
"node": "10.* || >= 12"

tests/dummy/app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
4-
import config from './config/environment';
4+
import config from 'dummy/config/environment';
55

66
export default class App extends Application {
77
modulePrefix = config.modulePrefix;

tests/dummy/app/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import EmberRouter from '@ember/routing/router';
2-
import config from './config/environment';
2+
import config from 'dummy/config/environment';
33

44
export default class Router extends EmberRouter {
55
location = config.locationType;

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.18.0",
6+
"version": "3.22.0",
77
"blueprints": [
88
{
99
"name": "addon",

tests/dummy/config/targets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const browsers = [
66
'last 1 Safari versions'
77
];
88

9-
const isCI = !!process.env.CI;
9+
const isCI = Boolean(process.env.CI);
1010
const isProduction = process.env.EMBER_ENV === 'production';
1111

1212
if (isCI || isProduction) {

0 commit comments

Comments
 (0)