Skip to content

Commit

Permalink
Update to Ember 5.12 (#2598)
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieTheWagner authored Oct 21, 2024
1 parent 6e95d79 commit be0c5f2
Show file tree
Hide file tree
Showing 166 changed files with 14,177 additions and 12,290 deletions.
8 changes: 0 additions & 8 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
14 changes: 2 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/declarations/
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
/vendor/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# ember-inspector specific
/dist_prev/
Expand Down
19 changes: 9 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ module.exports = {
root: true,
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2020,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
requireConfigFile: false,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
},
plugins: ['ember'],
Expand All @@ -32,10 +35,12 @@ module.exports = {
// Temporarily turn these off
'ember/classic-decorator-hooks': 'off',
'ember/classic-decorator-no-classic-methods': 'off',
'ember/no-at-ember-render-modifiers': 'off',
'ember/no-classic-classes': 'off',
'ember/no-classic-components': 'off',
'ember/no-computed-properties-in-native-classes': 'off',
'ember/no-get': 'off',
'ember/no-runloop': 'off',

// Best practice
'no-duplicate-imports': 'error',
Expand Down Expand Up @@ -65,13 +70,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ jobs:
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-lts-4.8
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
Expand Down
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/dist_prev

.DS_Store
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
Expand All @@ -28,7 +23,6 @@ config/secrets.json

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
6 changes: 2 additions & 4 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
'use strict';

module.exports = {
singleQuote: true,
overrides: [
{
files: '**/*.hbs',
files: '*.{js,ts}',
options: {
parser: 'glimmer',
singleQuote: false,
singleQuote: true,
},
},
],
Expand Down
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
11 changes: 10 additions & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
'use strict';

module.exports = {
extends: 'stylelint-config-ship-shape',
extends: ['stylelint-config-standard-scss', 'stylelint-prettier/recommended'],
rules: {
'color-hex-length': null,
'no-descending-specificity': null,
'no-invalid-position-at-import-rule': null,
'number-max-precision': null,
'property-no-vendor-prefix': null,
},
};
3 changes: 2 additions & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
module.exports = {
extends: 'recommended',
rules: {
'no-down-event-binding': false,
'no-at-ember-render-modifiers': false,
'no-negated-condition': false,

// TODO: enable these rules
'no-builtin-form-components': false,
'no-positive-tabindex': false,
},
};
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodejs 18.18.2
pnpm 8.10.2
nodejs 18.20.4
pnpm 9.12.1
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
4 changes: 2 additions & 2 deletions app/components/app-picker.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</select>

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

{{svg-jar "dropdown-arrow" class="dropdown__arrow fill-current absolute opacity-75 pointer-events-none"}}
{{svg-jar "dropdown-arrow" class="dropdown-arrow fill-current absolute opacity-75 pointer-events-none"}}
</div>
</div>
26 changes: 13 additions & 13 deletions app/components/component-tree-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
class="
component-tree-item relative flex items-center mx-1 rounded
{{if @item.hasInstance "cursor-pointer" "cursor-default"}}
{{if @item.isComponent "component-tree-item--component"}}
{{if @item.isPinned "component-tree-item--pinned"}}
{{if @item.isHighlighted "component-tree-item--highlighted"}}"
{{if @item.isComponent "component-tree-item-component"}}
{{if @item.isPinned "component-tree-item-pinned"}}
{{if @item.isHighlighted "component-tree-item-highlighted"}}"
{{on "click" @item.toggleInspection}}
{{on "mouseenter" @item.showPreview}}
{{on "mouseleave" @item.hidePreview}}
>
<div class="component-tree-item-background flex items-center pr-2 rounded">
{{#if @item.hasChildren}}
<Ui::DisclosureTriangle
class="component-tree-item__expand self-stretch px-1 cursor-pointer"
class="component-tree-item-expand self-stretch px-1 cursor-pointer"
title="Click to toggle (alt/option click to toggle with children)"
@toggle={{@item.toggleExpansion}}
@expanded={{@item.isExpanded}}
/>
{{/if}}

<code
class="component-tree-item__tag flex whitespace-no-wrap
{{if @item.isClosingTag 'component-tree-item__closing'}}
{{if @item.hasModifiers 'component-tree-item__has_modifier'}}
class="component-tree-item-tag flex whitespace-no-wrap
{{if @item.isClosingTag 'component-tree-item-closing'}}
{{if @item.hasModifiers 'component-tree-item-has-modifier'}}
{{if
(or @item.isComponent @item.isModifier @item.isHtmlTag)
(if
@item.isCurlyInvocation
"component-tree-item-classic__bracket"
"component-tree-item-classic-bracket"
(if
@item.hasChildren
"component-tree-item__bracket"
"component-tree-item__bracket component-tree-item__bracket--self-closing"
"component-tree-item-bracket"
"component-tree-item-bracket component-tree-item-bracket-self-closing"
)
)
}}"
Expand Down Expand Up @@ -104,9 +104,9 @@
</div>

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

<button
class="component-tree-item__action inline-flex items-center h-full ml-2 p-0 border-0 cursor-pointer bg-transparent z-10"
class="component-tree-item-action inline-flex items-center h-full ml-2 p-0 border-0 cursor-pointer bg-transparent z-10"
title="View in Elements panel"
data-test="view-dom-element"
{{on "click" @item.inspectElement}}
Expand Down
6 changes: 3 additions & 3 deletions app/components/component-tree-toolbar.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="toolbar">
<button
class="{{if @isInspecting "active"}} toolbar__icon-button"
class="{{if @isInspecting "active"}} toolbar-icon-button"
type="button"
{{on "click" @toggleInspect}}
>
Expand All @@ -10,7 +10,7 @@
<Ui::ToolbarDivider />

<button
class="toolbar__icon-button"
class="toolbar-icon-button"
title="expand all"
type="button"
{{on "click" @expandAll}}
Expand All @@ -19,7 +19,7 @@
</button>

<button
class="toolbar__icon-button"
class="toolbar-icon-button"
title="collapse all"
type="button"
{{on "click" @collapseAll}}
Expand Down
2 changes: 1 addition & 1 deletion app/components/deprecation-item-source.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="deprecation-source pb-2" data-test-deprecation-source>
<button
class="send-to-console send-to-console--chevron-only mr-3"
class="send-to-console send-to-console-chevron-only mr-3"
title="Trace deprecations in console"
data-test-trace-deprecations-btn
{{on "click" this.handleClick}}
Expand Down
2 changes: 1 addition & 1 deletion app/components/deprecation-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

{{#if (not @model.hasSourceMap)}}
<button
class="send-to-console send-to-console--chevron-only mr-2"
class="send-to-console send-to-console-chevron-only mr-2"
title="Trace deprecations in console"
data-test-full-trace-deprecations-btn
type="button"
Expand Down
2 changes: 1 addition & 1 deletion app/components/deprecations-toolbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Ui::ToolbarDivider />

<div class="toolbar__checkbox">
<div class="toolbar-checkbox">
<label title="Deprecation workflow">
<Input
@type="checkbox"
Expand Down
14 changes: 7 additions & 7 deletions app/components/item-types.hbs
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<div class="split">
<Ui::DraggableColumn
@classes="split__panel split__panel--sidebar-2 nav"
@classes="split-panel split-panel-sidebar-2 nav"
@side="left"
@width={{@width}}
>
<div class="split__panel__bd">
<h1 class="nav__title">{{@header}}</h1>
<div class="split-panel-bd">
<h1 class="nav-title">{{@header}}</h1>

<ul>
{{#each @sorted as |itemType|}}
<li class={{this.typeClass}}>
<LinkTo
@route={{if (eq @type "model") "records" "container-type"}}
@model={{escape-url itemType.name}}
class="nav__item"
class="nav-item"
>
<span class={{concat this.typeClass "-name" " nav__item-label"}}>
<span class={{concat this.typeClass "-name" " nav-item-label"}}>
{{itemType.name}}
</span>

Expand All @@ -27,8 +27,8 @@
</div>
</Ui::DraggableColumn>

<div class="split__panel">
<div class="split__panel__bd">
<div class="split-panel">
<div class="split-panel-bd">
{{yield}}
</div>
</div>
Expand Down
Loading

0 comments on commit be0c5f2

Please sign in to comment.