Skip to content

Commit a492cf5

Browse files
tobiemhtobiemh
committed
Upgrade to ember-cli@5.4.0
1 parent b36afbe commit a492cf5

File tree

152 files changed

+33893
-51352
lines changed

Some content is hidden

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

152 files changed

+33893
-51352
lines changed

‎.ember-cli.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ setEdition('octane');
66

77
module.exports = {
88
/**
9-
Ember CLI sends analytics information by default. The data is completely
10-
anonymous, but there are times when you might want to disable this behavior.
11-
12-
Setting `disableAnalytics` to true will prevent any data from being sent.
9+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
10+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
1311
*/
14-
"disableAnalytics": false
12+
"isTypeScriptProject": false
1513
}

‎.eslintignore

-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +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
!.*
1610
.*/
17-
.eslintcache
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/package.json.ember-try

‎.eslintrc.js

+10-12
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
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'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./testem.js',
@@ -41,16 +45,10 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
46-
rules: {
47-
// this can be removed once the following is fixed
48-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
49-
'node/no-unpublished-require': 'off',
50-
},
48+
extends: ['plugin:n/recommended'],
5149
},
5250
{
53-
// Test files:
51+
// test files
5452
files: ['tests/**/*-test.{js,ts}'],
5553
extends: ['plugin:qunit/recommended'],
5654
},

‎.github/workflows/ci.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
lint:
16+
name: "Lint"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 18
26+
cache: npm
27+
- name: Install Dependencies
28+
run: npm ci
29+
- name: Lint
30+
run: npm run lint
31+
32+
test:
33+
name: "Test"
34+
runs-on: ubuntu-latest
35+
timeout-minutes: 10
36+
37+
steps:
38+
- uses: actions/checkout@v3
39+
- name: Install Node
40+
uses: actions/setup-node@v3
41+
with:
42+
node-version: 18
43+
cache: npm
44+
- name: Install Dependencies
45+
run: npm ci
46+
- name: Run Tests
47+
run: npm test

‎.gitignore

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216
/.vscode/
2317

2418
# ember-try
2519
/.node_modules.ember-try/
26-
/bower.json.ember-try
20+
/npm-shrinkwrap.json.ember-try
2721
/package.json.ember-try
22+
/package-lock.json.ember-try
23+
/yarn.lock.ember-try
24+
25+
# broccoli-debug
26+
/DEBUG/
2827

2928
# packages compiled output
3029
/packages/*/dist/

‎.prettierignore

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +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
10+
.*/
1711

1812
# ember-try
1913
/.node_modules.ember-try/
20-
/bower.json.ember-try
21-
/package.json.ember-try

‎.prettierrc.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

‎.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

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

‎.travis.yml

-25
This file was deleted.

‎.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
}

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ clean:
4848
.PHONY: setup
4949
setup:
5050
@echo "Setup..."
51-
npx lerna bootstrap
51+
npm install
5252

5353
.PHONY: serve
5454
serve:

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You will need the following things properly installed on your computer.
99

1010
* [Git](https://git-scm.com/)
1111
* [Node.js](https://nodejs.org/) (with npm)
12-
* [Ember CLI](https://ember-cli.com/)
12+
* [Ember CLI](https://cli.emberjs.com/release/)
1313
* [Google Chrome](https://google.com/chrome/)
1414

1515
## Installation
@@ -51,7 +51,7 @@ Specify what it takes to deploy your app.
5151
## Further Reading / Useful Links
5252

5353
* [ember.js](https://emberjs.com/)
54-
* [ember-cli](https://ember-cli.com/)
54+
* [ember-cli](https://cli.emberjs.com/release/)
5555
* Development Browser Extensions
5656
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
5757
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

‎app/templates/application/menu.hbs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Ascua::Contextmenu::Item @click={{console}} @label="Do something special" />
1+
<Ascua::Contextmenu::Item @click={{(console)}} @label="Do something special" />
22

33
<Ascua::Contextmenu::Item @type="separator" />
44

5-
<Ascua::Contextmenu::Item @click={{history-back}} @label="Back" />
6-
<Ascua::Contextmenu::Item @click={{history-forward}} @label="Forward" />
7-
<Ascua::Contextmenu::Item @click={{reload}} @label="Reload Page" @role="reload" />
5+
<Ascua::Contextmenu::Item @click={{(history-back)}} @label="Back" />
6+
<Ascua::Contextmenu::Item @click={{(history-forward)}} @label="Forward" />
7+
<Ascua::Contextmenu::Item @click={{(reload)}} @label="Reload Page" @role="reload" />
88

99
<Ascua::Contextmenu::Item @type="separator" />
1010

‎app/templates/elements/contextmenu.hbs

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828

2929
<Example @name="demo-elements-contextmenu.hbs" @hide={{true}}>
3030

31-
<Ascua::Contextmenu::Item @click={{console}} @label="Do something special" />
31+
<Ascua::Contextmenu::Item @click={{(console)}} @label="Do something special" />
3232

3333
<Ascua::Contextmenu::Item @type="separator" />
3434

35-
<Ascua::Contextmenu::Item @click={{history-back}} @label="Back" />
36-
<Ascua::Contextmenu::Item @click={{history-forward}} @label="Forward" />
37-
<Ascua::Contextmenu::Item @click={{reload}} @label="Reload Page" @role="reload" />
35+
<Ascua::Contextmenu::Item @click={{(history-back)}} @label="Back" />
36+
<Ascua::Contextmenu::Item @click={{(history-forward)}} @label="Forward" />
37+
<Ascua::Contextmenu::Item @click={{(reload)}} @label="Reload Page" @role="reload" />
3838

3939
<Ascua::Contextmenu::Item @type="separator" />
4040

‎app/templates/elements/dragdrop.hbs

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<p>To create a draggable item, surround your HTML with an <code>Ascua::Draggable</code> component. Any handlebars inside the <code>Ascua::Draggable</code> component will be made draggable.</p>
1414

1515
<Example @name="demo-elements-dragdrop-draggable.hbs">
16-
<Ascua::Draggable inline @onDrag={{console}} />
17-
<Ascua::Draggable inline @onDrag={{console}} />
18-
<Ascua::Draggable inline @onDrag={{console}} />
16+
<Ascua::Draggable inline @onDrag={{(console)}} />
17+
<Ascua::Draggable inline @onDrag={{(console)}} />
18+
<Ascua::Draggable inline @onDrag={{(console)}} />
1919
</Example>
2020

2121
<h2>Advanced</h2>
2222

2323
<p>To create a droppable area, surround your HTML with an <code>Ascua::Droppable</code> component. Any handlebars inside the <code>Ascua::Droppable</code> component will be made droppable.</p>
2424

2525
<Example @name="demo-elements-dragdrop-droppable.hbs">
26-
<Ascua::Droppable @onDrop={{console}} />
26+
<Ascua::Droppable @onDrop={{(console)}} />
2727
</Example>

‎app/templates/elements/input.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<p>The <code>Ascua::Input::Area</code> component augments the Ember <code>textarea</code> element and enables autosizing, and line limits.</p>
1414

1515
<Example @name="demo-elements-input-area.hbs">
16-
<Ascua::Input::Area @rows={{5}} @limit={{10}} @auto={{true}} @onChange={{console}} />
16+
<Ascua::Input::Area @rows={{5}} @limit={{10}} @auto={{true}} @onChange={{(console)}} />
1717
</Example>
1818

1919
<h2>Star</h2>
@@ -29,5 +29,5 @@
2929
<p>The <code>Ascua::Input::Text</code> component enables a simple one-way binding text box.</p>
3030

3131
<Example @name="demo-elements-input-text.hbs">
32-
<Ascua::Input::Text @value="Test" @onChange={{console}} />
32+
<Ascua::Input::Text @value="Test" @onChange={{(console)}} />
3333
</Example>

‎app/templates/elements/label.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<p>To display a close button, in order to run a callback when a label is remove, pass a <code>onClose</code> action.</p>
4444

4545
<Example @name="docs-demo-elements-label-closeable.hbs">
46-
<Ascua::Label @type="red" @text="Closeable label" @onClose={{console}} />
46+
<Ascua::Label @type="red" @text="Closeable label" @onClose={{(console)}} />
4747
</Example>
4848

4949
<h2>Different colours</h2>

‎app/templates/elements/uploader.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<Example @name="demo-elements-uploader-basic.hbs">
1616
<div class="h-400">
17-
<Ascua::Uploader @height="300" @onOpen={{console "File uploaded"}} />
17+
<Ascua::Uploader @height="300" @onOpen={{(console "File uploaded")}} />
1818
</div>
1919
</Example>
2020

@@ -24,7 +24,7 @@
2424

2525
<Example @name="demo-elements-uploader-block.hbs">
2626
<div class="h-400">
27-
<Ascua::Uploader @height="300" @onOpen={{console "File uploaded"}} as |d|>
27+
<Ascua::Uploader @height="300" @onOpen={{(console "File uploaded")}} as |d|>
2828
{{#if d.dropping}}
2929
<br> Drop your files here.
3030
{{else}}

‎app/templates/guides/bigdata/infinite.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
</Example>
2424

25-
<p>In order to create a computed infinite array, use the <code>@infinite</code> decorator. This will define a computed property which will update then any dependent properties are changed.</p>
25+
<p>In order to create a computed infinite array, use the <code>@infinite</code> decorator. This will define a computed property which will update when any dependent properties are changed.</p>
2626

2727
<Example @name="demo-guides-bigdata-infinite-decorator.js">
2828
import Component from '@ember/component';

0 commit comments

Comments
 (0)