Skip to content

Commit 533366e

Browse files
ThibaudAVmergify[bot]
authored andcommitted
chore(console): bump ui-particles
(cherry picked from commit 09dfc1e) # Conflicts: # gravitee-apim-console-webui/package.json # gravitee-apim-console-webui/yarn.lock
1 parent c8a513d commit 533366e

File tree

2 files changed

+61
-0
lines changed

2 files changed

+61
-0
lines changed

gravitee-apim-console-webui/package.json

+12
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,19 @@
2020
"@asyncapi/web-component": "2.5.1",
2121
"@danielmoncada/angular-datetime-picker": "17.0.0",
2222
"@danielmoncada/angular-datetime-picker-moment-adapter": "4.0.0",
23+
<<<<<<< HEAD
2324
"@fontsource/libre-franklin": "4.5.11",
2425
"@gravitee/ui-analytics": "13.11.0",
2526
"@gravitee/ui-components": "4.3.0",
2627
"@gravitee/ui-particles-angular": "13.11.0",
2728
"@gravitee/ui-policy-studio-angular": "13.11.0",
29+
=======
30+
"@fontsource/libre-franklin": "4.4.5",
31+
"@gravitee/ui-analytics": "13.12.0",
32+
"@gravitee/ui-components": "4.2.5",
33+
"@gravitee/ui-particles-angular": "13.12.0",
34+
"@gravitee/ui-policy-studio-angular": "13.12.0",
35+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
2836
"@highcharts/map-collection": "1.1.4",
2937
"@ngx-formly/core": "6.3.0",
3038
"@ngx-formly/material": "6.3.0",
@@ -91,7 +99,11 @@
9199
"@angular-devkit/build-angular": "18.2.0",
92100
"@angular/cli": "18.2.0",
93101
"@angular/compiler-cli": "18.2.0",
102+
<<<<<<< HEAD
94103
"@gravitee/ui-schematics": "13.10.2",
104+
=======
105+
"@gravitee/ui-schematics": "13.12.0",
106+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
95107
"@storybook/addon-essentials": "7.6.17",
96108
"@storybook/angular": "7.6.17",
97109
"@types/angular": "1.8.9",

gravitee-apim-console-webui/yarn.lock

+49
Original file line numberDiff line numberDiff line change
@@ -4650,15 +4650,25 @@ __metadata:
46504650
languageName: node
46514651
linkType: hard
46524652

4653+
<<<<<<< HEAD
46534654
"@gravitee/ui-analytics@npm:13.11.0":
46544655
version: 13.11.0
46554656
resolution: "@gravitee/ui-analytics@npm:13.11.0"
4657+
=======
4658+
"@gravitee/ui-analytics@npm:13.12.0":
4659+
version: 13.12.0
4660+
resolution: "@gravitee/ui-analytics@npm:13.12.0"
4661+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
46564662
dependencies:
46574663
tslib: "npm:^2.6.2"
46584664
peerDependencies:
46594665
"@angular/common": ^18.0.0
46604666
"@angular/core": ^18.0.0
4667+
<<<<<<< HEAD
46614668
checksum: 10c0/592f0f6e6e716e147a9287d9d35ef2a1ffe60f105826b8cab732215cea2a45359760671d96fb9e8c07d1e30657196ff6fe3395806177adde7ae93255dc380a49
4669+
=======
4670+
checksum: 10c0/58d3ca00d6e0e04295bc6eeb4e198b0a5fd23d4dad7c0a94662bf075aea9fdea6e1365b15eac4625fef6c870d722eae787cd19745e56549ba0ab20606bca4ad6
4671+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
46624672
languageName: node
46634673
linkType: hard
46644674

@@ -4707,9 +4717,15 @@ __metadata:
47074717
languageName: node
47084718
linkType: hard
47094719

4720+
<<<<<<< HEAD
47104721
"@gravitee/ui-particles-angular@npm:13.11.0":
47114722
version: 13.11.0
47124723
resolution: "@gravitee/ui-particles-angular@npm:13.11.0"
4724+
=======
4725+
"@gravitee/ui-particles-angular@npm:13.12.0":
4726+
version: 13.12.0
4727+
resolution: "@gravitee/ui-particles-angular@npm:13.12.0"
4728+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
47134729
dependencies:
47144730
"@fontsource/fira-mono": "npm:4.5.0"
47154731
"@fontsource/golos-ui": "npm:^4.5.1"
@@ -4737,13 +4753,23 @@ __metadata:
47374753
optional: true
47384754
prismjs:
47394755
optional: true
4756+
<<<<<<< HEAD
47404757
checksum: 10c0/cb78fffcf3926731648f025883a9b6abfc1497b833a80dd7fe9e0f8c8bfc4cc4764cc794cf1fe9deb0b16b1244ba7909b1aeac4353c571d8650717370dd74ed9
47414758
languageName: node
47424759
linkType: hard
47434760

47444761
"@gravitee/ui-policy-studio-angular@npm:13.11.0":
47454762
version: 13.11.0
47464763
resolution: "@gravitee/ui-policy-studio-angular@npm:13.11.0"
4764+
=======
4765+
checksum: 10c0/221117de4040a621958b8056f45ad4c70441b819c261be49155d5616d24c03cbf0ad11605546c1fcb612cb0501187a76a0f05658000c010b18bc804a044eeb9a
4766+
languageName: node
4767+
linkType: hard
4768+
4769+
"@gravitee/ui-policy-studio-angular@npm:13.12.0":
4770+
version: 13.12.0
4771+
resolution: "@gravitee/ui-policy-studio-angular@npm:13.12.0"
4772+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
47474773
dependencies:
47484774
tslib: "npm:^2.6.2"
47494775
peerDependencies:
@@ -4755,19 +4781,33 @@ __metadata:
47554781
"@angular/material": ^18.0.0
47564782
"@gravitee/ui-particles-angular": "*"
47574783
lodash: ^4.17.21
4784+
<<<<<<< HEAD
47584785
checksum: 10c0/2d27dee9af5ef179ec5bf2971de3c277eae6404785c4ae41b983fa2deac6934bb2864bacd24794e744ef43099d08da47fa35e3fc35f6946bae52210646154e9c
47594786
languageName: node
47604787
linkType: hard
47614788

47624789
"@gravitee/ui-schematics@npm:13.10.2":
47634790
version: 13.10.2
47644791
resolution: "@gravitee/ui-schematics@npm:13.10.2"
4792+
=======
4793+
checksum: 10c0/9a037e5c33bf1f368c1c6e436fb158af99f45527a0e9934b04d39faf4608274c8f793683d7a0625f06a3ea4e34df2da9368541dfac4a9ede4992b46a60d523f1
4794+
languageName: node
4795+
linkType: hard
4796+
4797+
"@gravitee/ui-schematics@npm:13.12.0":
4798+
version: 13.12.0
4799+
resolution: "@gravitee/ui-schematics@npm:13.12.0"
4800+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
47654801
dependencies:
47664802
tslib: "npm:^2.6.3"
47674803
peerDependencies:
47684804
"@angular/common": ^17.2.0
47694805
"@angular/core": ^17.2.0
4806+
<<<<<<< HEAD
47704807
checksum: 10c0/e2fd80ea358ba64f0b2347fa4ed0212c92d464bd33fe0ab6c8013bb1e430fe59b476df43661ffcbdb14e59e1a4eed75834256409b79db1250e455884dc7ef6a6
4808+
=======
4809+
checksum: 10c0/095aeb9251f13bf9dca7f50094910283b2682cdf4d9c73eb495185559a25379621d37399446fa5698d179b9bdfdfa01144525b54e3a2389e9d7c9d8e54e55f17
4810+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
47714811
languageName: node
47724812
linkType: hard
47734813

@@ -15163,12 +15203,21 @@ __metadata:
1516315203
"@asyncapi/web-component": "npm:2.5.1"
1516415204
"@danielmoncada/angular-datetime-picker": "npm:17.0.0"
1516515205
"@danielmoncada/angular-datetime-picker-moment-adapter": "npm:4.0.0"
15206+
<<<<<<< HEAD
1516615207
"@fontsource/libre-franklin": "npm:4.5.11"
1516715208
"@gravitee/ui-analytics": "npm:13.11.0"
1516815209
"@gravitee/ui-components": "npm:4.3.0"
1516915210
"@gravitee/ui-particles-angular": "npm:13.11.0"
1517015211
"@gravitee/ui-policy-studio-angular": "npm:13.11.0"
1517115212
"@gravitee/ui-schematics": "npm:13.10.2"
15213+
=======
15214+
"@fontsource/libre-franklin": "npm:4.4.5"
15215+
"@gravitee/ui-analytics": "npm:13.12.0"
15216+
"@gravitee/ui-components": "npm:4.2.5"
15217+
"@gravitee/ui-particles-angular": "npm:13.12.0"
15218+
"@gravitee/ui-policy-studio-angular": "npm:13.12.0"
15219+
"@gravitee/ui-schematics": "npm:13.12.0"
15220+
>>>>>>> 09dfc1e533 (chore(console): bump ui-particles)
1517215221
"@highcharts/map-collection": "npm:1.1.4"
1517315222
"@ngx-formly/core": "npm:6.3.0"
1517415223
"@ngx-formly/material": "npm:6.3.0"

0 commit comments

Comments
 (0)