Skip to content

Commit

Permalink
Rename wallassets to the more standard build
Browse files Browse the repository at this point in the history
  • Loading branch information
yguedidi committed Aug 12, 2023
1 parent 1cea575 commit 60229db
Show file tree
Hide file tree
Showing 73 changed files with 123 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ web/uploads/
!/web/bundles/.gitkeep
/web/assets/images/*
!web/assets/images/.gitkeep
/web/wallassets_dev/
/web/build_dev/

# Build
/app/build
Expand Down
10 changes: 5 additions & 5 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ framework:
assets:
packages:
prod:
json_manifest_path: '%kernel.project_dir%/web/wallassets/manifest.json'
json_manifest_path: '%kernel.project_dir%/web/build/manifest.json'
dev:
json_manifest_path: '%kernel.project_dir%/web/wallassets_dev/manifest.json'
json_manifest_path: '%kernel.project_dir%/web/build_dev/manifest.json'
mailer:
dsn: "%mailer_dsn%"

Expand Down Expand Up @@ -428,7 +428,7 @@ craue_config:
entity_name: Wallabag\CoreBundle\Entity\InternalSetting

webpack_encore:
output_path: '%kernel.project_dir%/web/wallassets'
output_path: '%kernel.project_dir%/web/build'
builds:
prod: '%kernel.project_dir%/web/wallassets'
dev: '%kernel.project_dir%/web/wallassets_dev'
prod: '%kernel.project_dir%/web/build'
dev: '%kernel.project_dir%/web/build_dev'
25 changes: 25 additions & 0 deletions web/build/118.809c3054.css

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
22 changes: 22 additions & 0 deletions web/build/entrypoints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"entrypoints": {
"material": {
"css": [
"/build/118.809c3054.css",
"/build/material.cc3e0b21.css"
],
"js": [
"/build/118.cbf88ecc.js",
"/build/material.b3507ee7.js"
]
},
"public": {
"css": [
"/build/public.b1c92aff.css"
],
"js": [
"/build/public.31d6cfe0.js"
]
}
}
}
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.
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.
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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
65 changes: 65 additions & 0 deletions web/build/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"build/material.css": "/build/material.cc3e0b21.css",
"build/material.js": "/build/material.b3507ee7.js",
"build/public.css": "/build/public.b1c92aff.css",
"build/public.js": "/build/public.31d6cfe0.js",
"build/118.809c3054.css": "/build/118.809c3054.css",
"build/118.cbf88ecc.js": "/build/118.cbf88ecc.js",
"build/fonts/MaterialIcons-Regular.ttf": "/build/fonts/MaterialIcons-Regular.698bd855.ttf",
"build/fonts/lato-normal-italic.woff": "/build/fonts/lato-normal-italic.62a9c838.woff",
"build/fonts/lato-semibold-italic.woff": "/build/fonts/lato-semibold-italic.3fdee263.woff",
"build/fonts/lato-medium-italic.woff": "/build/fonts/lato-medium-italic.9ba72333.woff",
"build/fonts/lato-light-italic.woff": "/build/fonts/lato-light-italic.ed49088e.woff",
"build/fonts/lato-thin-italic.woff": "/build/fonts/lato-thin-italic.546b4809.woff",
"build/fonts/lato-bold-italic.woff": "/build/fonts/lato-bold-italic.3e6b9980.woff",
"build/fonts/lato-heavy-italic.woff": "/build/fonts/lato-heavy-italic.e014213d.woff",
"build/fonts/lato-semibold.woff": "/build/fonts/lato-semibold.c6646559.woff",
"build/fonts/lato-light.woff": "/build/fonts/lato-light.848f3a6e.woff",
"build/fonts/lato-black-italic.woff": "/build/fonts/lato-black-italic.0d0882bc.woff",
"build/fonts/lato-heavy.woff": "/build/fonts/lato-heavy.5b824a72.woff",
"build/fonts/lato-bold.woff": "/build/fonts/lato-bold.89b61808.woff",
"build/fonts/lato-normal.woff": "/build/fonts/lato-normal.1d2ca94d.woff",
"build/fonts/lato-thin.woff": "/build/fonts/lato-thin.1fd1d41f.woff",
"build/fonts/lato-medium.woff": "/build/fonts/lato-medium.08eb0932.woff",
"build/fonts/lato-black.woff": "/build/fonts/lato-black.6cfa65c6.woff",
"build/fonts/lato-hairline-italic.woff": "/build/fonts/lato-hairline-italic.598d0913.woff",
"build/fonts/lato-hairline.woff": "/build/fonts/lato-hairline.7d1b926d.woff",
"build/fonts/lato-normal-italic.woff2": "/build/fonts/lato-normal-italic.bb5de40e.woff2",
"build/fonts/lato-semibold-italic.woff2": "/build/fonts/lato-semibold-italic.34b49f33.woff2",
"build/fonts/lato-medium-italic.woff2": "/build/fonts/lato-medium-italic.3e22a536.woff2",
"build/fonts/lato-heavy-italic.woff2": "/build/fonts/lato-heavy-italic.353a3bb9.woff2",
"build/fonts/lato-bold-italic.woff2": "/build/fonts/lato-bold-italic.e48918f9.woff2",
"build/fonts/lato-light-italic.woff2": "/build/fonts/lato-light-italic.dcb1947b.woff2",
"build/fonts/lato-thin-italic.woff2": "/build/fonts/lato-thin-italic.46957bf0.woff2",
"build/fonts/lato-black-italic.woff2": "/build/fonts/lato-black-italic.b9c017a7.woff2",
"build/fonts/lato-bold.woff2": "/build/fonts/lato-bold.21b3848a.woff2",
"build/fonts/lato-heavy.woff2": "/build/fonts/lato-heavy.75f024ce.woff2",
"build/fonts/lato-semibold.woff2": "/build/fonts/lato-semibold.a6069540.woff2",
"build/fonts/lato-normal.woff2": "/build/fonts/lato-normal.75614cfc.woff2",
"build/fonts/lato-medium.woff2": "/build/fonts/lato-medium.a071abba.woff2",
"build/fonts/lato-light.woff2": "/build/fonts/lato-light.e244488c.woff2",
"build/fonts/lato-thin.woff2": "/build/fonts/lato-thin.6ae7abff.woff2",
"build/fonts/lato-black.woff2": "/build/fonts/lato-black.6d20cff5.woff2",
"build/fonts/lato-hairline-italic.woff2": "/build/fonts/lato-hairline-italic.863985d6.woff2",
"build/fonts/lato-hairline.woff2": "/build/fonts/lato-hairline.73d2c045.woff2",
"build/fonts/MaterialIcons-Regular.woff": "/build/fonts/MaterialIcons-Regular.08cefa1b.woff",
"build/fonts/MaterialIcons-Regular.eot": "/build/fonts/MaterialIcons-Regular.af9a28e7.eot",
"build/fonts/IcoMoon-Free.ttf": "/build/fonts/IcoMoon-Free.a60c1d62.ttf",
"build/fonts/MaterialIcons-Regular.woff2": "/build/fonts/MaterialIcons-Regular.2d801748.woff2",
"build/fonts/Roboto-Medium.woff": "/build/fonts/Roboto-Medium.4b797552.woff",
"build/fonts/Roboto-Bold.woff": "/build/fonts/Roboto-Bold.d9545f10.woff",
"build/fonts/Roboto-Regular.woff": "/build/fonts/Roboto-Regular.373cdbfb.woff",
"build/fonts/Roboto-Light.woff": "/build/fonts/Roboto-Light.921e9835.woff",
"build/fonts/Roboto-Thin.woff": "/build/fonts/Roboto-Thin.d6bafa3f.woff",
"build/fonts/Roboto-Medium.woff2": "/build/fonts/Roboto-Medium.04fd4291.woff2",
"build/fonts/Roboto-Regular.woff2": "/build/fonts/Roboto-Regular.8eecbdb3.woff2",
"build/fonts/Roboto-Bold.woff2": "/build/fonts/Roboto-Bold.2341c0db.woff2",
"build/fonts/Roboto-Light.woff2": "/build/fonts/Roboto-Light.2779fd7b.woff2",
"build/fonts/Roboto-Thin.woff2": "/build/fonts/Roboto-Thin.6d65b184.woff2",
"build/images/annotator-icon-sprite.png?embed": "/build/images/annotator-icon-sprite.9537e5b4.png",
"build/images/annotator-glyph-sprite.png?embed": "/build/images/annotator-glyph-sprite.81adc495.png",
"build/images/shaarli.png": "/build/images/shaarli.f9a74caa.png",
"build/images/scuttle.png": "/build/images/scuttle.c437d3d1.png",
"build/images/diaspora-icon--black.png": "/build/images/diaspora-icon--black.3c916e84.png",
"build/images/unmark-icon--black.png": "/build/images/unmark-icon--black.ab0442a6.png"
}
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions web/build/material.cc3e0b21.css

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
22 changes: 0 additions & 22 deletions web/wallassets/entrypoints.json

This file was deleted.

65 changes: 0 additions & 65 deletions web/wallassets/manifest.json

This file was deleted.

8 changes: 4 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const configureCommonConfig = (enc) => {
configureCommonConfig(Encore);

Encore
.setOutputPath('web/wallassets/')
.setPublicPath('/wallassets');
.setOutputPath('web/build/')
.setPublicPath('/build');

const prodConfig = Encore.getWebpackConfig();
prodConfig.name = 'prod';
Expand All @@ -42,8 +42,8 @@ Encore.reset();
configureCommonConfig(Encore);

Encore
.setOutputPath('web/wallassets_dev/')
.setPublicPath('/wallassets_dev')
.setOutputPath('web/build_dev/')
.setPublicPath('/build_dev')
.configureImageRule({
type: 'asset',
maxSize: 500 * 1024, // see https://github.com/symfony/webpack-encore/issues/1132
Expand Down

0 comments on commit 60229db

Please sign in to comment.