Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TDW: upgrade packages, remove unnecessary resolutions #1300

Merged
merged 7 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,18 @@
"@tiptap/pm": "^2.7.4",
"@tiptap/react": "^2.7.4",
"@tiptap/suggestion": "^2.7.4",
"date-fns": "^3.6.0",
"date-fns": "^4.1.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll have to update rails server to match these when we release the new DS

"date-fns-tz": "^3.1.3",
"react-bootstrap": "^2.10.5",
"react-currency-input-field": "^3.8.0",
"react-datepicker": "^6.9.0",
"react-datepicker": "^7.5.0",
"react-loading-skeleton": "^3.4.0",
"react-router-dom": "^5.3.4",
"react-select": "^5.8.1",
"react-toggle": "^4.1.3",
"react-transition-group": "^4.4.5",
"sanitize-html": "^2.13.0",
"tippy.js": "^6.3.7",
"uuid": "^7.0.3"
"uuid": "^11.0.3"
},
"scripts": {
"build": "NODE_ENV=production babel src --out-dir lib --copy-files --extensions '.js,.jsx,.ts,.tsx' && tsc",
Expand Down Expand Up @@ -113,7 +112,7 @@
"@storybook/react-webpack5": "^8.4.2",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^15.0.7",
"@testing-library/react": "^16.0.1",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.13",
Expand All @@ -130,18 +129,18 @@
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"babel-preset-react": "^6.24.1",
"bootstrap": "5.1.3",
"chromatic": "^6.24.1",
"chromatic": "^11.18.1",
"classnames": "^2.5.1",
"css-loader": "^6.11.0",
"eslint": "^8.57.1",
"eslint": "^9.15.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-local-rules": "^2.0.1",
"eslint-plugin-local-rules": "^3.0.2",
"eslint-plugin-no-only-tests": "^3.3.0",
"eslint-plugin-react": "^7.36.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-utils": "^3.0.0",
"file-loader": "^6.2.0",
"jest": "^29.7.0",
Expand All @@ -161,20 +160,14 @@
"sass-loader": "^16.0.2",
"storybook": "^8.4.2",
"storybook-addon-designs": "6.3.1",
"style-loader": "^1.3.0",
"style-loader": "^4.0.0",
"typescript": "^5.5.4",
"webpack": "^5.95.0",
"yalc": "^1.0.0-pre.53"
},
"resolutions": {
"@babel/helper-create-regexp-features-plugin": "^7.22.15",
"cookie": "^0.7.0",
"express": "^4.21.0",
"istanbul-lib-instrument": "^6.0.0",
"jackspeak": "2.1.1",
"micromatch": "^4.0.8",
"normalize-package-data": "^3.0.0",
"path-to-regexp@npm:^1.7.0": "^1.9.0",
"semver": "^7.5.3"
Comment on lines 169 to 171
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these 3 still stuck? think these were ones I recently fixed (micromatch and semver at least)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can double check, but I tried removing these and ran yarn why for them and saw some packages resolved to versions lower than what's set as the resolution

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume if these resolutions come from dependabot security updates, we could remove them all and see if any pop back up again? Not sure if that's the right approach tho?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no if they are resolving to lower then we still need these for sure

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the older versions don't get patched for the fixes

},
"description": "UI Storybook design system",
Expand Down
4 changes: 2 additions & 2 deletions src/DateTimePicker/DateTimePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@ function DateTimePicker({
adjustDateOnChange
allowSameDay
className={showPickerEnforcedInput ? '' : 'date-time-picker__input-group'}
customInput={showPickerEnforcedInput && (
customInput={showPickerEnforcedInput ? (
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addresses this
Screenshot 2024-11-15 at 11 37 12 AM

<PickerEnforcedInput
disabled={disabled}
inputClassName={inputClassName}
name={name}
startDate={startDate}
/>
)}
) : undefined}
dateFormat={getDateFormat()}
disabled={disabled}
dropdownMode="select"
Expand Down
11 changes: 0 additions & 11 deletions src/Layout/Header/Controls.tsx

This file was deleted.

21 changes: 0 additions & 21 deletions src/Layout/Header/Header.scss

This file was deleted.

41 changes: 0 additions & 41 deletions src/Layout/Header/Header.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions src/Layout/Header/index.ts

This file was deleted.

12 changes: 0 additions & 12 deletions src/Layout/SidebarNav/SidebarNav.scss

This file was deleted.

29 changes: 0 additions & 29 deletions src/Layout/SidebarNav/SidebarNav.tsx

This file was deleted.

32 changes: 0 additions & 32 deletions src/Layout/SidebarNav/SidebarNavLink.scss

This file was deleted.

42 changes: 0 additions & 42 deletions src/Layout/SidebarNav/SidebarNavLink.tsx

This file was deleted.

6 changes: 0 additions & 6 deletions src/Layout/SidebarNav/SidebarNavLinks.scss

This file was deleted.

19 changes: 0 additions & 19 deletions src/Layout/SidebarNav/SidebarNavLinks.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions src/Layout/SidebarNav/index.ts

This file was deleted.

Loading
Loading