Skip to content

Commit 9c44e84

Browse files
Backport of [ui] Namespaced and file-specified deps for consul-ui into release/1.19.x (#21523)
* backport of commit 74792f6 * backport of commit 4b87111 * backport of commit dd731cf * backport of commit cb53d9f * backport of commit 8d13103 --------- Co-authored-by: Phil Renaud <phil@riotindustries.com>
1 parent e1dc9ed commit 9c44e84

File tree

5 files changed

+4162
-3825
lines changed

5 files changed

+4162
-3825
lines changed

.changelog/21378.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:security
2+
ui: Pin and namespace sub-module dependencies related to the Consul UI
3+
```

ui/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry: https://registry.npmjs.org/

ui/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
},
2222
"resolutions": {
2323
"xmlhttprequest-ssl": "^1.6.3",
24-
"ember-basic-dropdown": "3.0.21"
24+
"ember-basic-dropdown": "3.0.21",
25+
"glob": "7.2.3"
2526
},
2627
"engines": {
2728
"node": "18"

ui/packages/consul-ui/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090
"broccoli-merge-trees": "^4.2.0",
9191
"chalk": "^4.1.0",
9292
"clipboard": "^2.0.11",
93-
"consul-acls": "*",
94-
"consul-lock-sessions": "*",
95-
"consul-nspaces": "*",
96-
"consul-partitions": "*",
97-
"consul-peerings": "*",
93+
"consul-acls": "file:../consul-acls",
94+
"consul-lock-sessions": "file:../consul-lock-sessions",
95+
"consul-nspaces": "file:../consul-nspaces",
96+
"consul-partitions": "file:../consul-partitions",
97+
"consul-peerings": "file:../consul-peerings",
9898
"css": "^3.0.0",
9999
"css.escape": "^1.5.1",
100100
"d3-array": "^2.8.0",

0 commit comments

Comments
 (0)