Skip to content

Commit 6324249

Browse files
markus-mosermarkus-moser
committed
Merge branch 'studio-features-2.4-pr' of https://github.com/pimcore/data-importer into studio-features-2.4-pr
2 parents f6b1ec2 + ffe41dc commit 6324249

27 files changed

+111
-126
lines changed

‎assets/studio/js/src/modules/data-importer/components/tabs/steps/advanced-mapping-modal/step-source/step-source.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ export const StepSource = ({
8282
</Flex>
8383

8484
<Flex
85-
className={ styles.footer }
86-
justify="flex-end"
87-
>
85+
className={ styles.footer }
86+
justify="flex-end"
87+
>
8888
<button
8989
className={ shared.outlineButton }
9090
onClick={ onNext }

‎src/Resources/public/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/entrypoints.json‎

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

‎src/Resources/public/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/manifest.json‎

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

‎src/Resources/public/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/entrypoints.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"entrypoints": {
3+
"main": {
4+
"js": [
5+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/359.3ba5f4b6.js",
6+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/645.97b421d0.js",
7+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/658.520c3151.js",
8+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/668.92531b7e.js",
9+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/272.4302db3d.js",
10+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/109.63fc8f63.js",
11+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/main.a9781804.js"
12+
],
13+
"css": []
14+
},
15+
"pimcore_dataimporter_bundle": {
16+
"js": [
17+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/456.81448ccb.js",
18+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/359.3ba5f4b6.js",
19+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/645.97b421d0.js",
20+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/__federation_expose_default_export.8830b431.js",
21+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/658.520c3151.js",
22+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/668.92531b7e.js",
23+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/272.4302db3d.js",
24+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/remoteEntry.js"
25+
],
26+
"css": []
27+
},
28+
"exposeRemote": {
29+
"js": [
30+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/exposeRemote.js"
31+
],
32+
"css": []
33+
}
34+
}
35+
}

src/Resources/public/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/exposeRemote.js renamed to src/Resources/public/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/exposeRemote.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
window.alternativePluginExportPaths = {}
88
}
99

10-
window.pluginRemotes.pimcore_dataimporter_bundle = "/bundles/pimcoredataimporter/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/static/js/remoteEntry.js"
10+
window.pluginRemotes.pimcore_dataimporter_bundle = "/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/remoteEntry.js"
1111

1212

1313

src/Resources/public/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/main.html renamed to src/Resources/public/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/main.html

Lines changed: 1 addition & 1 deletion
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/pimcoredataimporter/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/static/js/109.63fc8f63.js"></script><script defer src="/bundles/pimcoredataimporter/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/static/js/main.1ce952d5.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/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/109.63fc8f63.js"></script><script defer src="/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/main.a9781804.js"></script></head><body><div id="root"></div></body></html>

‎src/Resources/public/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/manifest.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"allFiles": [
3+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/main.a9781804.js",
4+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/remoteEntry.js",
5+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/272.4302db3d.js",
6+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/668.92531b7e.js",
7+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/658.520c3151.js",
8+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/__federation_expose_default_export.8830b431.js",
9+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/645.97b421d0.js",
10+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/359.3ba5f4b6.js",
11+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/456.81448ccb.js",
12+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/109.63fc8f63.js",
13+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/mf-stats.json",
14+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/mf-manifest.json",
15+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/main.html"
16+
],
17+
"entries": {
18+
"main": {
19+
"html": [
20+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/main.html"
21+
],
22+
"initial": {
23+
"js": [
24+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/109.63fc8f63.js",
25+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/main.a9781804.js"
26+
]
27+
},
28+
"async": {
29+
"js": [
30+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/359.3ba5f4b6.js",
31+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/645.97b421d0.js",
32+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/658.520c3151.js",
33+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/668.92531b7e.js",
34+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/272.4302db3d.js"
35+
]
36+
}
37+
},
38+
"pimcore_dataimporter_bundle": {
39+
"initial": {
40+
"js": [
41+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/remoteEntry.js"
42+
]
43+
},
44+
"async": {
45+
"js": [
46+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/456.81448ccb.js",
47+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/359.3ba5f4b6.js",
48+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/645.97b421d0.js",
49+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/__federation_expose_default_export.8830b431.js",
50+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/658.520c3151.js",
51+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/668.92531b7e.js",
52+
"/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/async/272.4302db3d.js"
53+
]
54+
}
55+
}
56+
},
57+
"integrity": {}
58+
}

src/Resources/public/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/mf-manifest.json renamed to src/Resources/public/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/mf-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"globalName": "pimcore_dataimporter_bundle",
2323
"pluginVersion": "0.14.3",
2424
"prefetchInterface": false,
25-
"publicPath": "/bundles/pimcoredataimporter/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/"
25+
"publicPath": "/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/"
2626
},
2727
"shared": [
2828
{
@@ -213,7 +213,7 @@
213213
"sync": [
214214
"static/js/async/359.3ba5f4b6.js",
215215
"static/js/async/456.81448ccb.js",
216-
"static/js/async/__federation_expose_default_export.96894c77.js"
216+
"static/js/async/__federation_expose_default_export.8830b431.js"
217217
],
218218
"async": []
219219
},

src/Resources/public/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/mf-stats.json renamed to src/Resources/public/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/mf-stats.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"globalName": "pimcore_dataimporter_bundle",
2323
"pluginVersion": "0.14.3",
2424
"prefetchInterface": false,
25-
"publicPath": "/bundles/pimcoredataimporter/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/"
25+
"publicPath": "/bundles/pimcoredataimporter/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/"
2626
},
2727
"shared": [
2828
{
@@ -294,7 +294,7 @@
294294
"sync": [
295295
"static/js/async/359.3ba5f4b6.js",
296296
"static/js/async/456.81448ccb.js",
297-
"static/js/async/__federation_expose_default_export.96894c77.js"
297+
"static/js/async/__federation_expose_default_export.8830b431.js"
298298
],
299299
"async": []
300300
},

src/Resources/public/studio/build/59ffabbd-a460-43eb-b2b7-1b42173fb5f7/static/js/109.63fc8f63.js renamed to src/Resources/public/studio/build/d071e073-0dab-41d1-a7b4-47bdfc2b168b/static/js/109.63fc8f63.js

File renamed without changes.

0 commit comments

Comments
 (0)