Skip to content

Commit

Permalink
Ember 3.17 (#1174)
Browse files Browse the repository at this point in the history
* Ember 3.17

* Fix template lint

* Fix lint
  • Loading branch information
RobbieTheWagner authored Apr 19, 2020
1 parent 503b77f commit b3eaf99
Show file tree
Hide file tree
Showing 27 changed files with 595 additions and 287 deletions.
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
Expand All @@ -22,6 +24,8 @@ module.exports = {
basicContext: false
},
rules: {
'no-prototype-builtins': 'off',

'ember/no-jquery': 'error',

// Temporarily turn these off
Expand Down
2 changes: 2 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ module.exports = {
'link-rel-noopener': false,
'no-inline-styles': false,
'no-invalid-interactive': false,
'no-negated-condition': false,
'no-positive-tabindex': false,
'table-groups': false
}
};
2 changes: 2 additions & 0 deletions app/components/component-tree-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
title="Scroll into view"
data-test-scroll-into-view
{{on "click" @item.scrollIntoView}}
type="button"
>
{{svg-jar "eye" width="20px" height="20px"}}
</button>
Expand All @@ -107,6 +108,7 @@
title="View in Elements panel"
data-test="view-dom-element"
{{on "click" @item.inspectElement}}
type="button"
>
{{svg-jar "code-line" width="20px" height="20px"}}
</button>
Expand Down
2 changes: 2 additions & 0 deletions app/components/deprecation-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
title="Trace deprecations in console"
data-test-full-trace-deprecations-btn
{{on "click" (fn @traceDeprecations @model)}}
type="button"
>
{{svg-jar "send-with-chevron" width="6px" height="9px"}}
Trace in the Console
Expand Down Expand Up @@ -56,6 +57,7 @@
title="Trace deprecations in console"
data-test-trace-deprecations-btn
{{on "click" (fn @traceSource @model source.model)}}
type="button"
>
{{svg-jar "send-with-chevron" width="6px" height="9px"}}
Trace in the Console
Expand Down
13 changes: 9 additions & 4 deletions app/components/object-inspector.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<div class="split__panel__hd">
<div class="toolbar">
<button
data-test-object-inspector-back
class="toolbar__icon-button {{if this.isNested "enabled" "disabled"}}"
type="button"
{{on "click" this.popStack}}
data-test-object-inspector-back
>
{{svg-jar "arrow-back" width="21px" height="21px"}}
</button>
Expand All @@ -17,10 +18,11 @@
</code>

<button
data-test-send-object-to-console-btn
class="send-to-console"
title="Send to Console"
type="button"
{{on "click" (fn this.sendObjectToConsole @model.lastObject)}}
data-test-send-object-to-console-btn
>
{{svg-jar "send-with-text" width="20px" height="10px"}}
</button>
Expand All @@ -39,16 +41,18 @@
<div class="split__panel__bd">
<div class="toolbar object-inspector-toolbar">
<button
data-test-object-display-type-grouped
class="toolbar__radio toolbar__radio--first {{if (eq this.propDisplayType "grouped") "active"}}"
type="button"
{{on "click" (fn this.setPropDisplay "grouped")}}
data-test-object-display-type-grouped
>
Grouped
</button>
<button
data-test-object-display-type-all
class="toolbar__radio {{if (eq this.propDisplayType "all") "active"}}"
type="button"
{{on "click" (fn this.setPropDisplay "all")}}
data-test-object-display-type-all
>
All
</button>
Expand All @@ -70,6 +74,7 @@
title="clear"
{{on "click" this.clearCustomFilter}}
data-test-object-inspector-custom-search-clear
type="button"
>
{{svg-jar "clear" width="14px" height="14px"}}
</button>
Expand Down
3 changes: 2 additions & 1 deletion app/components/object-inspector/errors.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<h2 class="mixin__name mixin__name--errors bg-base00">
Errors
<button
data-test-send-errors-to-console
class="send-to-console send-to-console--chevron-only ml-1"
type="button"
{{on "click" @traceErrors}}
data-test-send-errors-to-console
>
{{svg-jar "send-with-chevron" width="6px" height="9px"}}
Trace in the Console
Expand Down
7 changes: 5 additions & 2 deletions app/components/object-inspector/property.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<button
class="mixin__cp-toggle {{if this.showDependentKeys "mixin__cp-toggle--expanded"}}"
{{on "click" this.toggleDeps}}
type="button"
>
{{svg-jar
"disclosure-triangle"
Expand Down Expand Up @@ -80,10 +81,11 @@
{{else}}
{{#if this.canCalculate}}
<button
data-test-calculate
class="mixin__calc-btn"
title="compute property"
type="button"
{{on "click" @calculate bubbles=false}}
data-test-calculate
>
{{svg-jar "calculate" width="16px" height="16px"}}
</button>
Expand Down Expand Up @@ -112,10 +114,11 @@
</span>

<button
data-test-send-to-console-btn
class="mixin__send-btn flex-shrink-0 send-to-console"
title="Send to console"
type="button"
{{on "click" @sendToConsole}}
data-test-send-to-console-btn
>
{{svg-jar "send-with-text" width="20px" height="10px"}}
</button>
Expand Down
4 changes: 3 additions & 1 deletion app/components/promise-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
class="send-to-console send-to-console--chevron-only js-trace-promise-btn"
title="Trace promise in console"
{{action @tracePromise @model}}
type="button"
>
{{svg-jar "send-with-chevron" width="6px" height="9px"}}
Trace
Expand Down Expand Up @@ -55,10 +56,11 @@
<div class="list__cell-helper">
{{#if this.isError}}
<button
data-test-send-to-console-btn
class="send-to-console send-to-console--chevron-only"
title="Send stack trace to the console"
type="button"
{{action @sendValueToConsole @model}}
data-test-send-to-console-btn
>
{{svg-jar "send-with-chevron" width="6px" height="9px"}}
Stack Trace
Expand Down
1 change: 1 addition & 0 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<button
class="sidebar-toggle toolbar__icon-button {{if this.inspectorExpanded "flip"}}"
{{on "click" this.toggleInspector}}
type="button"
>
{{svg-jar "sidebar-toggle" width="16" height="16"}}
</button>
Expand Down
3 changes: 3 additions & 0 deletions app/templates/component-tree-toolbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<button
class="{{if this.isInspecting "active"}} toolbar__icon-button"
{{on "click" this.toggleInspect}}
type="button"
>
{{svg-jar "inspect" width="16px" height="17px"}}
</button>
Expand All @@ -12,6 +13,7 @@
class="toolbar__icon-button"
title="expand all"
{{on "click" this.expandAll}}
type="button"
>
{{svg-jar "chevron-down" width="16px" height="16px"}}
</button>
Expand All @@ -20,6 +22,7 @@
class="toolbar__icon-button"
title="collapse all"
{{on "click" this.collapseAll}}
type="button"
>
{{svg-jar "chevron-right" width="16px" height="16px"}}
</button>
Expand Down
1 change: 1 addition & 0 deletions app/templates/deprecations.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<button
class="js-page-refresh-btn"
{{action "refreshPage"}}
type="button"
>
Reload
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/model-types-toolbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Order Models By Record Count
</label>
</div>
<button class="toolbar__radio js-filter" {{on "click" this.getStore}} data-test-inspect-store>
<button class="toolbar__radio js-filter" {{on "click" this.getStore}} data-test-inspect-store type="button">
Inspect Store
</button>
</div>
4 changes: 4 additions & 0 deletions app/templates/promise-tree-toolbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,29 @@
<button
class="{{if (eq this.filter "all") "active"}} toolbar__radio toolbar__radio--first js-filter"
{{on "click" (fn this.setFilter "all")}}
type="button"
>
All
</button>

<button
class="{{if (eq this.filter "rejected") "active"}} toolbar__radio js-filter"
{{on "click" (fn this.setFilter "rejected")}}
type="button"
>
Rejected
</button>
<button
class="{{if (eq this.filter "pending") "active"}} toolbar__radio js-filter"
{{on "click" (fn this.setFilter "pending")}}
type="button"
>
Pending
</button>
<button
class="{{if (eq this.filter "fulfilled") "active"}} toolbar__radio toolbar__radio--last js-filter"
{{action "setFilter" "fulfilled"}}
type="button"
>
Fulfilled
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/promise-tree.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#if this.shouldRefresh}}
<Ui::EmptyMessage class="js-page-refresh">
<p>Reload the page to see promises created before you opened the inspector.</p>
<button class="js-page-refresh-btn" {{action "refreshPage"}}>Reload</button>
<button class="js-page-refresh-btn" {{action "refreshPage"}} type="button">Reload</button>
</Ui::EmptyMessage>
{{else}}
<List
Expand Down
2 changes: 2 additions & 0 deletions app/templates/records-toolbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<button
class="{{if (is-empty this.filterValue) "active"}} toolbar__radio js-filter"
{{on "click" (fn this.setFilter "")}}
type="button"
>
All
</button>
Expand All @@ -17,6 +18,7 @@
<button
class="{{if (eq this.filterValue filter.name) "active"}} toolbar__radio js-filter"
{{on "click" (fn this.setFilter filter.name)}}
type="button"
>
{{filter.desc}}
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/render-tree.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Ui::EmptyMessage class="js-render-tree-empty">
<p>No rendering metrics have been collected. Try reloading or navigating around your application.</p>
<p><strong>Note:</strong> Very fast rendering times (&lt;1ms) are excluded.</p>
<button class="js-toolbar-page-refresh-btn" {{action "refreshPage"}}>Reload</button>
<button class="js-toolbar-page-refresh-btn" {{action "refreshPage"}} type="button">Reload</button>
</Ui::EmptyMessage>
{{else}}
<List
Expand Down
21 changes: 21 additions & 0 deletions config/ember-cli-update.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.17.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--yarn",
"--no-welcome"
]
}
]
}
]
}
3 changes: 0 additions & 3 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';

/* eslint-env node */
/* global require, module */

const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const VersionChecker = require('ember-cli-version-checker');
Expand All @@ -20,8 +19,6 @@ const path = require('path');
const packageJson = require('./package.json');
const { map, mv } = stew;

/*global process */

const options = {
fingerprint: {
enabled: false
Expand Down
1 change: 1 addition & 0 deletions lib/ui/addon/components/disclosure-triangle.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class="disclosure-triangle {{if @expanded "expanded" "collapsed"}} appearance-none inline-block border-0 cursor-pointer bg-transparent"
{{on "click" @toggle}}
...attributes
type="button"
>
{{svg-jar "disclosure-triangle" width="9px" height="9px"}}
</button>
Expand Down
3 changes: 2 additions & 1 deletion lib/ui/addon/components/send-to-console.hbs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<button
data-test-send-to-console-btn
class="send-to-console"
title="Send to Console"
type="button"
{{on "click" (fn @action @param)}}
data-test-send-to-console-btn
>
{{svg-jar "send-with-text" width="20px" height="10px"}}
</button>
Expand Down
1 change: 1 addition & 0 deletions lib/ui/addon/components/toolbar-clear-button.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class="toolbar__icon-button"
...attributes
{{on "click" @action}}
type="button"
>
{{svg-jar "clear-2" width="13px" height="13px"}}
</button>
Expand Down
1 change: 1 addition & 0 deletions lib/ui/addon/components/toolbar-reload-button.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class="toolbar__icon-button"
...attributes
{{on "click" @action}}
type="button"
>
{{svg-jar "reload" width="13px" height="13px"}}
</button>
Expand Down
1 change: 1 addition & 0 deletions lib/ui/addon/components/toolbar-search-field.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
title="clear"
data-test-search-field-clear-button
{{on "click" this.clear}}
type="button"
>
{{svg-jar "clear" width="14px" height="14px"}}
</button>
Expand Down
1 change: 1 addition & 0 deletions lib/ui/addon/components/warning-message.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<button
class="p-0 border-0 cursor-pointer underline text-inherit bg-transparent"
{{on "click" @close}}
type="button"
>
hide
</button>
Expand Down
Loading

0 comments on commit b3eaf99

Please sign in to comment.