Skip to content

Commit

Permalink
feature #892 Upgrade @symfony/webpack-encore to 0.21.0 (wenmingtang)
Browse files Browse the repository at this point in the history
This PR was merged into the master branch.

Discussion
----------

Upgrade @symfony/webpack-encore to 0.21.0

see [Encore 0.21.0: Webpack 4 Support, Copy Files Support, WebpackEncoreBundle
](https://symfony.com/blog/encore-0-21-0-webpack-4-support-copy-files-support-webpackencorebundle)

Commits
-------

db5e658 Upgrade @symfony/webpack-encore to 0.21.0
  • Loading branch information
javiereguiluz committed Nov 15, 2018
2 parents 412c79c + db5e658 commit dfc8a44
Show file tree
Hide file tree
Showing 31 changed files with 2,426 additions and 1,272 deletions.
1 change: 1 addition & 0 deletions assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/alert.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
import 'jquery'

// loads the code syntax highlighting library
import './highlight.js';
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"symfony/translation": "4.2.0-beta1",
"symfony/twig-bundle": "4.2.0-beta1",
"symfony/validator": "4.2.0-beta1",
"symfony/webpack-encore-bundle": "dev-master",
"symfony/yaml": "4.2.0-beta1",
"twig/extensions": "^1.5",
"white-october/pagerfanta-bundle": "^1.1"
Expand Down
826 changes: 728 additions & 98 deletions composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
];
3 changes: 3 additions & 0 deletions config/packages/assets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
framework:
assets:
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
4 changes: 4 additions & 0 deletions config/packages/webpack_encore.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
webpack_encore:
# The path where Encore is building the assets.
# This should match Encore.setOutputPath() in webpack.config.js.
output_path: '%kernel.project_dir%/public/build'
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@symfony/webpack-encore": "^0.20.1",
"@symfony/webpack-encore": "^0.21.0",
"bloodhound-js": "^1.2.3",
"bootstrap-sass": "^3.3.7",
"bootstrap-tagsinput": "^0.7.1",
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/entrypoints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"entrypoints":{"js/app":{"js":["build/vendors~70e61e62.fcea2503.js","build/vendors~d0214e58.28b2670d.js","build/js/app.23ef4f60.js"]},"js/login":{"js":["build/vendors~70e61e62.fcea2503.js","build/js/login.7c1fc2ac.js"]},"js/admin":{"js":["build/vendors~70e61e62.fcea2503.js","build/vendors~4ab51824.221d6c04.js","build/js/admin.256a9071.js"]},"js/search":{"js":["build/vendors~70e61e62.fcea2503.js","build/js/search.ef0a5a34.js"]},"css/app":{"css":["build/css/app.96fdd8a3.css"]},"css/admin":{"css":["build/css/admin.d15d4a7a.css"]}}}
25 changes: 0 additions & 25 deletions public/build/js/admin.24f0f27f.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/js/admin.256a9071.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/build/js/app.23ef4f60.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/build/js/app.3d70fef3.js

This file was deleted.

24 changes: 0 additions & 24 deletions public/build/js/common.4a5a2dfe.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/js/login.7c1fc2ac.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/build/js/login.7d4dcfc1.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/js/search.d3a1f656.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/js/search.ef0a5a34.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dfc8a44

Please sign in to comment.