Skip to content

Commit 22d760d

Browse files
loevgaardloevgaard
committed
Use Webpack
1 parent e99f121 commit 22d760d

20 files changed

+136
-138
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ indent_style = tab
2020

2121
[*.{yaml,yml}]
2222
trim_trailing_whitespace = false
23+
24+
[{webpack.config.js,.eslintrc.js}]
25+
indent_size = 2

‎tests/Application/.eslintrc.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module.exports = {
2-
extends: 'airbnb-base',
3-
env: {
4-
node: true,
5-
},
6-
rules: {
7-
'object-shorthand': ['error', 'always', {
8-
avoidQuotes: true,
9-
avoidExplicitReturnArrows: true,
10-
}],
11-
'function-paren-newline': ['error', 'consistent'],
12-
'max-len': ['warn', 120, 2, {
13-
ignoreUrls: true,
14-
ignoreComments: false,
15-
ignoreRegExpLiterals: true,
16-
ignoreStrings: true,
17-
ignoreTemplateLiterals: true,
18-
}],
19-
},
2+
extends: 'airbnb-base',
3+
env: {
4+
node: true,
5+
},
6+
rules: {
7+
'object-shorthand': ['error', 'always', {
8+
avoidQuotes: true,
9+
avoidExplicitReturnArrows: true,
10+
}],
11+
'function-paren-newline': ['error', 'consistent'],
12+
'max-len': ['warn', 120, 2, {
13+
ignoreUrls: true,
14+
ignoreComments: false,
15+
ignoreRegExpLiterals: true,
16+
ignoreStrings: true,
17+
ignoreTemplateLiterals: true,
18+
}],
19+
},
2020
};

‎tests/Application/assets/admin/entry.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import 'sylius/bundle/AdminBundle/Resources/private/entry';

‎tests/Application/assets/shop/entry.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import 'sylius/bundle/ShopBundle/Resources/private/entry';

‎tests/Application/config/bundles.php

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
5959
BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
6060
SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
61+
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
6162
Setono\ClientIdBundle\SetonoClientIdBundle::class => ['all' => true],
6263
Setono\ConsentBundle\SetonoConsentBundle::class => ['all' => true],
6364
Setono\BotDetectionBundle\SetonoBotDetectionBundle::class => ['all' => true],

‎tests/Application/config/packages/_sylius.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
imports:
22
- { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
3-
43
- { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
54
- { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
6-
75
- { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
8-
96
- { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }
107

118
parameters:

‎tests/Application/config/packages/assets.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
framework:
2+
assets:
3+
packages:
4+
shop:
5+
json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
6+
admin:
7+
json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'

‎tests/Application/config/packages/framework.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
framework:
2-
assets: true
32
csrf_protection: true
43
form: true
54
ide: phpstorm

‎tests/Application/config/packages/webpack_encore.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
webpack_encore:
2+
output_path: '%kernel.project_dir%/public/build/default'
3+
builds:
4+
shop: '%kernel.project_dir%/public/build/shop'
5+
admin: '%kernel.project_dir%/public/build/admin'

‎tests/Application/gulpfile.babel.js

-60
This file was deleted.

‎tests/Application/package.json

+28-56
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,30 @@
11
{
2-
"dependencies": {
3-
"babel-polyfill": "^6.26.0",
4-
"chart.js": "^2.9.3",
5-
"jquery": "^3.2.0",
6-
"jquery.dirtyforms": "^2.0.0",
7-
"lightbox2": "^2.9.0",
8-
"semantic-ui-css": "^2.2.0",
9-
"slick-carousel": "^1.8.1"
10-
},
11-
"devDependencies": {
12-
"@symfony/webpack-encore": "^0.28.0",
13-
"babel-core": "^6.26.3",
14-
"babel-plugin-external-helpers": "^6.22.0",
15-
"babel-plugin-module-resolver": "^3.1.1",
16-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
17-
"babel-preset-env": "^1.7.0",
18-
"babel-register": "^6.26.0",
19-
"dedent": "^0.7.0",
20-
"eslint": "^4.19.1",
21-
"eslint-config-airbnb-base": "^12.1.0",
22-
"eslint-import-resolver-babel-module": "^4.0.0",
23-
"eslint-plugin-import": "^2.12.0",
24-
"fast-async": "^6.3.7",
25-
"gulp": "^4.0.0",
26-
"gulp-chug": "^0.5",
27-
"gulp-concat": "^2.6.0",
28-
"gulp-debug": "^2.1.2",
29-
"gulp-if": "^2.0.0",
30-
"gulp-livereload": "^3.8.1",
31-
"gulp-order": "^1.1.1",
32-
"gulp-sass": "^4.0.1",
33-
"gulp-sourcemaps": "^1.6.0",
34-
"gulp-uglifycss": "^1.0.5",
35-
"merge-stream": "^1.0.0",
36-
"rollup": "^0.60.7",
37-
"rollup-plugin-babel": "^3.0.4",
38-
"rollup-plugin-commonjs": "^9.1.3",
39-
"rollup-plugin-inject": "^2.0.0",
40-
"rollup-plugin-node-resolve": "^3.3.0",
41-
"rollup-plugin-uglify": "^4.0.0",
42-
"sass-loader": "^7.0.1",
43-
"upath": "^1.1.0",
44-
"yargs": "^6.4.0"
45-
},
46-
"scripts": {
47-
"build": "gulp build",
48-
"gulp": "gulp build",
49-
"lint": "yarn lint:js",
50-
"lint:js": "eslint gulpfile.babel.js"
51-
},
52-
"repository": {
53-
"type": "git",
54-
"url": "git+https://github.com/Sylius/Sylius.git"
55-
},
56-
"author": "Paweł Jędrzejewski",
57-
"license": "MIT"
2+
"dependencies": {
3+
"chart.js": "^2.9",
4+
"jquery": "^3.6",
5+
"jquery.dirtyforms": "^2.0",
6+
"lightbox2": "^2.9",
7+
"semantic-ui-css": "^2.2",
8+
"slick-carousel": "^1.8"
9+
},
10+
"devDependencies": {
11+
"@symfony/webpack-encore": "^1.8",
12+
"eslint": "^8.18",
13+
"eslint-config-airbnb-base": "^15.0",
14+
"eslint-import-resolver-babel-module": "^5.3",
15+
"eslint-plugin-import": "^2.26",
16+
"node-sass": "^7.0",
17+
"sass-loader": "^12.0"
18+
},
19+
"scripts": {
20+
"dev": "encore dev",
21+
"build": "encore production",
22+
"watch": "encore dev --watch"
23+
},
24+
"repository": {
25+
"type": "git",
26+
"url": "git+https://github.com/Sylius/Sylius.git"
27+
},
28+
"author": "Paweł Jędrzejewski",
29+
"license": "MIT"
5830
}

‎tests/Application/templates/bundles/SyliusAdminBundle/_logo.html.twig

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<a class="item" href="{{ path('sylius_admin_dashboard') }}" style="padding: 13px 0;">
2+
<div style="max-width: 90px; margin: 0 auto;">
3+
<img src="{{ asset('build/admin/images/admin-logo.svg', 'admin') }}" class="ui fluid image" alt="Sylius">
4+
</div>
5+
</a>

‎tests/Application/templates/bundles/SyliusAdminBundle/_scripts.html.twig

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ encore_entry_script_tags('admin-entry', null, 'admin') }}

‎tests/Application/templates/bundles/SyliusAdminBundle/_styles.html.twig

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ encore_entry_link_tags('admin-entry', null, 'admin') }}

‎tests/Application/templates/bundles/SyliusShopBundle/Homepage/_banner.html.twig

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<img class="ui fluid image" src="{{ asset('build/shop/images/homepage-banner.jpg', 'shop') }}" alt="Sylius">
2+
<div class="ui hidden divider"></div>

‎tests/Application/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_plus.html.twig

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div class="four wide column">
2+
<a href="https://sylius.com/plus" target="_blank" style="display: inline-block; text-align: center;">
3+
<h4 class="ui inverted header" style="color: #808080;">
4+
Need even more features?
5+
<div class="sub header" style="padding: 5px 0;">Check Sylius Plus out!</div>
6+
</h4>
7+
<img class="ui fluid image" style="max-width: 170px;" src="{{ asset('build/shop/images/sylius-plus-banner.png', 'shop') }}" alt="Sylius Plus">
8+
</a>
9+
</div>

‎tests/Application/templates/bundles/SyliusShopBundle/Layout/Header/_logo.html.twig

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="column">
2+
<a href="{{ path('sylius_shop_homepage') }}">
3+
<img src="{{ asset('build/shop/images/logo.png', 'shop') }}" alt="Sylius" class="ui small image" />
4+
</a>
5+
</div>

‎tests/Application/templates/bundles/SyliusShopBundle/_scripts.html.twig

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ encore_entry_script_tags('shop-entry', null, 'shop') }}

‎tests/Application/templates/bundles/SyliusShopBundle/_styles.html.twig

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ encore_entry_link_tags('shop-entry', null, 'shop') }}

‎tests/Application/webpack.config.js

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
const path = require('path');
2+
const Encore = require('@symfony/webpack-encore');
3+
4+
const syliusBundles = path.resolve(__dirname, '../../vendor/sylius/sylius/src/Sylius/Bundle/');
5+
const uiBundleScripts = path.resolve(syliusBundles, 'UiBundle/Resources/private/js/');
6+
const uiBundleResources = path.resolve(syliusBundles, 'UiBundle/Resources/private/');
7+
8+
// Shop config
9+
Encore
10+
.setOutputPath('public/build/shop/')
11+
.setPublicPath('/build/shop')
12+
.addEntry('shop-entry', './assets/shop/entry.js')
13+
.disableSingleRuntimeChunk()
14+
.cleanupOutputBeforeBuild()
15+
.enableSourceMaps(!Encore.isProduction())
16+
.enableVersioning(Encore.isProduction())
17+
.enableSassLoader();
18+
19+
const shopConfig = Encore.getWebpackConfig();
20+
21+
shopConfig.resolve.alias['sylius/ui'] = uiBundleScripts;
22+
shopConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources;
23+
shopConfig.resolve.alias['sylius/bundle'] = syliusBundles;
24+
shopConfig.name = 'shop';
25+
26+
Encore.reset();
27+
28+
// Admin config
29+
Encore
30+
.setOutputPath('public/build/admin/')
31+
.setPublicPath('/build/admin')
32+
.addEntry('admin-entry', './assets/admin/entry.js')
33+
.disableSingleRuntimeChunk()
34+
.cleanupOutputBeforeBuild()
35+
.enableSourceMaps(!Encore.isProduction())
36+
.enableVersioning(Encore.isProduction())
37+
.enableSassLoader();
38+
39+
const adminConfig = Encore.getWebpackConfig();
40+
41+
adminConfig.resolve.alias['sylius/ui'] = uiBundleScripts;
42+
adminConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources;
43+
adminConfig.resolve.alias['sylius/bundle'] = syliusBundles;
44+
adminConfig.externals = Object.assign({}, adminConfig.externals, { window: 'window', document: 'document' });
45+
adminConfig.name = 'admin';
46+
47+
module.exports = [shopConfig, adminConfig];

0 commit comments

Comments
 (0)