Skip to content

Commit cfa931a

Browse files
committed
feature #602 Moving assets into a root directory for simplicity (weaverryan)
This PR was merged into the master branch. Discussion ---------- Moving assets into a root directory for simplicity I'd like to see `assets/` put at the root directory, instead of inside `app/Resources` (which is really specific to the framework). It's a bit simpler, and I think in Flex, it will need to be this way. Btw, the changes to the `web/build/*` files is due to a small, internal change in Encore 0.9.0 - e.g. https://github.com/symfony/symfony-demo/compare/master...weaverryan:move-assets?expand=1#diff-0d9100b0501984c386980f99e9fdb4b2 Cheers! Commits ------- 6f22715 Moving assets into a root directory for simplicity
2 parents accba93 + 6f22715 commit cfa931a

14 files changed

+731
-528
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

package.json

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

web/build/js/admin.js

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

web/build/js/app.js

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

web/build/js/common.js

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

web/build/js/login.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
webpackJsonp([5],{136:/*!******************************************!*\
2-
!*** ./app/Resources/assets/js/login.js ***!
3-
\******************************************/
4-
function(a,n,l){(function(a){a(function(){var n=a("#username"),l=a("#password");n.val()||l.val()||(n.val("jane_admin"),l.val("kitten"))})}).call(n,l(/*! jquery */1))}},[136]);
1+
webpackJsonp([5],{nxx7:/*!****************************!*\
2+
!*** ./assets/js/login.js ***!
3+
\****************************/
4+
function(n,a,l){(function(n){n(function(){var a=n("#username"),l=n("#password");a.val()||l.val()||(a.val("jane_admin"),l.val("kitten"))})}).call(a,l(/*! jquery */"7t+N"))}},["nxx7"]);

webpack.config.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Encore
1313
.enableSassLoader()
1414
.enableVersioning(false)
1515
.createSharedEntry('js/common', ['jquery'])
16-
.addEntry('js/app', './app/Resources/assets/js/app.js')
17-
.addEntry('js/login', './app/Resources/assets/js/login.js')
18-
.addEntry('js/admin', './app/Resources/assets/js/admin.js')
19-
.addStyleEntry('css/app', ['./app/Resources/assets/scss/app.scss'])
20-
.addStyleEntry('css/admin', ['./app/Resources/assets/scss/admin.scss'])
16+
.addEntry('js/app', './assets/js/app.js')
17+
.addEntry('js/login', './assets/js/login.js')
18+
.addEntry('js/admin', './assets/js/admin.js')
19+
.addStyleEntry('css/app', ['./assets/scss/app.scss'])
20+
.addStyleEntry('css/admin', ['./assets/scss/admin.scss'])
2121
;
2222

2323
module.exports = Encore.getWebpackConfig();

0 commit comments

Comments
 (0)