Merge branch '5.1' into 5.x

wouterj · wouterj · commit 2a4924babbac · 2020-11-09T13:29:31.000+01:00
* 5.1:
  [Encore] Fix CSS path
  Update simple-example.rst
diff --git a/frontend/encore/installation.rst b/frontend/encore/installation.rst
@@ -143,7 +143,7 @@ Next, open the new ``assets/app.js`` file which contains some JavaScript code
      */
 
     // any CSS you import will output into a single css file (app.css in this case)
-    import '../css/app.css';
+    import './styles/app.css';
 
     // Need jQuery? Install it with "yarn add jquery", then uncomment to import it.
     // import $ from 'jquery';
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -17,9 +17,9 @@ application: it will *require* all of the dependencies it needs (e.g. jQuery or
     // assets/app.js
     // ...
 
-    import '../css/app.css';
+    import './styles/app.css';
 
-    // var $ = require('jquery');
+    // import $ from 'jquery';
 
 Encore's job (via Webpack) is simple: to read and follow *all* of the ``require()``
 statements and create one final ``app.js`` (and ``app.css``) that contains *everything*
@@ -204,8 +204,8 @@ To import values, use ``import``:
 .. code-block:: diff
 
     // assets/app.js
-    - require('../css/app.css');
-    + import '../css/app.css';
+    - require('../styles/app.css');
+    + import './styles/app.css';
 
     - var $ = require('jquery');
     + import $ from 'jquery';
@@ -292,8 +292,8 @@ file to ``app.scss`` and update the ``import`` statement:
 .. code-block:: diff
 
     // assets/app.js
-    - import '../css/app.css';
-    + import '../css/app.scss';
+    - import './styles/app.css';
+    + import './styles/app.scss';
 
 Then, tell Encore to enable the Sass pre-processor:
 
