Skip to content

Commit be0c5f2

Browse files
RobbieTheWagnerRobbieTheWagner
authored
Update to Ember 5.12 (#2598)
1 parent 6e95d79 commit be0c5f2

File tree

166 files changed

+14177
-12290
lines changed

Some content is hidden

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

166 files changed

+14177
-12290
lines changed

‎.ember-cli

-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

‎.eslintignore

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
10+
/vendor/
1511
!.*
1612
.*/
17-
.eslintcache
1813

1914
# ember-try
2015
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try
2616

2717
# ember-inspector specific
2818
/dist_prev/

‎.eslintrc.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ module.exports = {
44
root: true,
55
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2020,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -32,10 +35,12 @@ module.exports = {
3235
// Temporarily turn these off
3336
'ember/classic-decorator-hooks': 'off',
3437
'ember/classic-decorator-no-classic-methods': 'off',
38+
'ember/no-at-ember-render-modifiers': 'off',
3539
'ember/no-classic-classes': 'off',
3640
'ember/no-classic-components': 'off',
3741
'ember/no-computed-properties-in-native-classes': 'off',
3842
'ember/no-get': 'off',
43+
'ember/no-runloop': 'off',
3944

4045
// Best practice
4146
'no-duplicate-imports': 'error',
@@ -65,13 +70,7 @@ module.exports = {
6570
browser: false,
6671
node: true,
6772
},
68-
plugins: ['node'],
69-
extends: ['plugin:node/recommended'],
70-
rules: {
71-
// this can be removed once the following is fixed
72-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
73-
'node/no-unpublished-require': 'off',
74-
},
73+
extends: ['plugin:n/recommended'],
7574
},
7675
{
7776
// test files

‎.github/workflows/build.yml

+2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ jobs:
8787
- ember-lts-3.20
8888
- ember-lts-3.24
8989
- ember-lts-3.28
90+
- ember-lts-4.8
91+
- ember-lts-4.12
9092
- ember-release
9193
- ember-beta
9294
- ember-canary

‎.gitignore

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
53
/tmp/
64
/dist_prev
75

86
.DS_Store
7+
/declarations/
98

109
# dependencies
11-
/bower_components/
1210
/node_modules/
1311

1412
# misc
1513
/.env*
1614
/.pnp*
17-
/.sass-cache
1815
/.eslintcache
19-
/connect.lock
2016
/coverage/
21-
/libpeerconnection.log
2217
/npm-debug.log*
2318
/testem.log
2419
/yarn-error.log
@@ -28,7 +23,6 @@ config/secrets.json
2823

2924
# ember-try
3025
/.node_modules.ember-try/
31-
/bower.json.ember-try
3226
/npm-shrinkwrap.json.ember-try
3327
/package.json.ember-try
3428
/package-lock.json.ember-try

‎.prettierignore

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

‎.prettierrc.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
54
overrides: [
65
{
7-
files: '**/*.hbs',
6+
files: '*.{js,ts}',
87
options: {
9-
parser: 'glimmer',
10-
singleQuote: false,
8+
singleQuote: true,
119
},
1210
},
1311
],

‎.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

‎.stylelintrc.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
'use strict';
2+
13
module.exports = {
2-
extends: 'stylelint-config-ship-shape',
4+
extends: ['stylelint-config-standard-scss', 'stylelint-prettier/recommended'],
5+
rules: {
6+
'color-hex-length': null,
7+
'no-descending-specificity': null,
8+
'no-invalid-position-at-import-rule': null,
9+
'number-max-precision': null,
10+
'property-no-vendor-prefix': null,
11+
},
312
};

‎.template-lintrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
module.exports = {
44
extends: 'recommended',
55
rules: {
6-
'no-down-event-binding': false,
6+
'no-at-ember-render-modifiers': false,
77
'no-negated-condition': false,
88

99
// TODO: enable these rules
10+
'no-builtin-form-components': false,
1011
'no-positive-tabindex': false,
1112
},
1213
};

‎.tool-versions

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
nodejs 18.18.2
2-
pnpm 8.10.2
1+
nodejs 18.20.4
2+
pnpm 9.12.1

‎.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

‎app/components/app-picker.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
</select>
1717

1818
{{#if @collapsed}}
19-
{{svg-jar "e-logo" width="15" height="13" class="dropdown__collapsed-icon fill-current absolute pointer-events-none"}}
19+
{{svg-jar "e-logo" width="15" height="13" class="dropdown-collapsed-icon fill-current absolute pointer-events-none"}}
2020
{{/if}}
2121

22-
{{svg-jar "dropdown-arrow" class="dropdown__arrow fill-current absolute opacity-75 pointer-events-none"}}
22+
{{svg-jar "dropdown-arrow" class="dropdown-arrow fill-current absolute opacity-75 pointer-events-none"}}
2323
</div>
2424
</div>

‎app/components/component-tree-item.hbs

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@
44
class="
55
component-tree-item relative flex items-center mx-1 rounded
66
{{if @item.hasInstance "cursor-pointer" "cursor-default"}}
7-
{{if @item.isComponent "component-tree-item--component"}}
8-
{{if @item.isPinned "component-tree-item--pinned"}}
9-
{{if @item.isHighlighted "component-tree-item--highlighted"}}"
7+
{{if @item.isComponent "component-tree-item-component"}}
8+
{{if @item.isPinned "component-tree-item-pinned"}}
9+
{{if @item.isHighlighted "component-tree-item-highlighted"}}"
1010
{{on "click" @item.toggleInspection}}
1111
{{on "mouseenter" @item.showPreview}}
1212
{{on "mouseleave" @item.hidePreview}}
1313
>
1414
<div class="component-tree-item-background flex items-center pr-2 rounded">
1515
{{#if @item.hasChildren}}
1616
<Ui::DisclosureTriangle
17-
class="component-tree-item__expand self-stretch px-1 cursor-pointer"
17+
class="component-tree-item-expand self-stretch px-1 cursor-pointer"
1818
title="Click to toggle (alt/option click to toggle with children)"
1919
@toggle={{@item.toggleExpansion}}
2020
@expanded={{@item.isExpanded}}
2121
/>
2222
{{/if}}
2323

2424
<code
25-
class="component-tree-item__tag flex whitespace-no-wrap
26-
{{if @item.isClosingTag 'component-tree-item__closing'}}
27-
{{if @item.hasModifiers 'component-tree-item__has_modifier'}}
25+
class="component-tree-item-tag flex whitespace-no-wrap
26+
{{if @item.isClosingTag 'component-tree-item-closing'}}
27+
{{if @item.hasModifiers 'component-tree-item-has-modifier'}}
2828
{{if
2929
(or @item.isComponent @item.isModifier @item.isHtmlTag)
3030
(if
3131
@item.isCurlyInvocation
32-
"component-tree-item-classic__bracket"
32+
"component-tree-item-classic-bracket"
3333
(if
3434
@item.hasChildren
35-
"component-tree-item__bracket"
36-
"component-tree-item__bracket component-tree-item__bracket--self-closing"
35+
"component-tree-item-bracket"
36+
"component-tree-item-bracket component-tree-item-bracket-self-closing"
3737
)
3838
)
3939
}}"
@@ -104,9 +104,9 @@
104104
</div>
105105

106106
{{#if @item.hasBounds}}
107-
<div class="component-tree-item__actions sticky flex items-center pr-1 whitespace-no-wrap">
107+
<div class="component-tree-item-actions sticky flex items-center pr-1 whitespace-no-wrap">
108108
<button
109-
class="component-tree-item__action inline-flex items-center h-full p-0 border-0 cursor-pointer bg-transparent z-10"
109+
class="component-tree-item-action inline-flex items-center h-full p-0 border-0 cursor-pointer bg-transparent z-10"
110110
title="Scroll into view"
111111
data-test-scroll-into-view
112112
{{on "click" @item.scrollIntoView}}
@@ -116,7 +116,7 @@
116116
</button>
117117

118118
<button
119-
class="component-tree-item__action inline-flex items-center h-full ml-2 p-0 border-0 cursor-pointer bg-transparent z-10"
119+
class="component-tree-item-action inline-flex items-center h-full ml-2 p-0 border-0 cursor-pointer bg-transparent z-10"
120120
title="View in Elements panel"
121121
data-test="view-dom-element"
122122
{{on "click" @item.inspectElement}}

‎app/components/component-tree-toolbar.hbs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="toolbar">
22
<button
3-
class="{{if @isInspecting "active"}} toolbar__icon-button"
3+
class="{{if @isInspecting "active"}} toolbar-icon-button"
44
type="button"
55
{{on "click" @toggleInspect}}
66
>
@@ -10,7 +10,7 @@
1010
<Ui::ToolbarDivider />
1111

1212
<button
13-
class="toolbar__icon-button"
13+
class="toolbar-icon-button"
1414
title="expand all"
1515
type="button"
1616
{{on "click" @expandAll}}
@@ -19,7 +19,7 @@
1919
</button>
2020

2121
<button
22-
class="toolbar__icon-button"
22+
class="toolbar-icon-button"
2323
title="collapse all"
2424
type="button"
2525
{{on "click" @collapseAll}}

‎app/components/deprecation-item-source.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="deprecation-source pb-2" data-test-deprecation-source>
22
<button
3-
class="send-to-console send-to-console--chevron-only mr-3"
3+
class="send-to-console send-to-console-chevron-only mr-3"
44
title="Trace deprecations in console"
55
data-test-trace-deprecations-btn
66
{{on "click" this.handleClick}}

‎app/components/deprecation-item.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
{{#if (not @model.hasSourceMap)}}
2828
<button
29-
class="send-to-console send-to-console--chevron-only mr-2"
29+
class="send-to-console send-to-console-chevron-only mr-2"
3030
title="Trace deprecations in console"
3131
data-test-full-trace-deprecations-btn
3232
type="button"

‎app/components/deprecations-toolbar.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<Ui::ToolbarDivider />
55

6-
<div class="toolbar__checkbox">
6+
<div class="toolbar-checkbox">
77
<label title="Deprecation workflow">
88
<Input
99
@type="checkbox"

‎app/components/item-types.hbs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<div class="split">
22
<Ui::DraggableColumn
3-
@classes="split__panel split__panel--sidebar-2 nav"
3+
@classes="split-panel split-panel-sidebar-2 nav"
44
@side="left"
55
@width={{@width}}
66
>
7-
<div class="split__panel__bd">
8-
<h1 class="nav__title">{{@header}}</h1>
7+
<div class="split-panel-bd">
8+
<h1 class="nav-title">{{@header}}</h1>
99

1010
<ul>
1111
{{#each @sorted as |itemType|}}
1212
<li class={{this.typeClass}}>
1313
<LinkTo
1414
@route={{if (eq @type "model") "records" "container-type"}}
1515
@model={{escape-url itemType.name}}
16-
class="nav__item"
16+
class="nav-item"
1717
>
18-
<span class={{concat this.typeClass "-name" " nav__item-label"}}>
18+
<span class={{concat this.typeClass "-name" " nav-item-label"}}>
1919
{{itemType.name}}
2020
</span>
2121

@@ -27,8 +27,8 @@
2727
</div>
2828
</Ui::DraggableColumn>
2929

30-
<div class="split__panel">
31-
<div class="split__panel__bd">
30+
<div class="split-panel">
31+
<div class="split-panel-bd">
3232
{{yield}}
3333
</div>
3434
</div>

0 commit comments

Comments
 (0)