Skip to content

Commit 6a62491

Browse files
authored
Updated dependencies and ember-try scenarios (#408)
* chore: Updated dependencies * chore: Updated configurations for dummy app * chore: Simplified scripts for lint and test * chore: Updated lint configurations * chore: Ran lint:hbs:fix * chore: Ran lint:js:fix * chore: Ignored remaining lint errors * refactor: Removed classic layout from dummy app * chore: Replaced ember-prism (deprecated, incompatible with newer dependencies) with ember-shiki * chore: Patched ember-shiki to run on older Ember versions * bugfix: Downgraded liquid-* packages to versions set in tag 4.1.4 * chore: Updated ember-try scenarios * chore: Added lockfile * bugfix: Forced the original perf-primitives to be installed for dummy app * chore: Updated lockfile --------- Co-authored-by: ijlee2 <ijlee2@users.noreply.github.com>
1 parent b29db92 commit 6a62491

Some content is hidden

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

49 files changed

+5046
-6538
lines changed

.eslintignore

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,15 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# ember-try
2014
/.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
2615
/pnpm-lock.yaml.ember-try

.eslintrc.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2020,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
[
13+
'@babel/plugin-proposal-decorators',
14+
{
15+
decoratorsBeforeExport: true,
16+
},
17+
],
18+
],
1119
},
1220
},
1321
plugins: ['ember'],
@@ -19,30 +27,24 @@ module.exports = {
1927
env: {
2028
browser: true,
2129
},
22-
globals: {
23-
globalThis: 'readonly',
24-
},
2530
rules: {
2631
'no-setter-return': 'off',
2732
'ember/classic-decorator-no-classic-methods': 'warn',
2833
'ember/classic-decorator-hooks': 'warn',
29-
'ember/no-actions-hash': 'warn',
3034
'ember/no-classic-classes': 'warn',
3135
'ember/no-classic-components': 'warn',
3236
'ember/no-component-lifecycle-hooks': 'warn',
3337
'ember/no-computed-properties-in-native-classes': 'warn',
34-
'ember/no-get': 'warn',
3538
'ember/no-observers': 'warn',
36-
'ember/require-computed-macros': 'warn',
3739
'ember/require-tagless-components': 'warn',
38-
'ember/no-jquery': 'error',
3940
},
4041
overrides: [
4142
// node files
4243
{
4344
files: [
4445
'./.eslintrc.js',
4546
'./.prettierrc.js',
47+
'./.stylelintrc.js',
4648
'./.template-lintrc.js',
4749
'./ember-cli-build.js',
4850
'./index.js',
@@ -58,8 +60,7 @@ module.exports = {
5860
browser: false,
5961
node: true,
6062
},
61-
plugins: ['node'],
62-
extends: ['plugin:node/recommended'],
63+
extends: ['plugin:n/recommended'],
6364
},
6465
{
6566
// test files

.github/workflows/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
test:
1919
name: "Tests"
2020
runs-on: ubuntu-latest
21+
timeout-minutes: 5
2122

2223
steps:
2324
- uses: actions/checkout@v4
@@ -46,11 +47,12 @@ jobs:
4647
- name: Lint
4748
run: pnpm lint
4849
- name: Run Tests
49-
run: pnpm test:ember
50+
run: pnpm test
5051

5152
floating:
5253
name: "Floating Dependencies"
5354
runs-on: ubuntu-latest
55+
timeout-minutes: 5
5456

5557
steps:
5658
- uses: actions/checkout@v4
@@ -77,29 +79,25 @@ jobs:
7779
shell: bash
7880
run: pnpm store prune
7981
- name: Run Tests
80-
run: pnpm test:ember
82+
run: pnpm test
8183

8284
try-scenarios:
8385
name: ${{ matrix.try-scenario }}
8486
runs-on: ubuntu-latest
85-
needs: 'test'
87+
timeout-minutes: 5
8688

8789
strategy:
8890
fail-fast: false
8991
matrix:
9092
try-scenario:
91-
- ember-lts-3.24
9293
- ember-lts-3.28
93-
- ember-lts-4.4
94-
- ember-lts-4.8
9594
- ember-lts-4.12
96-
- ember-lts-5.4
97-
- ember-lts-5.8
95+
- ember-lts-5.12
9896
- ember-release
9997
- ember-beta
10098
- ember-canary
10199
- embroider-safe
102-
- embroider-optimized
100+
# - embroider-optimized
103101

104102
steps:
105103
- uses: actions/checkout@v4
@@ -126,4 +124,4 @@ jobs:
126124
shell: bash
127125
run: pnpm store prune
128126
- name: Run Tests
129-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
127+
run: pnpm test:ember-compatibility ${{ matrix.try-scenario }} --- pnpm test

.gitignore

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
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

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
2619
/npm-shrinkwrap.json.ember-try
2720
/package.json.ember-try
2821
/package-lock.json.ember-try
2922
/yarn.lock.ember-try
3023
/pnpm-lock.yaml.ember-try
24+
25+
# broccoli-debug
26+
/DEBUG/

.npmignore

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
@@ -18,23 +14,23 @@
1814
/.gitignore
1915
/.prettierignore
2016
/.prettierrc.js
17+
/.stylelintignore
18+
/.stylelintrc.js
2119
/.template-lintrc.js
22-
/.travis.yml
2320
/.watchmanconfig
24-
/bower.json
25-
/config/ember-try.js
2621
/CONTRIBUTING.md
2722
/ember-cli-build.js
2823
/testem.js
2924
/tests/
25+
/tsconfig.declarations.json
26+
/tsconfig.json
3027
/yarn-error.log
3128
/yarn.lock
3229
/pnpm-lock.yaml
3330
.gitkeep
3431

3532
# ember-try
3633
/.node_modules.ember-try/
37-
/bower.json.ember-try
3834
/npm-shrinkwrap.json.ember-try
3935
/package.json.ember-try
4036
/package-lock.json.ember-try

.prettierignore

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
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/
10+
.*/
1811

1912
# ember-try
2013
/.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
2614
/pnpm-lock.yaml.ember-try

.prettierrc.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.hbs',
7+
options: {
8+
printWidth: 64,
9+
singleQuote: false,
10+
},
11+
},
12+
{
13+
files: '*.{js,ts}',
14+
options: {
15+
printWidth: 80,
16+
singleQuote: true,
17+
},
18+
},
19+
],
520
};

.template-lintrc.js

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

33
module.exports = {
4-
extends: 'recommended',
4+
plugins: ['ember-template-lint-plugin-prettier'],
5+
extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
56
rules: {
67
'no-action': false,
7-
'no-curly-component-invocation': false,
8-
'require-button-type': false,
98
},
9+
overrides: [
10+
{
11+
files: ['tests/**/*-test.{js,ts}'],
12+
rules: {
13+
prettier: 'off',
14+
},
15+
},
16+
],
1017
};

addon/components/basic-dialog.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default class BasicDialog extends Component {
3636
'attachmentClass',
3737
'containerClass',
3838
'containerClassNames.{[],join}',
39-
'targetAttachmentClass'
39+
'targetAttachmentClass',
4040
)
4141
get containerClassNamesString() {
4242
let classNames =
@@ -72,7 +72,7 @@ export default class BasicDialog extends Component {
7272
'targetAttachmentClass',
7373
'variantWrapperClass',
7474
'wrapperClass',
75-
'wrapperClassNames.{[],join}'
75+
'wrapperClassNames.{[],join}',
7676
)
7777
get wrapperClassNamesString() {
7878
let classNames =
@@ -100,7 +100,7 @@ export default class BasicDialog extends Component {
100100
// Convert tether-styled values like 'middle right' to 'right'
101101
targetAttachment = targetAttachment.split(' ').slice(-1)[0];
102102
return `ember-modal-dialog-target-attachment-${dasherize(
103-
targetAttachment
103+
targetAttachment,
104104
)} emd-target-attachment-${dasherize(targetAttachment)}`;
105105
}
106106

addon/components/liquid-tether-dialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default class LiquidTetherDialog extends BasicDialog {
1313
// Convert tether-styled values like 'middle right' to 'right'
1414
targetAttachment = targetAttachment.split(' ').slice(-1)[0];
1515
return `ember-modal-dialog-target-attachment-${dasherize(
16-
targetAttachment
16+
targetAttachment,
1717
)} emd-target-attachment-${dasherize(targetAttachment)}`;
1818
}
1919

0 commit comments

Comments
 (0)