Skip to content

Commit db5e658

Browse files
author
Wenming Tang
committed
Upgrade @symfony/webpack-encore to 0.21.0
1 parent a14804a commit db5e658

31 files changed

+2426
-1272
lines changed

assets/js/app.js

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/alert.js';
44
import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
55
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
66
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
7+
import 'jquery'
78

89
// loads the code syntax highlighting library
910
import './highlight.js';

composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"symfony/translation": "4.2.0-beta1",
2727
"symfony/twig-bundle": "4.2.0-beta1",
2828
"symfony/validator": "4.2.0-beta1",
29+
"symfony/webpack-encore-bundle": "dev-master",
2930
"symfony/yaml": "4.2.0-beta1",
3031
"twig/extensions": "^1.5",
3132
"white-october/pagerfanta-bundle": "^1.1"

composer.lock

+728-98
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/bundles.php

+1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
1717
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
1818
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
19+
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
1920
];

config/packages/assets.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework:
2+
assets:
3+
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'

config/packages/webpack_encore.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
webpack_encore:
2+
# The path where Encore is building the assets.
3+
# This should match Encore.setOutputPath() in webpack.config.js.
4+
output_path: '%kernel.project_dir%/public/build'

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"@symfony/webpack-encore": "^0.20.1",
3+
"@symfony/webpack-encore": "^0.21.0",
44
"bloodhound-js": "^1.2.3",
55
"bootstrap-sass": "^3.3.7",
66
"bootstrap-tagsinput": "^0.7.1",

public/build/css/admin.0856c04f.css renamed to public/build/css/admin.d15d4a7a.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/css/app.644c8031.css renamed to public/build/css/app.96fdd8a3.css

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/entrypoints.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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"]}}}

public/build/js/admin.24f0f27f.js

-25
This file was deleted.

public/build/js/admin.256a9071.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/js/app.23ef4f60.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/js/app.3d70fef3.js

-1
This file was deleted.

public/build/js/common.4a5a2dfe.js

-24
This file was deleted.

public/build/js/login.7c1fc2ac.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/js/login.7d4dcfc1.js

-1
This file was deleted.

public/build/js/search.d3a1f656.js

-1
This file was deleted.

public/build/js/search.ef0a5a34.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)