diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000000..b8626c4cff --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +4 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 345ac2e350..b9e05cce34 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -12,6 +12,7 @@ Changelog * Signal receivers for custom `Image` and `Rendition` models are connected automatically (Mike Dingjan) * `PageChooserBlock` can now accept a list/tuple of page models as `target_model` (Mikalai Radchuk) * Styling tweaks for the ModelAdmin's `IndexView` to be more inline with the Wagtail styleguide (Andy Babic) + * Added `.nvmrc` to the project root for Node versioning support (Janneke Janssen) * Fix: Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif) * Fix: Unreliable preview is now reliable by always opening in a new window (Kjartan Sverrisson) * Fix: Fixed placement of `{{ block.super }}` in `snippets/type_index.html` (LB (Ben Johnston)) diff --git a/docs/contributing/developing.rst b/docs/contributing/developing.rst index ef47d54e59..9989ff3889 100644 --- a/docs/contributing/developing.rst +++ b/docs/contributing/developing.rst @@ -15,7 +15,10 @@ If you'd prefer to set up all the components manually, read on. These instructio Setting up the Wagtail codebase ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Install Node.js, version 4.x, 5.x or 6.x. Instructions for installing Node.js can be found on the `Node.js download page `_. You will also need to install the **libjpeg** and **zlib** libraries, if you haven't done so already - see Pillow's `platform-specific installation instructions `_. +Install Node.js, version 4.x, 5.x or 6.x. Instructions for installing Node.js can be found on the `Node.js download page `_. +You can also use Node version manager (nvm) since Wagtail supplies a ``.nvmrc`` file in the root of the project with the minimum required Node version - see nvm's `installation instructions `_. + +You will also need to install the **libjpeg** and **zlib** libraries, if you haven't done so already - see Pillow's `platform-specific installation instructions `_. Clone a copy of `the Wagtail codebase `_: @@ -30,6 +33,12 @@ With your preferred virtualenv activated, install the Wagtail package in develop $ pip install -e .[testing,docs] -U +Install Node through nvm (optional): + +.. code-block:: console + + $ nvm install + Install the tool chain for building static assets: .. code-block:: console diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst index 3155eb7599..d8ee93470e 100644 --- a/docs/releases/1.10.rst +++ b/docs/releases/1.10.rst @@ -22,6 +22,7 @@ Other features * Signal receivers for custom ``Image`` and ``Rendition`` models are connected automatically (Mike Dingjan) * ``PageChooserBlock`` can now accept a list/tuple of page models as ``target_model`` (Mikalai Radchuk) * Styling tweaks for the ModelAdmin's ``IndexView`` to be more inline with the Wagtail styleguide (Andy Babic) + * Added `.nvmrc` to the project root for Node versioning support (Janneke Janssen) Bug fixes diff --git a/package.json b/package.json index fb3e2e30b6..0bb3da464a 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,9 @@ "version": "1.0.0", "repository": "https://github.com/wagtail/wagtail", "private": true, + "engines": { + "node": ">= 4" + }, "browser": {}, "browserify": { "transform": [