tweaks

Author: weaverryan

docs/babel.rst

@@ -16,7 +16,7 @@ Need to extend the Babel configuration further? The easiest way is via
     Encore
         // ...
 
-        // modify our default Babel configuration
+        // modify the default Babel configuration
         .configureBabel(function(babelConfig) {
             babelConfig.presets.push('es2017');
         })

docs/cdn.rst

@@ -36,12 +36,12 @@ e.g. ``https://my-cool-app.com.global.prod.fastly.net/dashboard.js``.
     directly from your web server.
 
 You *do* need to make sure that the ``script`` and ``link`` tags you include on your
-pages also uses the CDN. Fortunately, the ``manifest.json`` is automatically
+pages also uses the CDN. Fortunately, the ``manifest.json`` paths are
 updated to point to the CDN. In Symfony, as long as you've configured
 :doc:`Asset Versioning </versioning>`_, you're done! The ``manifest.json``
 file includes the full CDN URL:
 
 .. code-block:: js
 
-    {# Same code you had before and setting up the CDN #}
+    {# Your script/link tags don't need to change at all to support the CDN #}
     <script src="{{ asset('build/dashboard.js') }}"></script>

docs/css-preprocessors.rst

@@ -1,4 +1,4 @@
-CSS Preprocessors: SASS, LESS, etc
+CSS Preprocessors: Sass, LESS, etc
 ==================================
 
 Using Sass
@@ -8,7 +8,7 @@ To use the Sass pre-processor, install the dependencies:
 
 .. code-block:: terminal
 
-    yarn add --dev sass-loader node-sass
+    $ yarn add --dev sass-loader node-sass
 
 And enable it in ``webpack.config.js``:
 
@@ -32,7 +32,7 @@ To use the LESS pre-processor, install the dependencies:
 
 .. code-block:: terminal
 
-    yarn add --dev less-loader less
+    $ yarn add --dev less-loader less
 
 And enable it in ``webpack.config.js``:
 

docs/dev-server.rst

@@ -6,11 +6,7 @@ instead use the `webpack-dev-server`_:
 
 .. code-block:: terminal
 
-    ./node_modules/.bin/encore dev-server
-
-.. note::
-
-    Hot module replacement is not currently supported.
+    $ ./node_modules/.bin/encore dev-server
 
 This serves the built assets from a new server at ``http://localhost:8080``
 (it does not actually write any files to disk). This means your
@@ -19,4 +15,17 @@ This serves the built assets from a new server at ``http://localhost:8080``
 If you've activated the :ref:`manifest.json versioning <load-manifest-files>`
 you're done: the paths in your templates will automatically point to the dev server.
 
+You can also pass options to the ``dev-server`` command: any options that
+are supported by the normal `webpack-dev-server`_. For example:
+
+.. code-block:: terminal
+
+    $ ./node_modules/.bin/encore dev-server --https --port 9000
+
+This will start a server at ``https://localhost:9000``.
+
+.. note::
+
+    Hot module replacement is not currently supported.
+
 .. _`webpack-dev-server`: https://webpack.js.org/configuration/dev-server/

docs/installation.rst

@@ -15,14 +15,14 @@ Then, install Encore into your project with yarn:
     ``npm install xxx --save-dev``.
 
 This command creates (or modifies) a ``package.json`` file and downloads
-dependencies into a ``node_modules`` directory. When using Yarn, a file called
+dependencies into a ``node_modules/`` directory. When using Yarn, a file called
 ``yarn.lock`` is also created/updated. When using npm 5, a ``package-lock.json``
 file is created/updated.
 
 .. tip::
 
     You should commit ``package.json`` and ``yarn.lock`` (or ``package-lock.json``
-    if using npm) to version control, but ignore ``node_modules``.
+    if using npm) to version control, but ignore ``node_modules/``.
 
 Next, create your ``webpack.config.js`` in :doc:`/simple-example`!
 

docs/postcss.rst

@@ -8,7 +8,7 @@ First, download ``postcss-loader`` and any plugins you want, like ``autoprefixer
 
 .. code-block:: terminal
 
-    yarn add --dev postcss-loader autoprefixer
+    $ yarn add --dev postcss-loader autoprefixer
 
 Next, create a ``postcss.config.js`` file at the root of your project:
 
@@ -33,7 +33,7 @@ Then, Enable the loader in Encore!
     +     .enablePostCssLoader()
     ;
 
-That's it! The ``postcss-loader`` will now be used for all CSS, SASS, etc
+That's it! The ``postcss-loader`` will now be used for all CSS, Sass, etc
 files.
 
 .. _`PostCSS`: http://postcss.org/

docs/reactjs.rst

@@ -6,7 +6,7 @@ Using React? Make sure you have React installed, along with the
 
 .. code-block:: terminal
 
-    yarn add --dev react react-dom babel-preset-react
+    $ yarn add --dev react react-dom prop-types babel-preset-react
 
 Enable react in your ``webpack.config.js``:
 
@@ -23,4 +23,4 @@ Enable react in your ``webpack.config.js``:
 That's it! Your ``.js`` and ``.jsx`` files will now be transformed through
 ``babel-preset-react``.
 
-.. _`babel-react-preset`: https://babeljs.io/docs/plugins/preset-react/
+.. _`babel-preset-react`: https://babeljs.io/docs/plugins/preset-react/

docs/versioning.rst

@@ -7,7 +7,7 @@ Tired of deploying and having browser's cache the old version of your assets?
 By calling ``enableVersioning()``, each filename will now include a hash that
 changes whenever the *contents* of that file change (e.g. ``app.123abc.js``
 instead of ``app.js``). This allows you to use aggressive caching strategies
-(e.g. a far future Expire) because, whenever a file change, its hash will change,
+(e.g. a far future ``Expires``) because, whenever a file change, its hash will change,
 invalidating any existing cache:
 
 .. code-block:: diff