Skip to content

Commit d8c67b5

Browse files
resolved conflicts
2 parents b2646e8 + a8189fb commit d8c67b5

File tree

433 files changed

+497008
-1108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

433 files changed

+497008
-1108
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"entrypoints": {
3+
"main": {
4+
"js": [
5+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/async/lib-router.4be2a34d.js",
6+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/async/673.40588a26.js",
7+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/async/402.1f57d497.js",
8+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/async/422.182765cf.js",
9+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/main.5a2f9f94.js",
10+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/170.cc18108c.js"
11+
],
12+
"css": [
13+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/css/async/673.633a9c5a.css",
14+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/css/async/422.f76c0c62.css"
15+
]
16+
},
17+
"exposeRemote": {
18+
"js": [
19+
"/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/exposeRemote.js"
20+
],
21+
"css": []
22+
}
23+
}
24+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html><head><title>Rsbuild App</title><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><script defer src="/bundles/pimcorestudioui/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/static/js/170.cc18108c.js"></script><script defer src="/bundles/pimcorestudioui/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/static/js/main.9d482fcd.js"></script></head><body><div id="root"></div></body></html>
1+
<!doctype html><html><head><title>Rsbuild App</title><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><script defer src="/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/170.cc18108c.js"></script><script defer src="/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/main.5a2f9f94.js"></script></head><body><div id="root"></div></body></html>

public/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/manifest.json

Lines changed: 222 additions & 0 deletions
Large diffs are not rendered by default.

public/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/mf-manifest.json renamed to public/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/mf-manifest.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
"globalName": "pimcore_studio_ui_bundle_core",
2323
"pluginVersion": "0.13.1",
2424
"prefetchInterface": false,
25-
<<<<<<<< HEAD:public/build/c3bd16b3-28f8-4323-a6bd-da65f4131b0f/mf-manifest.json
26-
"publicPath": "/bundles/pimcorestudioui/build/c3bd16b3-28f8-4323-a6bd-da65f4131b0f/"
27-
========
28-
"publicPath": "/bundles/pimcorestudioui/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/"
29-
>>>>>>>> origin/1.x:public/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/mf-manifest.json
25+
"publicPath": "/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/"
3026
},
3127
"shared": [
3228
{
@@ -39,7 +35,7 @@
3935
"js": {
4036
"async": [],
4137
"sync": [
42-
"static/js/16.c65abca3.js"
38+
"static/js/170.cc18108c.js"
4339
]
4440
},
4541
"css": {
@@ -58,7 +54,7 @@
5854
"js": {
5955
"async": [],
6056
"sync": [
61-
"static/js/16.c65abca3.js"
57+
"static/js/170.cc18108c.js"
6258
]
6359
},
6460
"css": {
@@ -77,7 +73,7 @@
7773
"js": {
7874
"async": [],
7975
"sync": [
80-
"static/js/16.c65abca3.js"
76+
"static/js/170.cc18108c.js"
8177
]
8278
},
8379
"css": {
@@ -91,12 +87,12 @@
9187
"name": "inversify",
9288
"version": "6.1.x",
9389
"singleton": true,
94-
"requiredVersion": "^undefined",
90+
"requiredVersion": "^6.1.4",
9591
"assets": {
9692
"js": {
9793
"async": [],
9894
"sync": [
99-
"static/js/16.c65abca3.js"
95+
"static/js/170.cc18108c.js"
10096
]
10197
},
10298
"css": {

public/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/mf-stats.json renamed to public/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/mf-stats.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
"globalName": "pimcore_studio_ui_bundle_core",
2323
"pluginVersion": "0.13.1",
2424
"prefetchInterface": false,
25-
<<<<<<<< HEAD:public/build/c3bd16b3-28f8-4323-a6bd-da65f4131b0f/mf-stats.json
26-
"publicPath": "/bundles/pimcorestudioui/build/c3bd16b3-28f8-4323-a6bd-da65f4131b0f/"
27-
========
28-
"publicPath": "/bundles/pimcorestudioui/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/"
29-
>>>>>>>> origin/1.x:public/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/mf-stats.json
25+
"publicPath": "/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/"
3026
},
3127
"shared": [
3228
{
@@ -41,7 +37,7 @@
4137
"js": {
4238
"async": [],
4339
"sync": [
44-
"static/js/16.c65abca3.js"
40+
"static/js/170.cc18108c.js"
4541
]
4642
},
4743
"css": {
@@ -63,7 +59,7 @@
6359
"js": {
6460
"async": [],
6561
"sync": [
66-
"static/js/16.c65abca3.js"
62+
"static/js/170.cc18108c.js"
6763
]
6864
},
6965
"css": {
@@ -85,7 +81,7 @@
8581
"js": {
8682
"async": [],
8783
"sync": [
88-
"static/js/16.c65abca3.js"
84+
"static/js/170.cc18108c.js"
8985
]
9086
},
9187
"css": {
@@ -97,7 +93,7 @@
9793
},
9894
{
9995
"singleton": true,
100-
"requiredVersion": "^undefined",
96+
"requiredVersion": "^6.1.4",
10197
"shareScope": "default",
10298
"eager": true,
10399
"version": "6.1.x",
@@ -107,7 +103,7 @@
107103
"js": {
108104
"async": [],
109105
"sync": [
110-
"static/js/16.c65abca3.js"
106+
"static/js/170.cc18108c.js"
111107
]
112108
},
113109
"css": {

public/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/css/async/422.f76c0c62.css

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*!
2+
*
3+
* /**
4+
* * This source file is available under the terms of the
5+
* * Pimcore Open Core License (POCL)
6+
* * Full copyright and license information is available in
7+
* * LICENSE.md which is distributed with this source code.
8+
* *
9+
* * @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)
10+
* * @license Pimcore Open Core License (POCL)
11+
* * /
12+
*
13+
*/
14+
@font-face{font-family:Lato;src:url(/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/font/Lato-Regular.4291f48c.ttf)}@font-face{font-family:Lato;src:url(/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/font/Lato-Light.bec6f0ae.ttf);font-weight:300}@font-face{font-family:Lato;src:url(/bundles/pimcorestudioui/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/font/Lato-Bold.2c00c297.ttf);font-weight:700}

public/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/static/js/main.9d482fcd.js renamed to public/build/7baf4b99-8d20-4aef-b57e-d612b5194b30/static/js/main.5a2f9f94.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/c54cb3b1-6270-4d28-8586-9ee66b24f394/entrypoints.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)