Skip to content

Commit d1c60bd

Browse files
committed
Update to ember 3.22
1 parent 8baefd8 commit d1c60bd

File tree

12 files changed

+2061
-668
lines changed

12 files changed

+2061
-668
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
{
@@ -49,9 +47,7 @@ module.exports = {
4947
node: true
5048
},
5149
plugins: ['node'],
52-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
53-
// add your custom rules and overrides for node files here
54-
})
50+
extends: ['plugin:node/recommended']
5551
}
5652
]
5753
};

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ node_js:
55
# so that your addon works for all apps
66
- "10"
77

8-
dist: trusty
8+
dist: xenial
99

1010
addons:
1111
chrome: stable
@@ -47,13 +47,17 @@ jobs:
4747

4848
# we recommend new addons test the current and previous LTS
4949
# as well as latest stable release (bonus points to beta/canary)
50-
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
5150
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
51+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
5252
- env: EMBER_TRY_SCENARIO=ember-release
5353
- env: EMBER_TRY_SCENARIO=ember-beta
5454
- env: EMBER_TRY_SCENARIO=ember-canary
5555
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5656
- env: EMBER_TRY_SCENARIO=ember-classic
5757

58+
before_install:
59+
- curl -o- -L https://yarnpkg.com/install.sh | bash
60+
- export PATH=$HOME/.yarn/bin:$PATH
61+
5862
script:
5963
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Compatibility
88
------------------------------------------------------------------------------
99

10-
* Ember.js v3.12 or above
10+
* Ember.js v3.16 or above
1111
* Ember CLI v2.13 or above
1212
* Node.js v10 or above
1313

addon/components/collection-scroll-view/index.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from '@glimmer/component';
22
import { reads } from 'macro-decorators';
3-
import { tracked } from '@glimmer/tracking';
3+
import { cached, tracked } from '@glimmer/tracking';
44
import { action } from '@ember/object';
55
import { next, schedule } from '@ember/runloop';
66

@@ -40,7 +40,6 @@ export default class CollectionScrollView extends Component {
4040
@tracked scrollTop = 0;
4141
@tracked clientWidth;
4242
@tracked clientHeight;
43-
@tracked measuredClientSize;
4443
@tracked contentSize;
4544

4645
@reads('headerDimensions.height', 0) headerHeight;
@@ -102,11 +101,23 @@ export default class CollectionScrollView extends Component {
102101

103102
@action
104103
clientSizeChange(clientWidth, clientHeight) {
105-
this.measuredClientSize = {
106-
width: clientWidth,
107-
height: clientHeight
108-
};
109-
// this._needsRevalidate();
104+
next(() => {
105+
if (!this.isDestroyed) {
106+
this.clientWidth = clientWidth;
107+
this.clientHeight = clientHeight;
108+
}
109+
})
110+
}
111+
112+
@cached
113+
get measuredClientSize() {
114+
if (this.clientWidth && this.clientHeight) {
115+
return {
116+
width: this.clientWidth,
117+
height: this.clientHeight
118+
};
119+
}
120+
return null;
110121
}
111122

112123
@action

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.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727
},
2828
"dependencies": {
2929
"@ember/render-modifiers": "^1.0.2",
30-
"@glimmer/tracking": "^1.0.0",
30+
"@glimmer/tracking": "^1.0.2",
3131
"broccoli-stew": "^2.1.0",
32-
"ember-auto-import": "^1.5.3",
33-
"ember-cli-babel": "7.20.5",
34-
"ember-cli-htmlbars": "^5.1.2",
32+
"ember-auto-import": "^1.6.0",
33+
"ember-cached-decorator-polyfill": "^0.1.0",
34+
"ember-cli-babel": "7.22.1",
35+
"ember-cli-htmlbars": "^5.3.1",
3536
"ember-composable-helpers": "^4.3.0",
3637
"ember-concurrency-decorators": "^2.0.0",
3738
"ember-concurrency": "^1.2.1",
@@ -48,39 +49,39 @@
4849
},
4950
"devDependencies": {
5051
"@babel/core": "^7.10.2",
51-
"@ember/optional-features": "^1.3.0",
52-
"@glimmer/component": "^1.0.0",
52+
"@ember/optional-features": "^2.0.0",
53+
"@glimmer/component": "^1.0.2",
5354
"babel-eslint": "^10.1.0",
5455
"broccoli-asset-rev": "^3.0.0",
55-
"ember-cli": "~3.18.0",
56+
"ember-cli": "~3.22.0",
5657
"ember-cli-dependency-checker": "^3.2.0",
5758
"ember-cli-deploy": "^1.0.2",
5859
"ember-cli-deploy-build": "^2.0.0",
5960
"ember-cli-deploy-git": "^1.3.3",
6061
"ember-cli-inject-live-reload": "^2.0.2",
6162
"ember-cli-sass": "^10.0.1",
6263
"ember-cli-sri": "^2.1.1",
63-
"ember-cli-uglify": "^3.0.0",
64+
"ember-cli-terser": "^4.0.0",
6465
"ember-collection": "1.0.0",
6566
"ember-decorators-polyfill": "^1.1.5",
6667
"ember-disable-prototype-extensions": "^1.1.3",
6768
"ember-export-application-global": "^2.0.1",
6869
"ember-load-initializers": "^2.1.1",
6970
"ember-maybe-import-regenerator": "^0.1.6",
7071
"ember-qunit": "^4.6.0",
71-
"ember-resolver": "^8.0.0",
72+
"ember-resolver": "^8.0.2",
7273
"ember-simulant-test-helpers": "^0.3.1",
73-
"ember-source": "~3.18.0",
74-
"ember-source-channel-url": "^2.0.1",
75-
"ember-template-lint": "^2.6.0",
74+
"ember-source": "~3.22.0",
75+
"ember-source-channel-url": "^3.0.0",
76+
"ember-template-lint": "^2.14.0",
7677
"ember-try": "^1.4.0",
77-
"eslint": "^7.2.0",
78-
"eslint-plugin-ember": "^8.4.0",
78+
"eslint": "^7.11.0",
79+
"eslint-plugin-ember": "^9.3.0",
7980
"eslint-plugin-node": "^11.1.0",
8081
"layout-bin-packer": "^1.2.0",
8182
"loader.js": "^4.7.0",
8283
"npm-run-all": "^4.1.5",
83-
"qunit-dom": "^1.2.0",
84+
"qunit-dom": "^1.5.0",
8485
"release-it": "^13.6.2",
8586
"release-it-lerna-changelog": "^2.3.0",
8687
"sass": "^1.26.8"

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) {

tests/test-helper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Application from '../app';
2-
import config from '../config/environment';
1+
import Application from 'dummy/app';
2+
import config from 'dummy/config/environment';
33
import { setApplication } from '@ember/test-helpers';
44
import { start } from 'ember-qunit';
55

0 commit comments

Comments
 (0)