Skip to content

Commit d338476

Browse files
webhdxGrabowskiM
andauthored
IBX-2299: Fixed asset generation order to prevent issues on missing manifest file (#92)
Co-authored-by: Michał Grabowski <[email protected]>
1 parent 4e63779 commit d338476

File tree

24 files changed

+40
-16
lines changed

24 files changed

+40
-16
lines changed

ibexa/commerce/3.3.x-dev/config/packages/ezplatform_assets.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ webpack_encore:
44

55
framework:
66
assets:
7-
json_manifest_path: ~
87
packages:
98
ezplatform:
109
json_manifest_path: '%kernel.project_dir%/public/assets/ezplatform/build/manifest.json'

ibexa/commerce/3.3.x-dev/encore/webpack.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ Encore.addEntry('welcome_page', [
3737
Encore.addEntry('app', './assets/app.js');
3838

3939
const projectConfig = Encore.getWebpackConfig();
40+
41+
projectConfig.name = 'app';
42+
4043
module.exports = [ eZConfig, ...customConfigs, projectConfig ];
4144

4245
// uncomment this line if you've commented-out the above lines

ibexa/commerce/3.3.x-dev/manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,9 @@
163163
"composer-scripts": {
164164
"cache:clear": "symfony-cmd",
165165
"assets:install %PUBLIC_DIR%": "symfony-cmd",
166-
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
167166
"yarn install": "script",
167+
"ibexa:encore:compile --config-name app": "symfony-cmd",
168+
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
168169
"ibexa:encore:compile": "symfony-cmd"
169170
}
170171
}

ibexa/commerce/4.0.x-dev/config/packages/ibexa_assets.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ webpack_encore:
55

66
framework:
77
assets:
8-
json_manifest_path: ~
98
packages:
109
ibexa:
1110
json_manifest_path: '%kernel.project_dir%/public/assets/ibexa/build/manifest.json'

ibexa/commerce/4.0.x-dev/encore/webpack.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ Encore.addEntry('welcome_page', [
3636
Encore.addEntry('app', './assets/app.js');
3737

3838
const projectConfig = Encore.getWebpackConfig();
39+
40+
projectConfig.name = 'app';
41+
3942
module.exports = [ ibexaConfig, ...customConfigs, projectConfig ];
4043

4144
// uncomment this line if you've commented-out the above lines

ibexa/commerce/4.0.x-dev/manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,9 @@
166166
"composer-scripts": {
167167
"cache:clear": "symfony-cmd",
168168
"assets:install %PUBLIC_DIR%": "symfony-cmd",
169-
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
170169
"yarn install": "script",
170+
"ibexa:encore:compile --config-name app": "symfony-cmd",
171+
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
171172
"ibexa:encore:compile": "symfony-cmd"
172173
}
173174
}

ibexa/content/3.3.x-dev/config/packages/ezplatform_assets.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ webpack_encore:
44

55
framework:
66
assets:
7-
json_manifest_path: ~
87
packages:
98
ezplatform:
109
json_manifest_path: '%kernel.project_dir%/public/assets/ezplatform/build/manifest.json'

ibexa/content/3.3.x-dev/encore/webpack.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ Encore.addEntry('welcome_page', [
3737
Encore.addEntry('app', './assets/app.js');
3838

3939
const projectConfig = Encore.getWebpackConfig();
40+
41+
projectConfig.name = 'app';
42+
4043
module.exports = [ eZConfig, ...customConfigs, projectConfig ];
4144

4245
// uncomment this line if you've commented-out the above lines

ibexa/content/3.3.x-dev/manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@
139139
"composer-scripts": {
140140
"cache:clear": "symfony-cmd",
141141
"assets:install %PUBLIC_DIR%": "symfony-cmd",
142-
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
143142
"yarn install": "script",
143+
"ibexa:encore:compile --config-name app": "symfony-cmd",
144+
"bazinga:js-translation:dump %PUBLIC_DIR%/assets --merge-domains": "symfony-cmd",
144145
"ibexa:encore:compile": "symfony-cmd"
145146
}
146147
}

ibexa/content/4.0.x-dev/config/packages/ibexa_assets.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ webpack_encore:
55

66
framework:
77
assets:
8-
json_manifest_path: ~
98
packages:
109
ibexa:
1110
json_manifest_path: '%kernel.project_dir%/public/assets/ibexa/build/manifest.json'

0 commit comments

Comments
 (0)