From 8ad644b04a4d6ef95c227e0b5b7380e98aec6faa Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Mon, 1 Apr 2019 18:14:49 +0100 Subject: [PATCH 1/3] webpack - update comments in default recipe for new features --- .../1.0/config/packages/webpack_encore.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml b/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml index c1c19d37b..33f21122c 100644 --- a/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml +++ b/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml @@ -2,3 +2,12 @@ webpack_encore: # The path where Encore is building the assets. # This should match Encore.setOutputPath() in webpack.config.js. output_path: '%kernel.project_dir%/public/build' + # If multiple builds are defined (as shown below), you can disable the default build: + # output_path: false # output_path: false + + # if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: anonymous) + # crossorigin: 'use-credentials' + + # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes) + # Available in version 1.2 + #cache: '%kernel.debug%' From 2adad89f66a7e677e7ff5a3311303f1b9aa116eb Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Mon, 1 Apr 2019 18:25:37 +0100 Subject: [PATCH 2/3] remove duplication --- .../1.0/config/packages/webpack_encore.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml b/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml index 33f21122c..4f23e7917 100644 --- a/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml +++ b/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml @@ -3,7 +3,7 @@ webpack_encore: # This should match Encore.setOutputPath() in webpack.config.js. output_path: '%kernel.project_dir%/public/build' # If multiple builds are defined (as shown below), you can disable the default build: - # output_path: false # output_path: false + # output_path: false # if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: anonymous) # crossorigin: 'use-credentials' From 66b2161eafe57d06daf39071dad06ee187feeeb6 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Tue, 2 Apr 2019 11:40:28 +0100 Subject: [PATCH 3/3] sync comments with upstream PR --- .../1.0/config/packages/webpack_encore.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml b/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml index 4f23e7917..729f59ea1 100644 --- a/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml +++ b/symfony/webpack-encore-bundle/1.0/config/packages/webpack_encore.yaml @@ -5,8 +5,8 @@ webpack_encore: # If multiple builds are defined (as shown below), you can disable the default build: # output_path: false - # if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: anonymous) - # crossorigin: 'use-credentials' + # if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: false, or use 'anonymous' or 'use-credentials') + # crossorigin: 'anonymous' # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes) # Available in version 1.2