Fixes for symfony#8084 thanks to Stof

weaverryan · weaverryan · commit 57a7a12aec3d · 2017-06-28T05:59:28.000-04:00
diff --git a/frontend/encore/advanced-config.rst b/frontend/encore/advanced-config.rst
@@ -35,7 +35,7 @@ But be careful not to accidentally override any config from Encore:
     // ...
 
     // GOOD - this modifies the config.resolve.extensions array
-    // config.resolve.extensions.push('json');
+    config.resolve.extensions.push('json');
 
     // BAD - this replaces any extensions added by Encore
     // config.resolve.extensions = ['json'];
diff --git a/frontend/encore/custom-loaders-plugins.rst b/frontend/encore/custom-loaders-plugins.rst
@@ -28,16 +28,16 @@ additional information your need for the loader
         // ...
         .addLoader({
             test: /\.handlebars$/,
-		    loader: 'handlebars-loader',
-		    query: {
-			    helperDirs: [
-				    __dirname + '/helpers1',
-				    __dirname + '/helpers2',
+            loader: 'handlebars-loader',
+            options: {
+                helperDirs: [
+                    __dirname + '/helpers1',
+                    __dirname + '/helpers2',
                 ],
                 partialDirs: [
                     path.join(__dirname, 'templates', 'partials')
                 ]
-		    }
+            }
         })
     ;
 
diff --git a/frontend/encore/faq.rst b/frontend/encore/faq.rst
@@ -21,7 +21,7 @@ like ``/myAppSubdir``), you just need to configure that when calling ``Encore.se
 
         + // this is now needed so that your manifest.json keys are still `build/foo.js`
         + // i.e. you won't need to change anything in your Symfony app
-        + config.setManifestKeyPrefix('build')
+        + .setManifestKeyPrefix('build')
     ;
 
 If you're :ref:`processing your assets through manifest.json <load-manifest-files>`,

Original file line number	Diff line number	Diff line change
@@ -21,7 +21,7 @@ like ``/myAppSubdir``), you just need to configure that when calling ``Encore.se
`21`	`21`
`22`	`22`	+ // this is now needed so that your manifest.json keys are still `build/foo.js`
`23`	`23`	`+ // i.e. you won't need to change anything in your Symfony app`
`24`		`- + config.setManifestKeyPrefix('build')`
	`24`	`+ + .setManifestKeyPrefix('build')`
`25`	`25`	`;`
`26`	`26`
`27`	`27`	If you're :ref:`processing your assets through manifest.json <load-manifest-files>`,