Skip to content

Commit 141fdf9

Browse files
committed
fix: dependency issues
Refs: HCRC-195
1 parent ea0d9f8 commit 141fdf9

5 files changed

Lines changed: 264 additions & 295 deletions

File tree

eslint.config.mjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import js from '@eslint/js';
22
import stylisticPlugin from '@stylistic/eslint-plugin';
33
import tseslint from 'typescript-eslint';
4-
import tsParser from '@typescript-eslint/parser';
54
import importPlugin from 'eslint-plugin-import-x';
65
import jsxA11yPlugin from 'eslint-plugin-jsx-a11y';
76
import prettierPlugin from 'eslint-plugin-prettier';
@@ -144,7 +143,7 @@ export default [
144143
{
145144
files,
146145
languageOptions: {
147-
parser: tsParser,
146+
parser: tseslint.parser,
148147
parserOptions: {
149148
ecmaVersion: 2018,
150149
ecmaFeatures: { jsx: true },

package.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,19 @@
6464
}
6565
},
6666
"//": {
67-
"Why are packages in resolutions?": {
68-
"hds-react/cookie": [
67+
"Why are packages overridden?": {
68+
"NOTE": "pnpm overrides live in pnpm-workspace.yaml (the 'overrides:' block), not here. pnpm ignores the npm/Yarn 'resolutions' field.",
69+
"hds-react>cookie": [
6970
"To fix https://github.com/City-of-Helsinki/react-helsinki-headless-cms/security/dependabot/28",
7071
"NOTE: This can be removed if hds-react starts to depend on >=v1 cookie"
7172
],
7273
"minimatch": [
7374
"To fix https://github.com/City-of-Helsinki/react-helsinki-headless-cms/security/dependabot/80,",
7475
"https://github.com/City-of-Helsinki/react-helsinki-headless-cms/security/dependabot/77",
7576
"https://github.com/City-of-Helsinki/react-helsinki-headless-cms/security/dependabot/76"
76-
],
77-
"picomatch": [
78-
"To fix vulnerable picomatch@2.3.1 (no 2.3.2 exists on npm) and consolidate all",
79-
"picomatch instances to a safe version. Overrides transitive 2.x requirements",
80-
"from micromatch, anymatch, @rollup/pluginutils v4, and 4.0.2/4.0.3 requirements."
8177
]
8278
}
8379
},
84-
"resolutions": {
85-
"hds-react/cookie": "^0.7.2",
86-
"minimatch": "^10.2.3",
87-
"picomatch": "^4.0.4"
88-
},
8980
"devDependencies": {
9081
"@apollo/client": "^3.14.0",
9182
"@babel/core": "^7.28.0",

0 commit comments

Comments
 (0)