Skip to content

Commit 0c36382

Browse files
bryanjtcbryanjtc
authored
Upgrade dependencies and migrate to pnpm (#1085)
* Upgrade yarn and dependencies * Fix peer dependency * Relax peer dependency * Lower node version requirement * Migrate from yarn to pnp * fix action * Replace dependabot with renovate * Pin dependencies and fixed warning
1 parent 97b3dc6 commit 0c36382

File tree

19 files changed

+9648
-8021
lines changed

19 files changed

+9648
-8021
lines changed

‎.github/dependabot.yml‎

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

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,19 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
node_version: ['16', '18']
16+
node_version: ['14', '16', '18']
1717

1818
steps:
1919
- uses: actions/checkout@v3
20+
- uses: pnpm/action-setup@v2
21+
with:
22+
version: 7.18.2
2023
- name: Use Node.js ${{ matrix.node-version }}
2124
uses: actions/setup-node@v3
2225
with:
2326
node-version: ${{ matrix.node-version }}
24-
25-
- name: yarn install, build, and test
27+
cache: 'pnpm'
28+
- name: pnpm install, build, and test
2629
run: |
27-
yarn install
28-
yarn test
30+
pnpm install --frozen-lockfile
31+
pnpm test

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,12 @@ typings/
5959

6060
# next.js build output
6161
.next
62+
63+
# Yarn berry
64+
.pnp.*
65+
.yarn/*
66+
!.yarn/patches
67+
!.yarn/plugins
68+
!.yarn/releases
69+
!.yarn/sdks
70+
!.yarn/versions

‎jest.config.base.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ module.exports = {
55
'<rootDir>/packages',
66
],
77
'transform': {
8-
'^.+\\.js$': 'babel-jest',
9-
'^.+\\.ts$': 'ts-jest',
8+
'^.+\\.(t|j)sx?$': ['@swc/jest'],
109
},
1110
'moduleFileExtensions': [
1211
'ts',

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"npmClient": "yarn",
5+
"npmClient": "pnpm",
66
"useWorkspaces": true,
77
"version": "independent"
88
}

‎package.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{
22
"name": "root",
33
"private": true,
4-
"workspaces": [
5-
"packages/*"
6-
],
74
"scripts": {
5+
"preinstall": "npx only-allow pnpm",
86
"lint:js": "eslint --cache --ext .js --ignore-path .gitignore .",
97
"lint:ts": "eslint --cache --quiet --config ./packages/eslint-config-typescript/recommended.js --ext .ts --ignore-pattern incorrect.ts packages/eslint-config-typescript/tests/fixtures",
10-
"lint": "yarn run lint:js && yarn run lint:ts",
8+
"lint": "pnpm run lint:js && pnpm run lint:ts",
119
"test:unit": "lerna run test",
12-
"test": "yarn run test:unit && yarn run lint"
10+
"test": "pnpm run test:unit && pnpm run lint"
1311
},
1412
"eslintConfig": {
1513
"root": true,
@@ -19,38 +17,40 @@
1917
]
2018
},
2119
"devDependencies": {
22-
"@babel/core": "^7.20.5",
23-
"@babel/eslint-parser": "^7.19.1",
24-
"@babel/preset-env": "^7.20.2",
25-
"@types/jest": "^29.2.4",
26-
"@typescript-eslint/eslint-plugin": "^5.8.1",
27-
"@typescript-eslint/parser": "^5.8.1",
28-
"babel-jest": "^29.3.1",
29-
"core-js": "^3.26.1",
30-
"eslint": "^7.12.0",
31-
"eslint-config-standard": "^16.0.3",
32-
"eslint-import-resolver-typescript": "^3.1.1",
33-
"eslint-plugin-import": "^2.25.0",
34-
"eslint-plugin-jest": "^27.1.7",
35-
"eslint-plugin-jsdoc": "^39.3.25",
36-
"eslint-plugin-node": "^11.1.0",
37-
"eslint-plugin-promise": "^5.0.0",
38-
"eslint-plugin-sonarjs": "^0.14.0",
39-
"eslint-plugin-unicorn": "^40.0.0",
40-
"eslint-plugin-vue": "^9.0.1",
41-
"jest": "^29.3.1",
42-
"jest-preset-stylelint": "^6.0.0",
43-
"lerna": "^5.0.0",
44-
"node-notifier": "^10.0.0",
45-
"postcss": "^8.4.19",
46-
"regenerator-runtime": "^0.13.11",
47-
"stylelint": "^14.16.0",
48-
"ts-jest": "^29.0.3",
49-
"typescript": "^4.5.4",
50-
"vue-eslint-parser": "^9.0.1"
20+
"@babel/core": "7.20.5",
21+
"@babel/eslint-parser": "7.19.1",
22+
"@babel/preset-env": "7.20.2",
23+
"@swc/core": "1.3.22",
24+
"@swc/jest": "0.2.24",
25+
"@types/node": "18.11.14",
26+
"@typescript-eslint/eslint-plugin": "5.46.0",
27+
"@typescript-eslint/parser": "5.46.0",
28+
"core-js": "3.26.1",
29+
"eslint": "8.29.0",
30+
"eslint-config-standard": "17.0.0",
31+
"eslint-import-resolver-typescript": "3.5.2",
32+
"eslint-plugin-import": "2.26.0",
33+
"eslint-plugin-jest": "27.1.7",
34+
"eslint-plugin-jsdoc": "39.6.4",
35+
"eslint-plugin-n": "15.6.0",
36+
"eslint-plugin-promise": "6.1.1",
37+
"eslint-plugin-sonarjs": "0.17.0",
38+
"eslint-plugin-unicorn": "45.0.1",
39+
"eslint-plugin-vue": "9.8.0",
40+
"jest": "29.2.2",
41+
"jest-preset-stylelint": "6.0.0",
42+
"lerna": "6.1.0",
43+
"node-notifier": "10.0.1",
44+
"nx": "15.3.3",
45+
"postcss": "8.4.19",
46+
"regenerator-runtime": "0.13.11",
47+
"stylelint": "14.16.0",
48+
"ts-node": "10.9.1",
49+
"typescript": "4.9.4",
50+
"vue-eslint-parser": "9.1.0"
5151
},
52-
"dependencies": {},
5352
"engines": {
54-
"node": ">=16.0.0"
55-
}
56-
}
53+
"node": ">=14.0.0"
54+
},
55+
"packageManager": "pnpm@7.18.2"
56+
}

‎packages/eslint-config-javascript/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ module.exports = {
123123
'multiline-comment-style': ['error', 'separate-lines'],
124124

125125
// warn about using console or debugger in development, fail in production
126-
'no-console': process.env.NODE_ENV !== 'production' ? 1 : 2,
127-
'no-debugger': process.env.NODE_ENV !== 'production' ? 1 : 2,
128-
'no-alert': process.env.NODE_ENV !== 'production' ? 1 : 2,
126+
'no-console': process.env.NODE_ENV === 'production' ? 2 : 1,
127+
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 1,
128+
'no-alert': process.env.NODE_ENV === 'production' ? 2 : 1,
129129

130130
// complexity
131131
'complexity': ['error', { 'max': 6 }],

‎packages/eslint-config-javascript/package.json‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,35 @@
66
"repository": "https://github.com/wemake-services/wemake-frontend-styleguide.git",
77
"author": "sobolevn <mail@sobolevn.me>",
88
"license": "MIT",
9-
"private": false,
109
"publishConfig": {
1110
"access": "public"
1211
},
1312
"peerDependencies": {
14-
"eslint": "^7.12.0",
15-
"eslint-config-standard": "^16.0.0",
16-
"eslint-plugin-import": ">=2.25.0",
17-
"eslint-plugin-node": ">=11.1.0",
18-
"eslint-plugin-promise": "^5.0.0",
13+
"eslint": ">=8.0.1",
14+
"eslint-config-standard": ">=16.0.0",
15+
"eslint-plugin-import": ">=2.25.2",
16+
"eslint-plugin-n": ">=15.0.0",
17+
"eslint-plugin-promise": ">=6.0.0",
1918
"eslint-plugin-sonarjs": ">=0.11.0",
20-
"eslint-plugin-unicorn": ">=39.0.0"
19+
"eslint-plugin-unicorn": ">=41.0.0"
2120
},
2221
"keywords": [
2322
"wemake.services",
2423
"eslint",
2524
"eslint-config",
2625
"eslint config"
2726
],
27+
"devDependencies": {
28+
"eslint": "8.29.0",
29+
"eslint-config-standard": "17.0.0",
30+
"eslint-plugin-import": "2.26.0",
31+
"eslint-plugin-n": "15.6.0",
32+
"eslint-plugin-promise": "6.1.1",
33+
"eslint-plugin-sonarjs": "0.17.0",
34+
"eslint-plugin-unicorn": "45.0.1"
35+
},
36+
"engines": {
37+
"node": ">=14.0.0"
38+
},
2839
"gitHead": "b63f4ebdb923c0f9e876de25ed3df131ec3f9975"
2940
}

‎packages/eslint-config-jest/package.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "@wemake-services/eslint-config-jest",
33
"version": "1.0.0",
4-
"private": false,
54
"publishConfig": {
65
"access": "public"
76
},
@@ -23,7 +22,15 @@
2322
},
2423
"gitHead": "92ec9e371295d8f8957bc84223e9fcfe72c7eba8",
2524
"peerDependencies": {
26-
"eslint": ">=6.7.0",
27-
"eslint-plugin-jest": ">=23.1.0"
25+
"eslint": ">=7.0.0",
26+
"eslint-plugin-jest": ">=27.0.0"
27+
},
28+
"devDependencies": {
29+
"eslint": "8.29.0",
30+
"eslint-plugin-jest": "27.1.6",
31+
"typescript": "4.9.4"
32+
},
33+
"engines": {
34+
"node": ">=14.0.0"
2835
}
2936
}

‎packages/eslint-config-jsdoc/package.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"repository": "https://github.com/wemake-services/eslint-config-jsdoc.git",
77
"author": "sobolevn <mail@sobolevn.me>",
88
"license": "MIT",
9-
"private": false,
109
"publishConfig": {
1110
"access": "public"
1211
},
@@ -19,8 +18,15 @@
1918
"linting"
2019
],
2120
"peerDependencies": {
22-
"eslint": "^7.12.0",
23-
"eslint-plugin-jsdoc": "^37.4.0"
21+
"eslint": ">=7.0.0",
22+
"eslint-plugin-jsdoc": ">=39.0.0"
23+
},
24+
"devDependencies": {
25+
"eslint": "8.29.0",
26+
"eslint-plugin-jsdoc": "39.6.4"
27+
},
28+
"engines": {
29+
"node": ">=14.0.0"
2430
},
2531
"gitHead": "b63f4ebdb923c0f9e876de25ed3df131ec3f9975"
2632
}

0 commit comments

Comments
 (0)