Skip to content

Commit e5b1f71

Browse files
zofskeezhashishaw
andauthored
Ember Upgrade to 3.24 (#13443)
* Update browserslist * Add browserslistrc * ember-cli-update --to 3.26, fix conflicts * Run codemodes that start with ember-* * More codemods - before cp* * More codemods (curly data-test-*) * WIP ember-basic-dropdown template errors * updates ember-basic-dropdown and related deps to fix build issues * updates basic dropdown instances to new version API * updates more deps -- ember-template-lint is working again * runs no-implicit-this codemod * creates and runs no-quoteless-attributes codemod * runs angle brackets codemod * updates lint:hbs globs to only touch hbs files * removes yield only templates * creates and runs deprecated args transform * supresses lint error for invokeAction on LinkTo component * resolves remaining ambiguous path lint errors * resolves simple-unless lint errors * adds warnings for deprecated tagName arg on LinkTo components * adds warnings for remaining curly component invocation * updates global template lint rules * resolves remaining template lint errors * disables some ember specfic lint rules that target pre octane patterns * js lint fix run * resolves remaining js lint errors * fixes test run * adds npm-run-all dep * fixes test attribute issues * fixes console acceptance tests * fixes tests * adds yield only wizard/tutorial-active template * fixes more tests * attempts to fix more flaky tests * removes commented out settled in transit test * updates deprecations workflow and adds initializer to filter by version * updates flaky policies acl old test * updates to flaky transit test * bumps ember deps down to LTS version * runs linters after main merge * fixes client count tests after bad merge conflict fixes * fixes client count history test * more updates to lint config * another round of hbs lint fixes after extending stylistic rule * updates lint-staged commands * removes indent eslint rule since it seems to break things * fixes bad attribute in transform-edit-form template * test fixes * fixes enterprise tests * adds changelog * removes deprecated ember-concurrency-test-waiters dep and adds @ember/test-waiters * flaky test fix Co-authored-by: hashishaw <cshaw@hashicorp.com>
1 parent 1aca265 commit e5b1f71

File tree

1,093 files changed

+14681
-12293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,093 files changed

+14681
-12293
lines changed

changelog/13443.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:change
2+
ui: Upgrade Ember to version 3.24
3+
```

ui/.browserslistrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
defaults
2+
not IE 11
3+
maintained node versions

ui/.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
# misc
1818
/coverage/
19+
!.*
20+
.eslintcache
1921

2022
# ember-try
2123
/.node_modules.ember-try/

ui/.eslintrc.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,39 @@ module.exports = {
1212
legacyDecorators: true,
1313
},
1414
},
15-
plugins: ['ember', 'prettier'],
16-
extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
15+
plugins: ['ember'],
16+
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
1717
env: {
1818
browser: true,
19-
es6: true,
2019
},
2120
rules: {
22-
// TODO revisit once figure out how to replace, added during upgrade to 3.20
23-
'ember/no-new-mixins': 'off',
24-
'ember/no-mixins': 'off',
21+
'no-console': 'warn',
22+
'ember/no-mixins': 'warn',
23+
'ember/no-new-mixins': 'off', // should be warn but then every line of the mixin is green
24+
// need to be fully glimmerized before these rules can be turned on
25+
'ember/no-classic-classes': 'off',
26+
'ember/no-classic-components': 'off',
27+
'ember/no-actions-hash': 'off',
28+
'ember/require-tagless-components': 'off',
29+
'ember/no-component-lifecycle-hooks': 'off',
2530
},
2631
overrides: [
2732
// node files
2833
{
2934
files: [
35+
'.eslintrc.js',
36+
'.prettierrc.js',
3037
'.template-lintrc.js',
3138
'ember-cli-build.js',
3239
'testem.js',
3340
'blueprints/*/index.js',
3441
'config/**/*.js',
3542
'lib/*/index.js',
3643
'scripts/start-vault.js',
44+
'server/**/*.js',
3745
],
3846
parserOptions: {
3947
sourceType: 'script',
40-
ecmaVersion: 2018,
4148
},
4249
env: {
4350
browser: false,

ui/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
# misc
1313
/.sass-cache
14+
/.eslintcache
1415
/connect.lock
1516
/coverage/
1617
/libpeerconnection.log

ui/.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

ui/.prettierrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

ui/.prettierrc.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
trailingComma: 'es5',
6+
printWidth: 110,
7+
overrides: [
8+
{
9+
files: '*.hbs',
10+
options: {
11+
singleQuote: false,
12+
printWidth: 125,
13+
},
14+
},
15+
],
16+
};

ui/.storybook/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ function loadStories() {
77
// automatically import all files ending in *.stories.js
88
const appStories = require.context('../stories', true, /.stories.js$/);
99
const addonAndRepoStories = require.context('../lib', true, /.stories.js$/);
10-
appStories.keys().forEach(filename => appStories(filename));
11-
addonAndRepoStories.keys().forEach(filename => addonAndRepoStories(filename));
10+
appStories.keys().forEach((filename) => appStories(filename));
11+
addonAndRepoStories.keys().forEach((filename) => addonAndRepoStories(filename));
1212
}
1313

1414
addParameters({
1515
viewport: { viewports: INITIAL_VIEWPORTS },
1616
options: { theme },
1717
});
1818

19-
addDecorator(storyFn => {
19+
addDecorator((storyFn) => {
2020
const { template, context } = storyFn();
2121

2222
// flight icon sprite must be inserted into dom for icon lookup via use element

ui/.template-lintrc.js

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended',
4+
extends: ['octane', 'stylistic'],
55
rules: {
6-
// should definitely move to template only
7-
// glimmer components for this one
8-
'no-partial': false,
9-
10-
// these need to be looked into, but
11-
// may be a bigger change
12-
'no-invalid-interactive': false,
13-
'simple-unless': false,
14-
15-
'self-closing-void-elements': false,
16-
'no-unnecessary-concat': false,
17-
'no-quoteless-attributes': false,
18-
'no-nested-interactive': false,
19-
20-
// not sure we'll ever want these on,
21-
// would be nice but if prettier isn't doing
22-
// it for us, then not sure it's worth it
23-
'attribute-indentation': false,
24-
'block-indentation': false,
25-
quotes: false,
6+
'no-bare-strings': 'off',
7+
'no-action': 'off',
8+
'no-duplicate-landmark-elements': 'warn',
9+
'no-implicit-this': {
10+
allow: ['supported-auth-backends'],
11+
},
12+
'require-input-label': 'off',
13+
'no-down-event-binding': 'warn',
14+
'self-closing-void-elements': 'off',
2615
},
16+
ignore: ['lib/story-md', 'tests/**'],
2717
};

0 commit comments

Comments
 (0)