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

File tree

14 files changed

+731
-528
lines changed

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.
File renamed without changes.

package.json

Lines changed: 1 addition & 1 deletion
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

Lines changed: 379 additions & 379 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/build/js/app.js

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)