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

build(deps): Bump versions of dependencies - projen, nx, ws, @aws-sdk* and fast-xml-parser #139

Merged
merged 2 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 3 additions & 2 deletions .gitignore

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

6 changes: 3 additions & 3 deletions .projen/deps.json

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

11 changes: 6 additions & 5 deletions package.json

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

2 changes: 1 addition & 1 deletion packages/threat-composer-app-browser-extension/.gitignore

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

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

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

2 changes: 1 addition & 1 deletion packages/threat-composer-app/.gitignore

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

2 changes: 1 addition & 1 deletion packages/threat-composer-app/.projen/deps.json

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

2 changes: 1 addition & 1 deletion packages/threat-composer-app/package.json

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

2 changes: 1 addition & 1 deletion packages/threat-composer-infra/.gitignore

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

2 changes: 1 addition & 1 deletion packages/threat-composer-infra/.projen/deps.json

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

2 changes: 1 addition & 1 deletion packages/threat-composer-infra/package.json

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

2 changes: 1 addition & 1 deletion packages/threat-composer/.gitignore

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

2 changes: 1 addition & 1 deletion packages/threat-composer/.projen/deps.json

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

2 changes: 1 addition & 1 deletion packages/threat-composer/package.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const FullDataTable: FC<TableProps & InternalTableProps> = ({
disableRowSelect = false,
selectionType = 'multi',
filter: filterComponent,
selectedItems = [],
selectedItems,
header,
trackBy = DEFAULT_TRACK_BY,
collectionPreferences,
Expand Down Expand Up @@ -77,7 +77,7 @@ const FullDataTable: FC<TableProps & InternalTableProps> = ({
});

useEffect(() => {
actions.setSelectedItems(selectedItems);
actions.setSelectedItems(selectedItems || []);
}, [selectedItems, paginationProps.currentPageIndex, filterProps.filteringText]);

const collectionPropsOnSelectionChange = collectionProps.onSelectionChange;
Expand All @@ -95,7 +95,7 @@ const FullDataTable: FC<TableProps & InternalTableProps> = ({
<TableComponent
trackBy={trackBy}
loadingText={DEFAULT_LOADING_TEXT}
visibleColumns={collectionPreferences.visibleContent}
columnDisplay={collectionPreferences.contentDisplay}
wrapLines={collectionPreferences.wrapLines}
stripedRows={collectionPreferences.stripedRows}
{...props}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ const ThreatPack: FC<ThreatPackProp> = ({
id: 'impactedGoal',
header: 'Impacted goal',
cell: (data) => (<TextContent>
<ul>{data.impactedGoal?.map(x => <li>{x}</li>)}</ul>
<ul>{data.impactedGoal?.map((x, index) => <li key={index}>{x}</li>)}</ul>
</TextContent>),
sortingField: 'impactedGoal',
},
{
id: 'impactedAssets',
header: 'Impacted assets',
cell: (data) => (<TextContent>
<ul>{data.impactedAssets?.map(x => <li>{x}</li>)}</ul>
<ul>{data.impactedAssets?.map((x, index) => <li key={index}>{x}</li>)}</ul>
</TextContent>),
sortingField: 'impactedAssets',
},
Expand Down
4 changes: 2 additions & 2 deletions projenrc/browser-extension.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TypeScriptProject } from "projen/lib/typescript";
import { TypeScriptJsxMode } from "projen/lib/javascript";
import { Project } from "projen";
import { TypeScriptJsxMode } from "projen/lib/javascript";
import { TypeScriptProject } from "projen/lib/typescript";
import browsersList from "./config/browsersList";

class ThreatComposerBrowserExtensionProject extends TypeScriptProject {
Expand Down
5 changes: 5 additions & 0 deletions projenrc/monorepo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ class ThreatComposerMonorepoProject extends MonorepoTsProject {
"resolutions.postcss",
"^8.4.31"
);
this.tryFindObjectFile("package.json")?.addOverride(
"resolutions.web-ext-run",
"^0.2.1"
);

this.tryFindObjectFile("package.json")?.addOverride("workspaces.nohoist", [
"**/wxt",
]);
Expand Down
Loading
Loading