Skip to content

Commit 008bd57

Browse files
dpfaffenbauerdpfaffenbauer
authored
Merge pull request #2942 from dpfaffenbauer/studiov2
Pimcore Studio Integration
2 parents ccfca91 + 38d23f2 commit 008bd57

File tree

1,322 files changed

+99526
-4667
lines changed

Some content is hidden

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

1,322 files changed

+99526
-4667
lines changed

‎.docker/nginx.conf‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ upstream php-pimcore11 {
1010
server {
1111
listen [::]:80 default_server;
1212
listen 80 default_server;
13-
13+
14+
fastcgi_buffer_size 128k;
15+
fastcgi_buffers 8 256k;
16+
fastcgi_busy_buffers_size 256k;
1417
#server_name pimcore.localhost;
1518

1619
root /var/www/html/public;
@@ -50,6 +53,21 @@ server {
5053
# return 403;
5154
# }
5255

56+
# Mercure Hub Proxy für SSE (Server-Sent Events)
57+
# /hub/.well-known/mercure -> http://mercure/.well-known/mercure
58+
location /hub/ {
59+
rewrite ^/hub/(.*)$ /$1 break;
60+
proxy_pass http://mercure;
61+
proxy_read_timeout 24h;
62+
proxy_http_version 1.1;
63+
proxy_set_header Connection "";
64+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
65+
proxy_set_header X-Forwarded-Host $host;
66+
proxy_set_header X-Forwarded-Proto $scheme;
67+
proxy_buffering off;
68+
proxy_cache off;
69+
}
70+
5371
# Pimcore Head-Link Cache-Busting
5472
rewrite ^/cache-buster-(?:\d+)/(.*) /$1 last;
5573

‎.github/workflows/behat.yml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '*.php'
1010
- 'src/**'
1111
- '.github/workflows/behat.yml'
12-
pull_request:
12+
pull_request_target:
1313
branches: [ '5.0', 'next' ]
1414
paths:
1515
- 'composer.json'
@@ -70,6 +70,17 @@ jobs:
7070
ports:
7171
- 3306:3306
7272
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
73+
74+
opensearch:
75+
image: "opensearchproject/opensearch:2.11.1"
76+
env:
77+
discovery.type: single-node
78+
plugins.security.disabled: "true"
79+
OPENSEARCH_JAVA_OPTS: "-Xms512m -Xmx512m"
80+
action.auto_create_index: "false"
81+
ports:
82+
- 9200:9200
83+
7384
name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
7485

7586
steps:
@@ -126,9 +137,32 @@ jobs:
126137
- name: Assets Install
127138
run: bin/console assets:install --symlink
128139

140+
- name: Configure OpenSearch Client
141+
run: |
142+
mkdir -p config/local
143+
cat > config/local/opensearch.yaml << 'EOF'
144+
pimcore_open_search_client:
145+
clients:
146+
default:
147+
hosts: ['http://127.0.0.1:9200']
148+
ssl_verification: false
149+
EOF
150+
129151
- name: Install Pimcore
130152
run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --env=test --skip-database-config
131153

154+
- name: Install Pimcore Bundles
155+
run: |
156+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreApplicationLoggerBundle
157+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreCustomReportsBundle
158+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreGenericDataIndexBundle
159+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreGenericExecutionEngineBundle
160+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreSimpleBackendSearchBundle
161+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreStudioBackendBundle
162+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreStudioUiBundle
163+
bin/console pimcore:deployment:classes-rebuild --force --create-classes
164+
bin/console generic-data-index:update:index -r
165+
132166
- name: Install CoreShop
133167
run: |
134168
bin/console coreshop:install

‎.github/workflows/behat_ui.yml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '*.php'
1010
- 'src/**'
1111
- '.github/workflows/behat_ui.yml'
12-
pull_request:
12+
pull_request_target:
1313
branches: [ '5.0', 'next' ]
1414
paths:
1515
- 'composer.json'
@@ -71,6 +71,17 @@ jobs:
7171
ports:
7272
- 3306:3306
7373
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
74+
75+
opensearch:
76+
image: "opensearchproject/opensearch:2.11.1"
77+
env:
78+
discovery.type: single-node
79+
plugins.security.disabled: "true"
80+
OPENSEARCH_JAVA_OPTS: "-Xms512m -Xmx512m"
81+
action.auto_create_index: "false"
82+
ports:
83+
- 9200:9200
84+
7485
name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
7586

7687
steps:
@@ -132,9 +143,32 @@ jobs:
132143
- name: Assets Install
133144
run: bin/console assets:install --symlink
134145

146+
- name: Configure OpenSearch Client
147+
run: |
148+
mkdir -p config/local
149+
cat > config/local/opensearch.yaml << 'EOF'
150+
pimcore_open_search_client:
151+
clients:
152+
default:
153+
hosts: ['http://127.0.0.1:9200']
154+
ssl_verification: false
155+
EOF
156+
135157
- name: Install Pimcore
136158
run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --env=test --skip-database-config
137159

160+
- name: Install Pimcore Bundles
161+
run: |
162+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreApplicationLoggerBundle
163+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreCustomReportsBundle
164+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreGenericDataIndexBundle
165+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreGenericExecutionEngineBundle
166+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreSimpleBackendSearchBundle
167+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreStudioBackendBundle
168+
bin/console pimcore:bundle:install --no-post-change-commands PimcoreStudioUiBundle
169+
bin/console pimcore:deployment:classes-rebuild --force --create-classes
170+
bin/console generic-data-index:update:index -r
171+
138172
- name: Install CoreShop
139173
run: |
140174
bin/console coreshop:install

‎.github/workflows/codestyles.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: peter-evans/create-pull-request@v4
3838
with:
3939
commit-message: '[CS] Refactor'
40-
author: CoreShop <info@coreshop.org>
40+
author: CoreShop <info@coreshop.com>
4141
title: '[CS] Refactor'
4242
body: |
4343
This PR has been generated automatically to fix code-styles

‎.github/workflows/frontend-build.yaml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: CoreShop Studio Frontend Build
2+
3+
on:
4+
push:
5+
branches: [ '4.0', '4.1', '5.0', 'next', 'studiov2' ]
6+
pull_request_target:
7+
branches: [ '4.0', '4.1', '5.0', 'next', 'studiov2' ]
8+
9+
jobs:
10+
frontend-build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Setup Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: '22'
23+
cache: 'npm'
24+
25+
- name: Cache Rsbuild build cache
26+
uses: actions/cache@v4
27+
with:
28+
path: node_modules/.cache/rsbuild
29+
key: rsbuild-${{ hashFiles('package-lock.json') }}-${{ github.sha }}
30+
restore-keys: |
31+
rsbuild-${{ hashFiles('package-lock.json') }}-
32+
33+
- name: Install dependencies
34+
run: npm ci
35+
36+
- name: Type check
37+
run: npm run check-types
38+
39+
- name: Build changed bundles
40+
if: github.event_name == 'pull_request'
41+
run: npm run build -- --changed-only
42+
43+
- name: Build all bundles
44+
if: github.event_name == 'push'
45+
run: npm run build
46+
47+
- name: Commit built assets
48+
if: github.event_name == 'push'
49+
uses: stefanzweifel/git-auto-commit-action@v5
50+
with:
51+
commit_message: "🚀 Build CoreShop Studio bundles [skip ci]"
52+
file_pattern: "src/CoreShop/Bundle/*/Resources/public/studio/*/**"

‎.github/workflows/packages_bundles.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
test-packages:
5454
needs: list
5555
runs-on: ubuntu-latest
56-
name: "${{ matrix.package }}, PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}"
56+
name: "${{ matrix.package }}, PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}, Deps ${{ matrix.dependencies }}"
5757
strategy:
5858
fail-fast: false
5959
matrix:

‎.github/workflows/packages_components.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
needs: list
5555
if: github.repository == 'coreshop/CoreShop'
5656
runs-on: ubuntu-latest
57-
name: "${{ matrix.package }}, PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}"
57+
name: "${{ matrix.package }}, PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}, Deps ${{ matrix.dependencies }}"
5858
strategy:
5959
fail-fast: false
6060
matrix:

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,8 @@ docs/.docusaurus
6464
node_modules
6565
cache/
6666
docker-compose.override.yaml
67+
settings.local.json
68+
.rsbuild
69+
70+
# CoreShop Studio Build Output
71+
src/CoreShop/Bundle/*/Resources/public/studio/*/

0 commit comments

Comments
 (0)