Skip to content

Commit 9bbc456

Browse files
Bump some deps, update Ember to 3.28 (#923)
* Bump some deps * ember-cli 3.28 * Bump some deps * Bump ember-modal-dialog * Fix lint * Fix various things * Remove debugger * Fix some tests and deprecations * Fix some computeds * Fix some testing issues * Back to params * Use fork of render modifiers * Use modal dialog fork * Add macros * Add embroider utils * Remove embroider testing
1 parent 5ec2d98 commit 9bbc456

File tree

51 files changed

+872
-1460
lines changed

Some content is hidden

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

51 files changed

+872
-1460
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

.eslintrc.js

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,18 @@ module.exports = {
4545
// node files
4646
{
4747
files: [
48-
'.eslintrc.js',
49-
'.prettierrc.js',
50-
'.template-lintrc.js',
51-
'ember-cli-build.js',
52-
'addon/styles/tailwind.js',
53-
'index.js',
54-
'testem.js',
55-
'blueprints/*/index.js',
56-
'config/**/*.js',
57-
'lib/**/*.js',
58-
'tests/dummy/config/**/*.js',
59-
'tests-node/**/*.js',
60-
],
61-
excludedFiles: [
62-
'addon/**',
63-
'addon-test-support/**',
64-
'app/**',
65-
'tests/dummy/app/**',
48+
'./.eslintrc.js',
49+
'./.prettierrc.js',
50+
'./.template-lintrc.js',
51+
'./ember-cli-build.js',
52+
'./index.js',
53+
'./testem.js',
54+
'./addon/styles/tailwind.js',
55+
'./blueprints/*/index.js',
56+
'./config/**/*.js',
57+
'./lib/**/*.js',
58+
'./tests/dummy/config/**/*.js',
59+
'./tests-node/**/*.js',
6660
],
6761
parserOptions: {
6862
sourceType: 'script',
@@ -74,7 +68,6 @@ module.exports = {
7468
plugins: ['node'],
7569
extends: ['plugin:node/recommended'],
7670
},
77-
7871
// node test files
7972
{
8073
globals: {
@@ -88,5 +81,10 @@ module.exports = {
8881
'node/no-unpublished-require': 'off',
8982
},
9083
},
84+
{
85+
// Test files:
86+
files: ['tests/**/*-test.{js,ts}'],
87+
extends: ['plugin:qunit/recommended'],
88+
},
9189
],
9290
};

.github/workflows/ci-cd.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,15 @@ jobs:
123123
fail-fast: true
124124
matrix:
125125
scenario:
126-
- 'ember-lts-3.16'
127126
- 'ember-lts-3.20'
127+
- 'ember-lts-3.24'
128128
- 'ember-release'
129129
- 'ember-beta'
130130
- 'ember-canary'
131131
- 'ember-default-with-jquery'
132132
- 'ember-classic'
133-
- 'ember-concurrency-2.x'
133+
# - 'embroider-safe'
134+
# - 'embroider-optimized'
134135
timeout-minutes: 7
135136
steps:
136137
- name: Check out a copy of the repo

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
/ember-cli-build.js
2626
/testem.js
2727
/tests/
28+
/yarn-error.log
2829
/yarn.lock
2930
.gitkeep
3031

.prettierrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,13 @@
22

33
module.exports = {
44
singleQuote: true,
5+
overrides: [
6+
{
7+
files: '**/*.hbs',
8+
options: {
9+
parser: 'glimmer',
10+
singleQuote: false,
11+
},
12+
},
13+
],
514
};

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ember-cli-addon-docs
99
Compatibility
1010
------------------------------------------------------------------------------
1111

12-
* Ember.js v3.16 or above
13-
* Ember CLI v2.13 or above
14-
* Node.js v10 or above
12+
* Ember.js v3.20 or above
13+
* Ember CLI v3.20 or above
14+
* Node.js v12 or above
1515

1616
**2/28/20 Update: AddonDocs is in Maintenace Mode.**
1717

addon/components/api/x-component/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Show
1010
</panel.header>
1111

12-
{{#if hasToggles}}
12+
{{#if this.hasToggles}}
1313
<Api::XToggles @toggles={{hash
1414
inherited=(if @component.hasInherited this.showInherited)
1515
internal=(if @component.hasInternal this.showInternal)
@@ -22,7 +22,7 @@
2222
{{/if}}
2323

2424

25-
{{#if hasContents}}
25+
{{#if this.hasContents}}
2626
<Api::XSections @sections={{hash
2727
constructors=this.constructors
2828
yields=this.yields

addon/components/api/x-import-path/component.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ export default Component.extend({
88
<pre class="docs-md__code docs-whitespace-no-wrap">
99
<span class="hljs-keyword">import</span>
1010
11-
{{#if (eq item.exportType "default")}}
12-
{{item.name}}
11+
{{#if (eq @item.exportType "default")}}
12+
{{@item.name}}
1313
{{else}}
14-
{ {{item.name}} }
14+
{ {{@item.name}} }
1515
{{/if}}
1616
1717
<span class="hljs-keyword">from</span>
18-
<span class="hljs-string">'{{item.file}}'</span>;
18+
<span class="hljs-string">'{{@item.file}}'</span>;
1919
</pre>
2020
</div>
2121
`,

addon/components/api/x-section/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</span>
1212
{{/if}}
1313

14-
{{#if (or @item.isClass item.isComponent)}}
14+
{{#if (or @item.isClass @item.isComponent)}}
1515
<LinkTo @route="docs.api.item" @model={{concat "modules/" @item.id}} class="hover:underline">
1616
<strong>{{@item.name}}</strong>
1717
</LinkTo>

addon/components/api/x-sections/component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Component from '@ember/component';
44
export default Component.extend({
55
tagName: '',
66
layout: hbs`
7-
{{#each-in sections as |sectionName items|}}
7+
{{#each-in @sections as |sectionName items|}}
88
{{#if items}}
99
<section data-test-api-section class="item-section">
1010
<h2 data-test-section-header={{sectionName}} class="docs-h2">

0 commit comments

Comments
 (0)