Skip to content

Commit a243b64

Browse files
committed
Merge branch '4.1'
* 4.1: Fixed the ts-loader version Updated some config to follow the previous example Update routing.rst
2 parents b313c78 + 9c1bea4 commit a243b64

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

frontend/encore/typescript.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Want to use `TypeScript`_? No problem! First, install the dependencies:
55

66
.. code-block:: terminal
77
8-
$ yarn add --dev typescript ts-loader
8+
$ yarn add --dev typescript ts-loader@^3.0
99
1010
Then, activate the ``ts-loader`` in ``webpack.config.js``:
1111

routing.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ with a locale. This can be done by defining a different prefix for each locale
238238
type: annotation
239239
prefix:
240240
en: '' # don't prefix URLs for English, the default locale
241-
fr: '/fr'
242-
es: '/es'
241+
nl: '/nl'
243242
244243
.. _routing-requirements:
245244

0 commit comments

Comments
 (0)