Skip to content

Commit

Permalink
Vulnerable JS library updates (#2369)
Browse files Browse the repository at this point in the history
* update mermaid to 10.2.3, important css, update initialize call

* edit bosh credhub deploy diagram

* update serve method

* remove netlify-cms

* fix: Update links to Terraform documentation.

---------

Co-authored-by: Sven Aas <sven.aas@gsa.gov>
  • Loading branch information
drewbo and svenaas authored Jul 6, 2023
1 parent c05f81f commit 86df0b6
Show file tree
Hide file tree
Showing 10 changed files with 1,697 additions and 1,117 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Note that when built by cloud.gov Pages, `npm run pages` is used instead of the
npm start
```

Open your web browser to [localhost:3000](http://localhost:3000/) to view your
Open your web browser to [localhost:4000](http://localhost:4000/) to view your
site.

### Testing
Expand Down
114 changes: 58 additions & 56 deletions _assets/css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -437,20 +437,20 @@ code.language-plaintext {
}

.cg-diagrams-stage {
background: #f1f1f1;
background: #f1f1f1 !important;
font-family: 'Source Sans Pro', 'Helvetica Neue', 'Helvetica', 'Roboto',
'Arial', sans-serif;
'Arial', sans-serif !important;
}
.cg-diagrams-stage .label {
color: #ffffff;
overflow-wrap: break-word;
word-break: break-word;
color: #ffffff !important;
overflow-wrap: break-word !important;
word-break: break-word !important;
}

.cg-diagrams,
.cg-diagrams-stage {
overflow: scroll;
width: 100%;
overflow: scroll !important;
width: 100% !important;
}

.cluster rect {
Expand All @@ -460,113 +460,115 @@ code.language-plaintext {
}

.cluster text {
font-size: 1.7rem;
font-weight: 700;
font-size: 1.7rem !important;
font-weight: 700 !important;
font-family: 'Source Sans Pro', 'Helvetica Neue', 'Helvetica', 'Roboto',
'Arial', sans-serif;
font-size: 17px;
'Arial', sans-serif !important;
font-size: 17px !important;
}

.node rect,
.node circle,
.node ellipse,
.node polygon {
fill: color('primary');
stroke: color('primary-dark');
stroke-width: 2px;
fill: color('primary') !important;
stroke: color('primary-dark') !important;
stroke-width: 2px !important;
}

.node .label {
.node .label, .node .nodeLabel {
font-family: 'Source Sans Pro', 'Helvetica Neue', 'Helvetica', 'Roboto',
'Arial', sans-serif;
color: white;
'Arial', sans-serif !important;
color: white !important;
}

.edgePath .path {
stroke: color('primary-dark');
stroke-width: 2px;
stroke: color('primary-dark') !important;
stroke-width: 2px !important;
}

.edgePath marker path {
fill: color('primary-dark') !important;
}

.edgeLabel {
background-color: #ffffff;
border: #ffffff 5px solid;
color: #000000;
background-color: #ffffff !important;
border: #ffffff 5px solid !important;
color: #000000 !important;
font-family: 'Source Sans Pro', 'Helvetica Neue', 'Helvetica', 'Roboto',
'Arial', sans-serif;
font-family: 17px;
'Arial', sans-serif !important;
font-family: 17px !important;
}
.edgeLabel:empty {
border: none;
border: none !important;
}

rect {
fill: color('primary-vivid');
stroke: color('primary-dark');
stroke-width: 2px;
fill: color('primary-vivid') !important;
stroke: color('primary-dark') !important;
stroke-width: 2px !important;
}
rect.note {
fill: #e1f3f8;
stroke: color('primary')-light;
stroke-width: 2px;
fill: #e1f3f8 !important;
stroke: color('primary')-light !important;
stroke-width: 2px !important;
}
rect.labelBox {
fill: color('primary-vivid');
stroke: color('primary');
fill: color('primary-vivid') !important;
stroke: color('primary') !important;
}
rect.actor {
fill: 'priamry-vivid';
stroke: color('primary-dark');
fill: 'priamry-vivid' !important;
stroke: color('primary-dark') !important;
}

#crosshead path,
#arrowhead path {
fill: color('primary-dark');
fill: color('primary-dark') !important;
}

line[class^='messageLine'],
line.actor-line {
fill: color('primary-dark');
stroke: color('primary-dark');
stroke-width: 2px;
fill: color('primary-dark') !important;
stroke: color('primary-dark') !important;
stroke-width: 2px !important;
}

line.loopLine {
fill: color('primary-dark');
stroke: color('primary');
stroke-width: 2px;
fill: color('primary-dark') !important;
stroke: color('primary') !important;
stroke-width: 2px !important;
}

text.messageText {
font-family: 'Bitstream Vera Sans Mono', 'Consolas', 'Courier', monospace;
text-shadow: 2px 2px 0 #ffffff, 1px 1px 0 #5b616b;
fill: color('primary-vivid');
font-size: 1rem;
font-family: 'Bitstream Vera Sans Mono', 'Consolas', 'Courier', monospace !important;
text-shadow: 2px 2px 0 #ffffff, 1px 1px 0 #5b616b !important;
fill: color('primary-vivid') !important;
font-size: 1rem !important;
}

text.actor {
fill: #ffffff;
fill: #ffffff !important;
}

text.noteText {
fill: #212121;
font-size: 1.25rem;
fill: #212121 !important;
font-size: 1.25rem !important;
}

text.labelText {
font-family: 'Merriweather', 'Georgia', 'Cambria', 'Times New Roman', 'Times',
serif;
fill: #dce4ef;
font-size: 1.25rem;
text-transform: uppercase;
serif !important;
fill: #dce4ef !important;
font-size: 1.25rem !important;
text-transform: uppercase !important;
}

text.loopText {
font-family: 'Merriweather', 'Georgia', 'Cambria', 'Times New Roman', 'Times',
serif;
font-size: 1rem;
font-style: oblique;
serif !important;
font-size: 1rem !important;
font-style: oblique !important;
}


2 changes: 1 addition & 1 deletion _assets/js/app.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your custom javascript here
console.log("Hi from cloud.gov Pages");

mermaid.initialize({startOnLoad:true, theme: null}, ".someOtherClass");
mermaid.initialize({startOnLoad:true, theme: 'base'}, ".someOtherClass");

var sideNavParents = document.querySelectorAll(".usa-sidenav__item--parent-item");
var sideNavChild = document.querySelectorAll(".usa-sidenav__sublist--middle-generation");
Expand Down
1,679 changes: 1,630 additions & 49 deletions _assets/js/mermaid.min.js

Large diffs are not rendered by default.

723 changes: 0 additions & 723 deletions _assets/js/netlify-cms.js

This file was deleted.

8 changes: 4 additions & 4 deletions _docs/ops/design/secrets.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ environment. This solution means that CredHub would have a single database
that it would leverage to store its data for its specific BOSH director.

{% mermaid_diagram id-prefix="colocated-diagram" %}
graph LR;
graph TB;
master[Master BOSH + CredHub]
tooling[Tooling BOSH + CredHub]
development[BOSH + CredHub]
Expand All @@ -84,21 +84,21 @@ graph LR;
tooling-->|Interpolates from Tooling CredHub|tooling-d
end
subgraph Production VPC
tooling-->production
tooling---->production
subgraph Production BOSH
production
end
production-->|Interpolates from Production CredHub|production-d
end
subgraph Staging VPC
tooling-->staging
tooling---->staging
subgraph Staging BOSH
staging
end
staging-->|Interpolates from Staging CredHub|staging-d
end
subgraph Development VPC
tooling-->development
tooling---->development
subgraph Development BOSH
development
end
Expand Down
4 changes: 2 additions & 2 deletions _docs/ops/dns.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ configuration file leverages resources of type `aws_route53_record`. To learn
more about Terraform configuration continue on below, or [read the documentation
on Terraform's documentation site][docs-terraform#resources].

[docs-terraform#resources]: https://www.terraform.io/docs/configuration/resources.html "Terraform - Docs - Configuration - Resources"
[docs-terraform#resources]: https://www.terraform.io/docs/configuration/resources "Terraform - Docs - Configuration - Resources"
[repo-18f/cg-provision]: https://www.github.com/18F/cg-provision "Github 18F/cg-provision"
[repo-18f/cg-provision#stack.tf]: https://github.com/18F/cg-provision/blob/master/terraform/stacks/dns/stack.tf "Terraform configuration file for cloud.gov"

Expand Down Expand Up @@ -94,7 +94,7 @@ resource "aws_route53_record" "cloud_gov_<DOMAIN_NAME_UNDERSCORED>_txt" {
The configuration files uses the Terraform syntax. To read more about Terraform
syntax, [please read the documentation on Terraform's documentation site][docs-terraform#syntax].

[docs-terraform#syntax]: https://www.terraform.io/docs/configuration/syntax.html "Terraform - Docs - Configuration - Syntax"
[docs-terraform#syntax]: https://www.terraform.io/docs/configuration/syntax "Terraform - Docs - Configuration - Syntax"

## Submit a Pull Request

Expand Down
Loading

0 comments on commit 86df0b6

Please sign in to comment.