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.

Sign up for GitHub

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

Jump to bottom

chore(deps): fix dep versioning, conflicts, type #16

Merged
merged 1 commit into from
Feb 17, 2023
Merged

chore(deps): fix dep versioning, conflicts, type #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41,912 changes: 0 additions & 41,912 deletions package-lock.json
View file
Open in desktop

This file was deleted.

21 changes: 13 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
"devDependencies": {
"react": "^17",
"react-dom": "^17",
"typescript": "^4.7.4",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
"@types/react": "^17",
"@types/react-dom": "^17",
"concurrently": "^5.3.0",
"eslint": "^8.0.1",
"eslint-plugin-import": "^2.25.2",
Expand All @@ -34,21 +39,21 @@
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-config-prettier": "8.5.0",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
"prettier": "2.7.1",
"jest":"^29.2.2",
"babel-jest":"^29.2.2",
"jest": "^29.2.2",
"babel-jest": "^29.2.2",
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"@babel/preset-react":"^7.18.6",
"@babel/preset-react": "^7.18.6",
"@babel/preset-flow": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@testing-library/react":"^12.1.5",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "13.5.0",
"@testing-library/jest-dom":"5.16.5",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/dom": "9.0.0",
"jest-environment-jsdom": "^29.2.2",
"jest-canvas-mock": "^2.4.0",
"serve": "^14.1.2"
"serve": "^14.1.2",
"rimraf": "^2.6.2"
}
}
29 changes: 13 additions & 16 deletions packages/module/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,25 @@
},
"homepage": "https://github.com/patternfly/react-log-viewer#readme",
"dependencies": {
"@patternfly/react-core": "^4.273.1",
"@patternfly/react-icons": "^4.93.4",
"@patternfly/react-styles": "^4.92.4",
"@patternfly/react-core": "^4.276.6",
"@patternfly/react-icons": "^4.93.6",
"@patternfly/react-styles": "^4.92.6",
"memoize-one": "^5.1.0",
"resize-observer-polyfill": "^1.5.1",
"tslib":"^2.0.0"
"monaco-editor": "^0.33.0"

},
"peerDependencies": {
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
},
"devDependencies": {
"@patternfly/documentation-framework": "^1.2.55",
"@patternfly/patternfly": "^4.217.1",
"@patternfly/react-table": "^4.111.4",
"@patternfly/react-code-editor": "^4.82.26",
"rimraf": "^2.6.2",
"typescript": "^4.7.4",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@patternfly/patternfly-a11y": "4.3.1"
"@patternfly/documentation-framework": "^1.8.0",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-table": "^4.112.39",
"@patternfly/patternfly-a11y": "^4.3.1",
"@patternfly/react-code-editor": "^4.82.113",
"resize-observer-polyfill": "^1.5.1",
"tslib": "^2.0.0",
"react-monaco-editor": "^0.51.0"
}
}
5 changes: 4 additions & 1 deletion packages/module/patternfly-docs/generated/extensions/log-viewer/design-guidelines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ import srcImport4 from '../../../content/extensions/react-log-viewer/design-guid
const pageData = {
"id": "Log viewer",
"section": "extensions",
"subsection": "",
"source": "design-guidelines",
"tabName": null,
"slug": "/extensions/log-viewer/design-guidelines",
"sourceLink": "https://github.com/patternfly/patternfly-org/blob/main/packages/module/patternfly-docs/content/extensions/react-log-viewer/design-guidelines/design-guidelines.md"
"sourceLink": "https://github.com/patternfly/patternfly-org/blob/main/packages/module/patternfly-docs/content/extensions/react-log-viewer/design-guidelines/design-guidelines.md",
"relPath": "packages/module/patternfly-docs/content/extensions/react-log-viewer/design-guidelines/design-guidelines.md"
};
pageData.relativeImports = {

Expand Down
3 changes: 3 additions & 0 deletions packages/module/patternfly-docs/generated/extensions/log-viewer/react-demos.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/module/patternfly-docs/generated/extensions/log-viewer/react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ import { data } from '../../../content/extensions/react-log-viewer/examples/./re
const pageData = {
"id": "Log viewer",
"section": "extensions",
"subsection": "",
"source": "react",
"tabName": null,
"slug": "/extensions/log-viewer/react",
"sourceLink": "https://github.com/patternfly/patternfly-react/blob/main/packages/module/patternfly-docs/content/extensions/react-log-viewer/examples/basic.md",
"relPath": "packages/module/patternfly-docs/content/extensions/react-log-viewer/examples/basic.md",
"propComponents": [
{
"name": "LogViewer",
Expand Down
6 changes: 6 additions & 0 deletions packages/module/patternfly-docs/generated/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ module.exports = {
toc: [[{"text":"With complex toolbar"}]],
examples: ["With complex toolbar"],
section: "extensions",
subsection: "",
source: "react-demos",
tabName: null,
Component: () => import(/* webpackChunkName: "extensions/log-viewer/react-demos/index" */ './extensions/log-viewer/react-demos')
},
'/extensions/log-viewer/design-guidelines': {
id: "Log viewer",
title: "Log viewer",
toc: [{"text":"Light theme log viewer"},{"text":"Dark theme log viewer"},{"text":"Usability"},{"text":"Log viewer functionality"},[{"text":"With popover"},{"text":"With dropdown, drilldown, and search expanded"},{"text":"With search results"}]],
section: "extensions",
subsection: "",
source: "design-guidelines",
tabName: null,
Copy link
Collaborator

Choose a reason for hiding this comment

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

should we use undefined instead?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hmm, I think that tabName value is just coming from the docs framework, and it's coming back as null because we don't define a specific one. It's just showing up as a change here because I bumped the docs framework version.

But yeah that seems like it might be a change we want to make in the docs framework.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yeah that frontmatter value is coming from this PR in org https://github.com/patternfly/patternfly-org/pull/3394/files

Component: () => import(/* webpackChunkName: "extensions/log-viewer/design-guidelines/index" */ './extensions/log-viewer/design-guidelines')
},
'/extensions/log-viewer/react': {
Expand All @@ -22,7 +26,9 @@ module.exports = {
toc: [{"text":"Examples"},[{"text":"Basic"},{"text":"With search"},{"text":"With complex toolbar"},{"text":"With header component"},{"text":"With footer component"},{"text":"With ANSI color logs"}]],
examples: ["Basic","With search","With complex toolbar","With header component","With footer component","With ANSI color logs"],
section: "extensions",
subsection: "",
source: "react",
tabName: null,
Component: () => import(/* webpackChunkName: "extensions/log-viewer/react/index" */ './extensions/log-viewer/react')
}
};
Loading