Skip to content
This repository was archived by the owner on Aug 2, 2024. It is now read-only.

Commit cb49f0d

Browse files
authored
Merge pull request #691 from smile-io/renovate/ember-deps
Update Ember dependencies
2 parents 892a4e0 + 91233c6 commit cb49f0d

File tree

5 files changed

+919
-571
lines changed

5 files changed

+919
-571
lines changed

.eslintrc.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@ module.exports = {
55
plugins: ['smile-ember'],
66
extends: ['plugin:smile-ember/addon'],
77
rules: {
8-
// Temporary while upgrading to Ember Octane
8+
// Temporary while upgrading to Ember Octane & Glimmer components
99
'ember/no-get': 'off',
1010
'ember/no-mixins': 'off',
11+
'ember/no-classic-components': 'off',
12+
'ember/no-classic-classes': 'off',
13+
'ember/classic-decorator-hooks': 'off',
14+
'ember/classic-decorator-no-classic-methods': 'off',
15+
'ember/require-tagless-components': 'off',
16+
'ember/no-computed-properties-in-native-classes': 'off',
17+
'ember/no-component-lifecycle-hooks': 'off',
1118
// These are a lil broken right now (eslint-plugin-ember also disabled these)
1219
'smile-ember/order-in-components': 'off',
1320
},

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
"broccoli-merge-trees": "^4.2.0",
5757
"chalk": "^4.0.0",
5858
"ember-array-contains-helper": "^2.0.0",
59-
"ember-auto-import": "^1.6.0",
59+
"ember-auto-import": "^1.8.0",
6060
"ember-basic-dropdown": "^3.0.11",
61-
"ember-cli-babel": "^7.22.1",
61+
"ember-cli-babel": "^7.23.0",
6262
"ember-cli-htmlbars": "^5.3.1",
6363
"ember-cli-sass": "^10.0.1",
6464
"ember-context": "^0.1.0",
@@ -77,35 +77,35 @@
7777
},
7878
"devDependencies": {
7979
"@ember/optional-features": "2.0.0",
80-
"@glimmer/component": "1.0.2",
81-
"@glimmer/tracking": "1.0.2",
80+
"@glimmer/component": "1.0.3",
81+
"@glimmer/tracking": "1.0.3",
8282
"@smile-io/changelog-generator": "2.1.0",
8383
"@smile-io/ember-styleguide": "9.2.1",
8484
"babel-eslint": "10.1.0",
8585
"broccoli-asset-rev": "3.0.0",
8686
"ember-array-helper": "5.1.0",
87-
"ember-cli": "3.22.0",
87+
"ember-cli": "3.23.0",
8888
"ember-cli-code-coverage": "1.0.2",
8989
"ember-cli-dependency-checker": "3.2.0",
9090
"ember-cli-deprecation-workflow": "1.0.1",
9191
"ember-cli-inject-live-reload": "2.0.2",
9292
"ember-cli-release": "1.0.0-beta.2",
9393
"ember-cli-sri": "2.1.1",
94-
"ember-cli-terser": "^4.0.0",
94+
"ember-cli-terser": "^4.0.1",
9595
"ember-disable-prototype-extensions": "1.1.3",
9696
"ember-export-application-global": "2.0.1",
9797
"ember-load-initializers": "2.1.2",
9898
"ember-maybe-import-regenerator": "0.1.6",
9999
"ember-qunit": "4.6.0",
100100
"ember-resolver": "8.0.2",
101-
"ember-source": "3.23.1",
101+
"ember-source": "3.24.0",
102102
"ember-source-channel-url": "3.0.0",
103103
"ember-template-lint": "2.14.0",
104104
"ember-test-selectors": "5.0.0",
105105
"ember-try": "1.4.0",
106-
"eslint": "7.13.0",
106+
"eslint": "7.15.0",
107107
"eslint-config-prettier": "6.15.0",
108-
"eslint-plugin-ember": "9.6.0",
108+
"eslint-plugin-ember": "10.0.2",
109109
"eslint-plugin-node": "11.1.0",
110110
"eslint-plugin-prettier": "3.1.4",
111111
"eslint-plugin-smile-ember": "8.1.0",

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.22.0",
6+
"version": "3.23.0",
77
"blueprints": [
88
{
99
"name": "addon",
1010
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
1111
"codemodsSource": "ember-addon-codemods-manifest@1",
1212
"isBaseBlueprint": true,
13-
"options": ["--yarn", "--no-welcome"]
13+
"options": [
14+
"--yarn",
15+
"--no-welcome"
16+
]
1417
}
1518
]
1619
}

tests/integration/components/polaris-drop-zone-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,21 +276,21 @@ module('Integration | Component | polaris-drop-zone', function (hooks) {
276276

277277
this.set('style', htmlSafe(`width: ${largeWidth}px;`));
278278
await triggerEvent(window, 'resize');
279-
await settled();
279+
280280
assert
281281
.dom(dropZoneSelector)
282282
.hasClass('Polaris-DropZone--sizeLarge', 'has large class');
283283

284284
this.set('style', htmlSafe(`width: ${mediumWidth}px;`));
285285
await triggerEvent(window, 'resize');
286-
await settled();
286+
287287
assert
288288
.dom(dropZoneSelector)
289289
.hasClass('Polaris-DropZone--sizeMedium', 'has medium class');
290290

291291
this.set('style', htmlSafe(`width: ${smallWidth}px;`));
292292
await triggerEvent(window, 'resize');
293-
await settled();
293+
294294
assert
295295
.dom(dropZoneSelector)
296296
.hasClass('Polaris-DropZone--sizeSmall', 'has small class');

0 commit comments

Comments
 (0)