Skip to content

Commit 6169279

Browse files
committed
minor #857 Updating Yarn dependencies, making build process work again (bobdenotter)
This PR was merged into the master branch. Discussion ---------- Updating Yarn dependencies, making build process work again Some housekeeping on the Yarn / Encore build process: - Updated `symfony/encore` to `0.20.1` from `0.9.1` - Update a few other deps - Build process is now working again - Changed file naming strategy Note: I replaced this ``` .enableVersioning(false) ``` with this: ``` .configureFilenames({ js: '[name].js', images: 'images/[name].[ext]', fonts: 'fonts/[name].[ext]' }) ``` I did this to keep the delta minimal. Since symfony/webpack-encore#110 `.enableVersioning(false)` is not doing what it says (for understandable reasons), but in this case I chose to keep the filenames without a versioning hash. If you think we should introduce filenames with version hashes instead, i'll happily update this PR. Commits ------- 44d7267 Updating Yarn dependencies, making build process work again
2 parents c8ba26c + 44d7267 commit 6169279

37 files changed

+2173
-2099
lines changed

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"devDependencies": {
3-
"@symfony/webpack-encore": "^0.9.1",
4-
"bloodhound-js": "^1.2.1",
3+
"@symfony/webpack-encore": "^0.20.1",
4+
"bloodhound-js": "^1.2.3",
55
"bootstrap-sass": "^3.3.7",
66
"bootstrap-tagsinput": "^0.7.1",
77
"bootswatch": "^3.3.7",
88
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
99
"font-awesome": "^4.7.0",
1010
"highlight.js": "^9.12.0",
11-
"imports-loader": "^0.7.1",
12-
"jquery": "^3.2.1",
11+
"imports-loader": "^0.8.0",
12+
"jquery": "^3.3.1",
1313
"lato-font": "^3.0.0",
14-
"node-sass": "^4.5.3",
15-
"sass-loader": "^6.0.5",
14+
"node-sass": "^4.9.3",
15+
"sass-loader": "^7.1.0",
1616
"typeahead.js": "^0.11.1"
1717
},
1818
"scripts": {
File renamed without changes.

public/build/css/app.644c8031.css

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

public/build/css/app.css

-16
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

public/build/images/glyphicons-halflings-regular.svg

-288
This file was deleted.

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

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

public/build/js/admin.js

-481
This file was deleted.

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

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

public/build/js/app.js

-34
This file was deleted.

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

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

public/build/js/common.js

-30
This file was deleted.

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

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

public/build/js/login.js

-4
This file was deleted.

public/build/js/search.d3a1f656.js

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

public/build/js/search.js

-7
This file was deleted.

public/build/manifest.d41d8cd9.js

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

public/build/manifest.js

-1
This file was deleted.

public/build/manifest.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"build/css/admin.css": "/build/css/admin.css",
3-
"build/css/app.css": "/build/css/app.css",
4-
"build/fonts/fontawesome-webfont.eot": "/build/fonts/fontawesome-webfont.eot",
5-
"build/fonts/fontawesome-webfont.ttf": "/build/fonts/fontawesome-webfont.ttf",
6-
"build/fonts/fontawesome-webfont.woff": "/build/fonts/fontawesome-webfont.woff",
7-
"build/fonts/fontawesome-webfont.woff2": "/build/fonts/fontawesome-webfont.woff2",
8-
"build/fonts/glyphicons-halflings-regular.eot": "/build/fonts/glyphicons-halflings-regular.eot",
9-
"build/fonts/glyphicons-halflings-regular.ttf": "/build/fonts/glyphicons-halflings-regular.ttf",
10-
"build/fonts/glyphicons-halflings-regular.woff": "/build/fonts/glyphicons-halflings-regular.woff",
11-
"build/fonts/glyphicons-halflings-regular.woff2": "/build/fonts/glyphicons-halflings-regular.woff2",
12-
"build/fonts/lato-bold-italic.woff": "/build/fonts/lato-bold-italic.woff",
13-
"build/fonts/lato-bold-italic.woff2": "/build/fonts/lato-bold-italic.woff2",
14-
"build/fonts/lato-bold.woff": "/build/fonts/lato-bold.woff",
15-
"build/fonts/lato-bold.woff2": "/build/fonts/lato-bold.woff2",
16-
"build/fonts/lato-normal-italic.woff": "/build/fonts/lato-normal-italic.woff",
17-
"build/fonts/lato-normal-italic.woff2": "/build/fonts/lato-normal-italic.woff2",
18-
"build/fonts/lato-normal.woff": "/build/fonts/lato-normal.woff",
19-
"build/fonts/lato-normal.woff2": "/build/fonts/lato-normal.woff2",
20-
"build/images/fontawesome-webfont.svg": "/build/images/fontawesome-webfont.svg",
21-
"build/images/glyphicons-halflings-regular.svg": "/build/images/glyphicons-halflings-regular.svg",
22-
"build/js/admin.js": "/build/js/admin.js",
23-
"build/js/app.js": "/build/js/app.js",
24-
"build/js/common.js": "/build/js/common.js",
25-
"build/js/login.js": "/build/js/login.js",
26-
"build/js/search.js": "/build/js/search.js",
27-
"build/manifest.js": "/build/manifest.js"
2+
"build/js/admin.js": "/build/js/admin.24f0f27f.js",
3+
"build/js/app.js": "/build/js/app.3d70fef3.js",
4+
"build/js/common.js": "/build/js/common.4a5a2dfe.js",
5+
"build/css/app.css": "/build/css/app.644c8031.css",
6+
"build/css/admin.css": "/build/css/admin.0856c04f.css",
7+
"build/js/search.js": "/build/js/search.d3a1f656.js",
8+
"build/js/login.js": "/build/js/login.7d4dcfc1.js",
9+
"build/manifest.js": "/build/manifest.d41d8cd9.js",
10+
"build/fonts/lato-bold-italic.woff2": "/build/fonts/lato-bold-italic.0b6bb672.woff2",
11+
"build/fonts/lato-normal-italic.woff2": "/build/fonts/lato-normal-italic.4eb103b4.woff2",
12+
"build/images/glyphicons-halflings-regular.svg": "/build/images/glyphicons-halflings-regular.89889688.svg",
13+
"build/fonts/glyphicons-halflings-regular.eot": "/build/fonts/glyphicons-halflings-regular.f4769f9b.eot",
14+
"build/fonts/lato-normal.woff2": "/build/fonts/lato-normal.bd03a2cc.woff2",
15+
"build/fonts/lato-normal-italic.woff": "/build/fonts/lato-normal-italic.f28f2d64.woff",
16+
"build/images/fontawesome-webfont.svg": "/build/images/fontawesome-webfont.912ec66d.svg",
17+
"build/fonts/glyphicons-halflings-regular.woff2": "/build/fonts/glyphicons-halflings-regular.448c34a5.woff2",
18+
"build/fonts/lato-bold.woff": "/build/fonts/lato-bold.d878b6c2.woff",
19+
"build/fonts/fontawesome-webfont.woff2": "/build/fonts/fontawesome-webfont.af7ae505.woff2",
20+
"build/fonts/lato-bold-italic.woff": "/build/fonts/lato-bold-italic.9c7e4e9e.woff",
21+
"build/fonts/fontawesome-webfont.ttf": "/build/fonts/fontawesome-webfont.b06871f2.ttf",
22+
"build/fonts/fontawesome-webfont.eot": "/build/fonts/fontawesome-webfont.674f50d2.eot",
23+
"build/fonts/lato-bold.woff2": "/build/fonts/lato-bold.cccb8974.woff2",
24+
"build/fonts/glyphicons-halflings-regular.woff": "/build/fonts/glyphicons-halflings-regular.fa277232.woff",
25+
"build/fonts/glyphicons-halflings-regular.ttf": "/build/fonts/glyphicons-halflings-regular.e18bbf61.ttf",
26+
"build/fonts/lato-normal.woff": "/build/fonts/lato-normal.27bd77b9.woff",
27+
"build/fonts/fontawesome-webfont.woff": "/build/fonts/fontawesome-webfont.fee66e71.woff"
2828
}

webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Encore
1010
"jQuery.tagsinput": "bootstrap-tagsinput"
1111
})
1212
.enableSassLoader()
13-
.enableVersioning(false)
13+
.enableVersioning()
1414
.createSharedEntry('js/common', ['jquery'])
1515
.addEntry('js/app', './assets/js/app.js')
1616
.addEntry('js/login', './assets/js/login.js')

0 commit comments

Comments
 (0)