Skip to content

Commit 5515bc7

Browse files
czoselMitanOmarderrabauke
authored
chore: upgrade to ember v6.4 (#819)
* chore: upgrade dependencies * chore: remove the @ember/string package * chore: v4.9.2...v5.12.0 * chore: v5.12.0...v6.4.0 * chore: move babel core to dev dependencies * chore: install eslint-plugin-prettier * fix: @ember/string package should be in dev dependencies * fix: linting issues * refactor: apply eslint adfinis configuration * fix: linting issue * chore: upgrade eslint-plugin-import * fix: linting issues * refactor: changelog.md file with the new prettier configuration * fix: the ignore paths inside eslint ignore should not start with slash * refactor: replace `inject as service` with `service` * test: use correct import for ember-power-select test helpers * chore(deps): upgrade deps and refactor testing setup * chore: upgrade to ember v6.8 * test: inject ember engine as owner for rendering tests * chore(deps): checkout and update old pnpm-lockfile * refactor: retrive the default modifier * chore: add `{ owner: this.engine }` to rendering calls * fix: pnpm-lock file after rebasing * fix: linting issue * refactor: replace this.owner with this.engine * fix: linting issues * fix: setup the engine in setupApplicationTest * chore: downgrade ember-source to 6.4.0 * fix: setup intl correctly in tests * refactor: use the setLocale test helper from ember-intl * refactor: the meta field is not defined inside testing * fix: the model name inside testing env * fix: the stub service register via this.owner as explained in ember engines docs * fix(tree-test): component with new ember js native input api * fix(optional-translation-test): setup intl was called twice * fix: users edit tests, with more strict roles * fix: cicd * chore: remove the support of ember version 4.8 * chore: add scenario tests of version 5.4 and 5.8 * fix: the CICD by correcting the ember version * chore: test the addon with version 5.4 * chore: enable `ember-release` scenario * refactor: remove the strict test assertion * chore: add ember-beta and ember-canary to tests scenario --------- Co-authored-by: Mitan Omar <[email protected]> Co-authored-by: Falk <[email protected]>
1 parent b64e2c0 commit 5515bc7

File tree

109 files changed

+3397
-5393
lines changed

Some content is hidden

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

109 files changed

+3397
-5393
lines changed

.ember-cli

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
{
22
/**
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.
3+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
4+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
5+
*/
6+
"isTypeScriptProject": false,
57

6-
Setting `disableAnalytics` to true will prevent any data from being sent.
8+
/**
9+
Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
10+
or GTS files for the component and the component rendering test. "strict" is the default.
711
*/
8-
"disableAnalytics": false,
12+
"componentAuthoringFormat": "strict",
913

1014
/**
11-
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12-
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
15+
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
16+
or GTS templates for routes. "strict" is the default
1317
*/
14-
"isTypeScriptProject": false
18+
"routeAuthoringFormat": "strict"
1519
}

.eslintignore

Lines changed: 0 additions & 25 deletions
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,13 @@ jobs:
6161
fail-fast: false
6262
matrix:
6363
scenario:
64-
- ember-lts-4.8
6564
- ember-lts-4.12
66-
# Disable for now since ember-data@4 causes an embroider build error. See https://github.com/projectcaluma/ember-emeis/pull/625#issuecomment-1614488464
67-
# - ember-release
65+
- ember-lts-5.4
66+
- ember-lts-5.8
67+
- ember-lts-5.12
68+
- ember-release
69+
- ember-beta
70+
- ember-canary
6871
- embroider-safe
6972
- embroider-optimized
7073
steps:

.gitignore

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
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
*.swp
2317

24-
# ember-try
25-
/.node_modules.ember-try/
26-
/bower.json.ember-try
27-
/npm-shrinkwrap.json.ember-try
28-
/package.json.ember-try
29-
/package-lock.json.ember-try
30-
/yarn.lock.ember-try
31-
3218
# broccoli-debug
3319
/DEBUG/

.npmignore

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,27 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
139
/.eslintcache
14-
/.eslintignore
15-
/.eslintrc.js
1610
/.git/
1711
/.github/
1812
/.gitignore
1913
/.prettierignore
2014
/.prettierrc.js
15+
/.stylelintignore
16+
/.stylelintrc.js
2117
/.template-lintrc.js
22-
/.travis.yml
2318
/.watchmanconfig
24-
/bower.json
2519
/CONTRIBUTING.md
2620
/ember-cli-build.js
21+
/eslint.config.mjs
2722
/testem.js
2823
/tests/
24+
/tsconfig.declarations.json
25+
/tsconfig.json
2926
/yarn-error.log
3027
/yarn.lock
3128
.gitkeep
32-
33-
# ember-try
34-
/.node_modules.ember-try/
35-
/bower.json.ember-try
36-
/npm-shrinkwrap.json.ember-try
37-
/package.json.ember-try
38-
/package-lock.json.ember-try
39-
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 16 deletions
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/
18-
19-
# ember-try
20-
/.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
10+
.*/
11+
/pnpm-lock.yaml
12+
ember-cli-update.json
13+
*.html

.stylelintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/

.stylelintrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
"use strict";
2+
3+
module.exports = {
4+
customSyntax: "postcss-scss",
5+
extends: ["stylelint-config-standard", "stylelint-prettier/recommended"],
6+
rules: {
7+
"import-notation": null,
8+
},
9+
};

.template-lintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
22

33
module.exports = {
4-
extends: ["recommended", "ember-template-lint-plugin-prettier:recommended"],
5-
plugins: ["ember-template-lint-plugin-prettier"],
4+
extends: ["recommended"],
65

76
rules: {
87
"require-input-label": "warn",
8+
"no-at-ember-render-modifiers": "warn",
99
},
1010
};

0 commit comments

Comments
 (0)