Skip to content

Commit 5b3ce90

Browse files
author
symfony-flex-server[bot]
authored
Merge pull request #458
2 parents 8d1d2ec + 8a4e555 commit 5b3ce90

File tree

10 files changed

+34
-8
lines changed

10 files changed

+34
-8
lines changed
Lines changed: 4 additions & 0 deletions
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'
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"bundles": {
3+
"Symfony\\WebpackEncoreBundle\\WebpackEncoreBundle": ["all"]
4+
},
5+
"copy-from-recipe": {
6+
"assets/": "assets/",
7+
"config/": "%CONFIG_DIR%/",
8+
"package.json": "package.json",
9+
"webpack.config.js": "webpack.config.js"
10+
},
11+
"aliases": ["encore", "webpack", "webpack-encore"],
12+
"gitignore": [
13+
"/node_modules/",
14+
"/%PUBLIC_DIR%/build/",
15+
"npm-debug.log",
16+
"yarn-error.log"
17+
]
18+
}

symfony/webpack-encore-pack/1.0/package.json renamed to symfony/webpack-encore-bundle/1.0/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.20.0",
3+
"@symfony/webpack-encore": "^0.21.0",
44
"webpack-notifier": "^1.6.0"
55
},
66
"license": "UNLICENSED",

symfony/webpack-encore-pack/1.0/webpack.config.js renamed to symfony/webpack-encore-bundle/1.0/webpack.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ Encore
2121
//.addEntry('page1', './assets/js/page1.js')
2222
//.addEntry('page2', './assets/js/page2.js')
2323

24+
// will require an extra script tag for runtime.js
25+
// but, you probably want this, unless you're building a single-page app
26+
.enableSingleRuntimeChunk()
27+
2428
/*
2529
* FEATURE CONFIG
2630
*

symfony/webpack-encore-pack/1.0/manifest.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
{
2-
"copy-from-recipe": {
3-
"assets/": "assets/",
4-
"config/": "%CONFIG_DIR%/",
5-
"package.json": "package.json",
6-
"webpack.config.js": "webpack.config.js"
7-
},
8-
"aliases": ["encore", "webpack", "webpack-encore"],
92
"gitignore": [
103
"/node_modules/",
114
"/%PUBLIC_DIR%/build/",
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<bg=yellow;fg=black> </>
2+
<bg=yellow;fg=black> The symfony/webpack-encore-pack is no longer required anymore. Instead, use symfony/webpack-encore-bundle. </>
3+
<bg=yellow;fg=black> </>
4+
5+
* <fg=blue>Instead</>:
6+
1. Remove it now: <comment>composer remove symfony/webpack-encore-pack</>
7+
2. Use Symfony's bridge: <comment>composer require encore</>

0 commit comments

Comments
 (0)