Skip to content

Commit bfe310a

Browse files
authored
Merge pull request #529 from gitKrystan/upgrades
Upgrade Dependencies + Fix CI
2 parents 7738a48 + 55a5504 commit bfe310a

38 files changed

+7414
-5297
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
node-version: [14.x, 16.x, 18.x]
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
- uses: actions/setup-node@v3
2020
with:
2121
node-version: ${{ matrix.node-version }}

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ node_modules
33
.eslintcache
44
**/__testfixtures__/**
55
**/fixtures/**
6-
CHANGELOG.md
6+
CHANGELOG.md
7+
README.md

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,40 +46,40 @@
4646
"update-docs": "codemod-cli update-docs"
4747
},
4848
"dependencies": {
49-
"@babel/parser": "^7.21.2",
49+
"@babel/parser": "^7.21.4",
5050
"camelcase": "^6.3.0",
5151
"codemod-cli": "^3.2.0",
52-
"cosmiconfig": "^8.1.0",
52+
"cosmiconfig": "^8.1.3",
5353
"deepmerge-ts": "^4.3.0",
5454
"ember-codemods-telemetry-helpers": "^3.0.0",
55-
"minimatch": "^7.3.0",
55+
"minimatch": "^7.4.6",
5656
"walk-sync": "^3.0.0",
5757
"winston": "^3.8.2",
58-
"zod": "^3.20.6"
58+
"zod": "^3.21.4"
5959
},
6060
"devDependencies": {
61-
"@babel/core": "^7.21.0",
62-
"@babel/eslint-parser": "^7.19.1",
63-
"@babel/preset-env": "^7.20.2",
64-
"@jest/globals": "^29.4.3",
61+
"@babel/core": "^7.21.4",
62+
"@babel/eslint-parser": "^7.21.3",
63+
"@babel/preset-env": "^7.21.4",
64+
"@jest/globals": "^29.5.0",
6565
"@release-it-plugins/lerna-changelog": "^5.0.0",
6666
"@tsconfig/node12": "^1.0.11",
6767
"@types/jscodeshift": "^0.11.6",
68-
"@typescript-eslint/eslint-plugin": "^5.54.0",
69-
"@typescript-eslint/parser": "^5.54.0",
70-
"concurrently": "^7.6.0",
71-
"eslint": "^8.35.0",
72-
"eslint-config-prettier": "^8.6.0",
68+
"@typescript-eslint/eslint-plugin": "^5.59.1",
69+
"@typescript-eslint/parser": "^5.59.1",
70+
"concurrently": "^8.0.1",
71+
"eslint": "^8.39.0",
72+
"eslint-config-prettier": "^8.8.0",
7373
"eslint-plugin-eslint-comments": "^3.2.0",
74-
"eslint-plugin-jsdoc": "^40.0.0",
74+
"eslint-plugin-jsdoc": "43.0.5",
7575
"eslint-plugin-node": "^11.1.0",
76-
"eslint-plugin-unicorn": "^45.0.2",
76+
"eslint-plugin-unicorn": "^46.0.0",
7777
"execa": "^5.1.1",
78-
"jest": "^29.4.3",
79-
"prettier": "^2.8.4",
80-
"release-it": "^15.6.1",
81-
"ts-jest": "^29.0.5",
82-
"typescript": "^4.9.5"
78+
"jest": "^29.5.0",
79+
"prettier": "^2.8.8",
80+
"release-it": "^15.10.1",
81+
"ts-jest": "^29.1.0",
82+
"typescript": "^5.0.4"
8383
},
8484
"engines": {
8585
"node": ">= 14.*"

test/fixtures/input/.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

test/fixtures/input/.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/

test/fixtures/input/.eslintrc.js

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,58 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
47
ecmaVersion: 2018,
5-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
612
},
7-
plugins: [
8-
'ember'
9-
],
13+
plugins: ['ember'],
1014
extends: [
1115
'eslint:recommended',
12-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1318
],
1419
env: {
15-
browser: true
16-
},
17-
rules: {
20+
browser: true,
1821
},
22+
rules: {},
1923
overrides: [
2024
// node files
2125
{
2226
files: [
23-
'.eslintrc.js',
24-
'.template-lintrc.js',
25-
'ember-cli-build.js',
26-
'testem.js',
27-
'blueprints/*/index.js',
28-
'config/**/*.js',
29-
'lib/*/index.js',
30-
'server/**/*.js'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./testem.js',
32+
'./blueprints/*/index.js',
33+
'./config/**/*.js',
34+
'./lib/*/index.js',
35+
'./server/**/*.js',
3136
],
3237
parserOptions: {
3338
sourceType: 'script',
34-
ecmaVersion: 2015
3539
},
3640
env: {
3741
browser: false,
38-
node: true
42+
node: true,
3943
},
4044
plugins: ['node'],
41-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
42-
// add your custom rules and overrides for node files here
43-
45+
extends: ['plugin:node/recommended'],
46+
rules: {
4447
// this can be removed once the following is fixed
4548
// https://github.com/mysticatea/eslint-plugin-node/issues/77
46-
'node/no-unpublished-require': 'off'
47-
})
48-
}
49-
]
49+
'node/no-unpublished-require': 'off',
50+
},
51+
},
52+
{
53+
// Test files:
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
57+
],
5058
};

test/fixtures/input/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

test/fixtures/input/.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

test/fixtures/input/.prettierrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'recommended',
55
};

0 commit comments

Comments
 (0)